diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index d81c3eb0b..38cd4f535 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -123,9 +123,7 @@ export class MailMessageList extends AbstractViewRight {
 
 		addComputablesTo(this, {
 
-			sortSupported: () =>
-				(FolderUserStore.hasCapability('SORT') | FolderUserStore.hasCapability('ESORT'))
-				&& !MessagelistUserStore.threadUid(),
+			sortSupported: () => FolderUserStore.hasCapability('SORT') && !MessagelistUserStore.threadUid(),
 
 			messageListSearchDesc: () => {
 				const value = MessagelistUserStore().search;
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 fe48b07d5..b634bb6af 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
@@ -96,11 +96,6 @@ class Settings extends \MailSo\Net\ConnectSettings
 			// RFC 8970
 			$object->disabled_capabilities[] = 'PREVIEW';
 		}
-		if (\in_array('SORT', $object->disabled_capabilities)) {
-			$object->disabled_capabilities[] = 'ESORT';
-		} else {
-			$object->disabled_capabilities = \array_diff($object->disabled_capabilities, ['ESORT']);
-		}
 		$object->disabled_capabilities = \array_values(\array_unique($object->disabled_capabilities));
 
 		return $object;