diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
index 7cfbcf562..39c7166cf 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
@@ -18,10 +18,12 @@ namespace MailSo\Imap\Enumerations;
  */
 abstract class FolderResponseStatus
 {
+	// rfc3501
 	const MESSAGES = 'MESSAGES';
 	const RECENT = 'RECENT';
-	const UNSEEN = 'UNSEEN';
 	const UIDNEXT = 'UIDNEXT';
-	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 	const UIDVALIDITY = 'UIDVALIDITY';
+	const UNSEEN = 'UNSEEN';
+	// rfc4551
+	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
index e4c6e9d9b..97435602f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
@@ -18,10 +18,14 @@ namespace MailSo\Imap\Enumerations;
  */
 abstract class FolderStatus
 {
+	// rfc3501
 	const MESSAGES = 'MESSAGES';
 	const RECENT = 'RECENT';
-	const UNSEEN = 'UNSEEN';
 	const UIDNEXT = 'UIDNEXT';
-	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 	const UIDVALIDITY = 'UIDVALIDITY';
+	const UNSEEN = 'UNSEEN';
+	// rfc4551
+	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
+	// rfc8474
+	const MAILBOXID = 'MAILBOXID';
 }
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 483f464b9..d7889c766 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
@@ -1453,6 +1453,10 @@ class MailClient
 
 			TO
 				[IMAP] addr-mailbox of the first "To" address.
+
+			RFC 5957:
+				$this->oImapClient->IsSupported('SORT=DISPLAY')
+				DISPLAYFROM, DISPLAYTO
 		 */
 
 		$aResultUids = false;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index dac650e6f..f977124be 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -17,7 +17,7 @@
 	</td>
 	<!-- ko if: $root.displaySpecSetting -->
 	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES">
-		<span class="e-action" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, visible: canBeSelected() && subscribed(), click: function(oFolder) { $root.toggleFolderCheckable(oFolder); }">
+		<span class="e-action" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, visible: canBeSelected() && subscribed(), click: $root.toggleFolderCheckable">
 			<i class="icon-check-mark-circle-two"></i>
 		</span>
 	</td>