diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
index 567e641ba..ce15fc9e0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginProperty.html
@@ -31,7 +31,7 @@
 			<input type="url"
 				data-bind="value: value, attr: {placeholder: placeholder}" />
 		<!-- /ko -->
-		<span tabindex="0" class="help-block" data-bind="visible: '' !== Desc">
-			<span data-bind="text: Desc"></span>
-		</span>
+		<!-- ko if: '' !== Desc -->
+		<span tabindex="0" class="help-block"><span data-bind="text: Desc"></span></span>
+		<!-- /ko -->
 	</div>
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 a2f2b9ce6..588d09ad2 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
@@ -33,6 +33,15 @@
 							<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 								data-bind="textInput: imapServer, hasfocus: imapServerFocus" />
 						</div>
+						<div class="span2">
+							<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
+							<br />
+							<select class="span2" data-bind="value: imapSecure">
+								<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
+								<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
+								<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+							</select>
+						</div>
 						<div class="span2">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 							<br />
@@ -40,14 +49,7 @@
 								style="width:6em" data-bind="textInput: imapPort" />
 						</div>
 					</div>
-					<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 					<br />
-					<select data-bind="value: imapSecure">
-						<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-						<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-						<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
-					</select>
-					<br /><br />
 					<div data-bind="component: {
 						name: 'Checkbox',
 						params: {
@@ -73,6 +75,15 @@
 								<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 									data-bind="textInput: smtpServer, hasfocus: smtpServerFocus" />
 							</div>
+							<div class="span2">
+								<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
+								<br />
+								<select class="span2" data-bind="value: smtpSecure">
+									<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
+									<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
+									<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+								</select>
+							</div>
 							<div class="span2">
 								<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 								<br />
@@ -80,14 +91,7 @@
 									style="width:6em" data-bind="textInput: smtpPort" />
 							</div>
 						</div>
-						<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 						<br />
-						<select data-bind="value: smtpSecure">
-							<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-							<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-							<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
-						</select>
-						<br /><br />
 						<div data-bind="component: {
 							name: 'Checkbox',
 							params: {
@@ -154,20 +158,22 @@
 								<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 									data-bind="textInput: sieveServer, hasfocus: sieveServerFocus" />
 							</div>
-							<div class="span1">
+							<div class="span2">
+								<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
+								<br />
+								<select class="span2" data-bind="value: sieveSecure">
+									<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
+									<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
+									<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+								</select>
+							</div>
+							<div class="span2">
 								<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 								<br />
 								<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 									style="width:6em" data-bind="textInput: sievePort" />
 							</div>
 						</div>
-						<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
-						<br />
-						<select data-bind="value: sieveSecure">
-							<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-							<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-							<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
-						</select>
 					</div>
 				</div>