diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 02d547c4e..7f925251f 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -36,9 +36,6 @@ export class AbstractApp {
 					createViewModel: (params, componentInfo) => {
 						params = params || {};
 						i18nToNodes(componentInfo.element);
-						if (params.inline) {
-							componentInfo.element.style.display = 'inline-block';
-						}
 						return new ClassObject(params);
 					}
 				}
diff --git a/dev/Component/Checkbox.js b/dev/Component/Checkbox.js
index 68825468f..5d427c89c 100644
--- a/dev/Component/Checkbox.js
+++ b/dev/Component/Checkbox.js
@@ -7,7 +7,6 @@ export class CheckboxComponent {
 			: ko.observable(undefined === params.enable || !!params.enable);
 
 		this.label = params.label;
-		this.inline = params.inline;
 	}
 
 	click() {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index fd3b9b555..98171ac6c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -32,6 +32,7 @@
 		</tr>
 	</tbody>
 </table>
+<hr/>
 <div>
 	<input data-i18n="[placeholder]GLOBAL/USERNAME" data-bind="textInput: username">
 	<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: testUsername"></button>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 65d93e872..6d3d1aa3b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -13,8 +13,7 @@
 				name: 'Checkbox',
 				params: {
 					value: capaOpenPGP,
-					label: 'TAB_SECURITY/LABEL_ALLOW_OPEN_PGP',
-					inline: true
+					label: 'TAB_SECURITY/LABEL_ALLOW_OPEN_PGP'
 				}
 			}"></div>
 		</div>
@@ -65,11 +64,9 @@
 				name: 'Checkbox',
 				params: {
 					value: verifySslCertificate,
-					label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION',
-					inline: true
+					label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
 				}
 			}"></div>
-			<br>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
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 069670e3d..bf8318a4b 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
@@ -47,12 +47,11 @@
 					</div>
 				</div>
 				<br>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-						value: imapShortLogin,
-						inline: true
+						value: imapShortLogin
 					}
 				}"></div>
 				<span style="opacity:0.7"> (user@domain.com → user)</span>
@@ -62,11 +61,9 @@
 					name: 'Checkbox',
 					params: {
 						value: imapSslVerify_peer,
-						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION',
-						inline: true
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
 					}
 				}"></div>
-				<br>
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
@@ -107,12 +104,11 @@
 						</div>
 					</div>
 					<br>
-					<div data-bind="component: {
+					<div style="display: inline-block;" data-bind="component: {
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-							value: smtpShortLogin,
-							inline: true
+							value: smtpShortLogin
 						}
 					}"></div>
 					<span style="opacity:0.7"> (user@domain.com → user)</span>
@@ -129,17 +125,14 @@
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_SET_SENDER',
-						value: smtpSetSender,
-						inline: true
+						value: smtpSetSender
 					}
 				}"></div>
-				<br>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_USE_PHP_MAIL',
-						value: smtpUsePhpMail,
-						inline: true
+						value: smtpUsePhpMail
 					}
 				}"></div>
 				<span style="color:red"> (<span data-i18n="HINTS/BETA"></span>)</span>
@@ -149,11 +142,9 @@
 					name: 'Checkbox',
 					params: {
 						value: smtpSslVerify_peer,
-						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION',
-						inline: true
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
 					}
 				}"></div>
-				<br>
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index d2d91d289..e80b2e0b9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -187,13 +187,12 @@
 	<div class="control-group">
 		<div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC',
 						value: desktopNotification,
-						enable: isDesktopNotificationAllowed,
-						inline: true
+						enable: isDesktopNotificationAllowed
 					}
 				}"></div>
 				&nbsp;
@@ -201,12 +200,11 @@
 				<span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span>
 			</div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'SETTINGS_GENERAL/SOUND_NOTIFICATION',
-						value: soundNotification,
-						inline: true
+						value: soundNotification
 					}
 				}"></div>
 				&nbsp;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index 7f1dd2633..45a67e77b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -5,7 +5,6 @@
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
-				inline: true,
 				options: autoLogoutOptions,
 				value: autoLogout,
 				trigger: autoLogoutTrigger,