diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 7e233a5ff..c0c4494ed 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -332,14 +332,15 @@ export class DomainPopupView extends AbstractViewPopup {
 		this.clearTesting();
 		this.edit(false);
 		this.imapCapabilities([
+			'BINARY',
 			'LIST-STATUS',
 			'METADATA',
 			'MOVE',
+			'NAMESPACE',
+			'PREVIEW',
 			'SORT',
-			'THREAD',
-			'BINARY',
 			'STATUS=SIZE',
-			'PREVIEW'
+			'THREAD'
 		]);
 		this.imapDisabled_capabilities(['PREVIEW','STATUS=SIZE']);
 		forEachObjectEntry(domainDefaults, (key, value) => this[key](value));
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 4d9848676..ea5dac24c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -79,10 +79,13 @@
 					}
 				}"></div>
 
-				<h4 data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></h4>
+				<h4>
+					<span data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></span>
+					<a style="margin-left:0.5em" href="https://github.com/the-djmaze/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
+				</h4>
 
-				<div data-bind="foreach: imapCapabilities">
-					<div style="display: inline-block; width: 33%; min-width: 16em">
+				<div data-bind="foreach: imapCapabilities" style="columns: 16em auto">
+					<div>
 						<label class="e-component e-checkbox material-design">
 							<div>
 								<input type="checkbox" data-bind="checked: $parent.imapDisabled_capabilities,  value: $data"/>