diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index 2bfc28825..182910d8f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -36,11 +36,13 @@ trait Folders
 
 		if ($oFolderCollection instanceof \MailSo\Mail\FolderCollection)
 		{
-			foreach ($oFolderCollection as $i => $oFolder) {
+			$aFolders = $oFolderCollection->getArrayCopy();
+			foreach ($aFolders as $i => $oFolder) {
 				if (!$oFolder->IsSelectable()) {
-					unset($oFolderCollection[$i]);
+					unset($aFolders[$i]);
 				}
 			}
+			$oFolderCollection->exchangeArray(\array_values($aFolders));
 
 			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);