diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index 717b27370..3ddedc05f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -350,13 +350,12 @@ trait Folders
 		if (!$bReSelectSameFolders
 		  && $this->oCurrentFolderInfo
 		  && $sFolderName === $this->oCurrentFolderInfo->FolderName
-		  && $bIsWritable === $this->oCurrentFolderInfo->IsWritable
+		  && ($bIsWritable === $this->oCurrentFolderInfo->IsWritable || $this->oCurrentFolderInfo->IsWritable)
 		) {
 			return $this->oCurrentFolderInfo;
 		}
 
-		if (!\strlen(\trim($sFolderName)))
-		{
+		if (!\strlen(\trim($sFolderName))) {
 			throw new \InvalidArgumentException;
 		}