diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index f7232563c..684d3bb38 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -343,6 +343,7 @@ export class DomainPopupView extends AbstractViewPopup {
 					this[key]?.(value);
 				}
 			});
+			this.imapCapabilities(this.imapCapabilities.concat(this.imapDisabled_capabilities()).unique());
 			this.enableSmartPorts(true);
 		}
 	}
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 9bc21c4ac..fe48b07d5 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
@@ -98,6 +98,8 @@ class Settings extends \MailSo\Net\ConnectSettings
 		}
 		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));