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 5ea93bcd8..febfc7e82 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
@@ -135,8 +135,8 @@ trait Folders
 			FolderStatus::UIDNEXT,
 			FolderStatus::UIDVALIDITY
 		);
-		// RFC 4551
-		if ($this->hasCapability('CONDSTORE')) {
+		// RFC 4551 or RFC 5162
+		if ($this->hasCapability('CONDSTORE') || $this->hasCapability('QRESYNC')) {
 			$aStatusItems[] = FolderStatus::HIGHESTMODSEQ;
 		}
 		// RFC 7889
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 b8131a011..be90a63b0 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
@@ -68,6 +68,8 @@ trait Folders
 				}
 			} catch (\Throwable $e) {
 				// https://github.com/the-djmaze/snappymail/issues/1438
+				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
+				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
 			if (isset($oNamespaces->aShared[0])) try {
 				$oCollection = $this->MailClient()->Folders($oNamespaces->aShared[0]['prefix'], '*', $HideUnsubscribed);
@@ -78,6 +80,8 @@ trait Folders
 				}
 			} catch (\Throwable $e) {
 				// https://github.com/the-djmaze/snappymail/issues/1438
+				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
+				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
 		}