diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
index bcfcc0e70..218bdb309 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
@@ -35,7 +35,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 
 	public int
 		$body_text_limit = 0,
-		$folder_list_limit = 200,
+//		$folder_list_limit = 200,
 		$message_list_limit = 0,
 		$thread_limit = 50;
 
@@ -64,7 +64,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 		}
 		$options = [
 //			'body_text_limit',
-			'folder_list_limit',
+//			'folder_list_limit',
 			'message_list_limit',
 //			'thread_limit',
 		];
@@ -91,7 +91,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 				'use_expunge_all_on_delete' => $this->expunge_all_on_delete,
 //				'body_text_limit' => $this->body_text_limit,
 				'fast_simple_search' => $this->fast_simple_search,
-				'folder_list_limit' => $this->folder_list_limit,
+//				'folder_list_limit' => $this->folder_list_limit,
 				'force_select' => $this->force_select,
 				'message_all_headers' => $this->message_all_headers,
 				'message_list_limit' => $this->message_list_limit,
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 19b530f70..ef5e6eac6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -933,10 +933,6 @@ class MailClient
 			return null;
 		}
 
-		$iOptimizationLimit = $this->oImapClient->Settings->folder_list_limit;
-		$oFolderCollection = new FolderCollection;
-		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
-
 		foreach ($aFolders as $sFullName => /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
 			if (($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper))) || $oImapFolder->IsInbox()) {
 				$oImapFolder->setSubscribed();
@@ -964,6 +960,9 @@ class MailClient
 			}
 		}
 
+		$oFolderCollection = new FolderCollection;
+//		$iOptimizationLimit = $this->oImapClient->Settings->folder_list_limit;
+//		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
 		$oFolderCollection->exchangeArray(\array_values($aFolders));
 
 		return $oFolderCollection;
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 3e45bd494..67b4f6389 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -115,15 +115,16 @@
 				}"></div>
 
 				<h4 data-i18n="POPUPS_DOMAIN/LIMITS"></h4>
-				<div class="control-group">
-					<label data-i18n="POPUPS_DOMAIN/FOLDERS"></label>
-					<input name="IMAP[folder_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapFolder_list_limit">
-				</div>
 				<div class="control-group">
 					<label data-i18n="POPUPS_DOMAIN/MESSAGES"></label>
 					<input name="IMAP[message_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapMessage_list_limit">
 				</div>
 <!--
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/FOLDERS"></label>
+					<input name="IMAP[folder_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapFolder_list_limit">
+				</div>
+
         "use_expunge_all_on_delete": false,
         "fast_simple_search": true,
         "force_select": false,