diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 6d62c4a2f..d90969744 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -143,6 +143,10 @@ class Settings { /* {{{ */
 	var $_firstDayOfWeek = 0;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
+	// count documents and folders for folderview recursively
+	var $_enableRecursiveCount = false;
+	// maximum number of documents or folders when counted recursively
+	var $_maxRecursiveCount = 10000;
 	// enable/disable language selection menu
 	var $_enableLanguageSelector = true;
 	// expandFolderTree
@@ -301,6 +305,8 @@ class Settings { /* {{{ */
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
+		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
+		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
 		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
@@ -549,6 +555,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
+    $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
+    $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
     $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
     $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 90c347407..e349d4f02 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -160,6 +160,14 @@ if(!is_writeable($settings->_configFilePath)) {
             <OPTION VALUE="2" <?php if ($settings->_expandFolderTree==2) echo "SELECTED" ?> ><?php printMLText("settings_expandFolderTree_val2");?></OPTION>
           </SELECT>
       </tr>
+      <tr title="<?php printMLText("settings_enableRecursiveCount_desc");?>">
+        <td><?php printMLText("settings_enableRecursiveCount");?>:</td>
+        <td><input name="enableRecursiveCount" type="checkbox" <?php if ($settings->_enableRecursiveCount) echo "checked" ?> /></td>
+      </tr>
+      <tr title="<?php printMLText("settings_maxRecursiveCount_desc");?>">
+        <td><?php printMLText("settings_maxRecursiveCount");?>:</td>
+        <td><input type="text" name="maxRecursiveCount" value="<?php echo $settings->_maxRecursiveCount ?>" /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableLanguageSelector_desc");?>">
         <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
         <td><input name="enableLanguageSelector" type="checkbox" <?php if ($settings->_enableLanguageSelector) echo "checked" ?> /></td>