diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 39661750d..42df779c0 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -92,7 +92,7 @@ export class AbstractViewCenter extends AbstractView
 {
 	constructor(name, templateID)
 	{
-		super(name, templateID, ViewType.Center);
+		super(name, templateID, ViewType.Content);
 	}
 }
 
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index a4b261090..31eb1398e 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -18,7 +18,7 @@ export const ViewType = {
 	Popup: 'Popups',
 	Left: 'Left',
 	Right: 'Right',
-	Center: 'Center'
+	Content: 'Content'
 };
 
 /**
@@ -76,7 +76,7 @@ function buildViewModel(ViewModelClass, vmScreen) {
 		let vmDom = null;
 		const vm = new ViewModelClass(vmScreen),
 			position = vm.viewModelPosition || '',
-			vmPlace = position ? doc.querySelector('#rl-content #rl-' + position.toLowerCase()) : null;
+			vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
 
 		ViewModelClass.__builded = true;
 		ViewModelClass.__vm = vm;
diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less
index 7ab37b90c..5f91e98fe 100644
--- a/dev/Styles/Admin.less
+++ b/dev/Styles/Admin.less
@@ -1,51 +1,28 @@
 
-.b-admin-left {
+#rl-left {
+	overflow: auto;
+	padding-top: 50px + @rlLowMargin + 10px;
 
-	.b-toolbar {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 34px;
-		padding: 8px 0 0 @rlLowMargin;
-	}
-
-	.b-content {
-		position: absolute;
-		top: 50px + @rlLowMargin + 10px;
-		bottom: @rlLowMargin;
-		left: 0;
-		right: 0;
-		overflow: hidden;
-
-		.content {
-			-webkit-overflow-scrolling: touch;
+	nav {
+		a {
+			color: var(--settings-menu-color, #333);
+			cursor: pointer;
+			display: block;
+			font-size: 18px;
+			line-height: 30px;
+			padding: 4px 10px;
+			text-decoration: none;
 		}
-	}
-}
 
-.b-admin-menu {
+		a:focus, a:hover {
+			background-color: var(--settings-menu-hover-bg-color, #333);
+			color: var(--settings-menu-hover-color, #eee);
+		}
 
-	a {
-		color: var(--settings-menu-color, #333);
-		cursor: pointer;
-		display: block;
-		font-size: 18px;
-		height: 30px;
-		line-height: 29px;
-		overflow: hidden;
-		padding: 4px 10px;
-		text-decoration: none;
-	}
-
-	a:focus, a:hover {
-		background-color: var(--settings-menu-hover-bg-color, #333);
-		color: var(--settings-menu-hover-color, #eee);
-	}
-
-	a.selected {
-		background-color: var(--settings-menu-selected-bg-color, #333);
-		color: var(--settings-menu-selected-color, #eee);
+		a.selected {
+			background-color: var(--settings-menu-selected-bg-color, #333);
+			color: var(--settings-menu-selected-color, #eee);
+		}
 	}
 }
 
@@ -82,10 +59,6 @@
 
 		box-shadow: @rlMainShadow;
 		border-radius: @rlMainBorderRadius;
-
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
 	}
 
 }
diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less
index 8fd23b9e7..dfd7e298d 100644
--- a/dev/Styles/Animations.less
+++ b/dev/Styles/Animations.less
@@ -25,7 +25,7 @@ html.rl-started-delay {
 
 @media screen and (min-width: 1000px) {
 
-	html.rl-started-trigger .b-login-content .loginFormWrapper {
+	html.rl-started-trigger .b-login-content {
 		/*transform: scale(1.1);*/
 		transform: translateY(-20px);
 		opacity: 0.5;
@@ -40,11 +40,7 @@ html.rl-started-delay {
 		font-weight: bold;
 	}
 
-	.b-login-content .afterLoginHide {
-		opacity: 0;
-	}
-
-	.b-login-content .loginFormWrapper {
+	.b-login-content {
 		transition: all 0.3s ease-out;
 	}
 
diff --git a/dev/Styles/AnimationsUser.less b/dev/Styles/AnimationsUser.less
index ce777e8c0..c465208b1 100644
--- a/dev/Styles/AnimationsUser.less
+++ b/dev/Styles/AnimationsUser.less
@@ -39,7 +39,7 @@
 		transition: margin 0.3s linear;
 	}
 
-	.b-folders .b-content.opacity-on-panel-disabled {
+	#rl-left .b-content {
 		transition: opacity 0.3s linear;
 	}
 
diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less
index 14667de8d..605d0354e 100644
--- a/dev/Styles/Contacts.less
+++ b/dev/Styles/Contacts.less
@@ -66,10 +66,6 @@
 		overflow-y: auto;
 		scroll-behavior: smooth;
 
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
-
 		.listClear {
 			text-align: center;
 			padding: 10px;
@@ -179,10 +175,6 @@
 		overflow: auto;
 		border-left: 1px solid rgba(128,128,128,0.25);
 
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
-
 		span {
 			height: 20px;
 			line-height: 20px;
diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index 836b16bdb..921853ddd 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -58,10 +58,6 @@
 		overflow: hidden;
 		overflow-y: auto;
 		min-width: 100px;
-
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
 	}
 
 	hr {
diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less
index c5a8632b9..94e549ea6 100644
--- a/dev/Styles/Layout.less
+++ b/dev/Styles/Layout.less
@@ -5,7 +5,7 @@
 	background-position: center;
 }
 
-#rl-center, #rl-left, #rl-right {
+#rl-left, #rl-right {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -17,23 +17,8 @@
 	z-index: 0;
 }
 
-#rl-content {
-	height: 100%;
-	width: 100%;
-}
-
-#rl-center {
-	min-width: 600px;
-	min-height: 400px;
-}
-
 html.rl-mobile {
 
-	#rl-center {
-		min-width: 250px;
-		min-height: 250px;
-	}
-
 	&:not(.rl-left-panel-disabled) #rl-right {
 		right: -150px;
 	}
@@ -218,11 +203,10 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable > .resizer,
 	z-index: 1100;
 	overflow: auto;
 	background-color: rgba(0,0,0,0.3);
-//	-webkit-overflow-scrolling: touch;
 }
 
-.b-settings-content {
-	padding:20px 20px 20px 30px;
+#rl-settings-subscreen {
+	padding:20px;
 }
 
 .dropdown-menu * + .dividerbar {
@@ -295,8 +279,8 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable > .resizer,
 		left: 155px;
 	}
 
-	.b-settings-content {
-		padding: 10px 10px 10px 20px;
+	#rl-settings-subscreen {
+		padding: 10px;
 	}
 
 	.dropdown-menu a {
@@ -319,7 +303,7 @@ html.rl-left-panel-disabled {
 			display: block;
 		}
 
-		.opacity-on-panel-disabled {
+		.b-content {
 			opacity: 0.3;
 		}
 
diff --git a/dev/Styles/LayoutAdmin.less b/dev/Styles/LayoutAdmin.less
index 69b9e23c1..dafda8c50 100644
--- a/dev/Styles/LayoutAdmin.less
+++ b/dev/Styles/LayoutAdmin.less
@@ -5,7 +5,7 @@
 	background-position: center;
 }
 
-#rl-center, #rl-left, #rl-right {
+#rl-left, #rl-right {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -17,16 +17,6 @@
 	z-index: 0;
 }
 
-#rl-content {
-	height: 100%;
-	width: 100%;
-}
-
-#rl-center {
-	min-width: 600px;
-	min-height: 400px;
-}
-
 #rl-left {
 	width: @rlLeftWidth;
 }
@@ -45,11 +35,10 @@
 	z-index: 1100;
 	overflow: auto;
 	background-color: rgba(0,0,0,0.3);
-//	-webkit-overflow-scrolling: touch;
 }
 
-.b-settings-content {
-	padding:20px 20px 20px 30px;
+#rl-settings-subscreen {
+	padding: 20px;
 }
 
 /* desktop */
@@ -72,13 +61,8 @@
 
 /* mobile and tablet */
 @media screen and (max-width: 999px) {
-	.b-settings-content {
-		padding: 10px 10px 10px 20px;
-	}
-
-	#rl-center {
-		min-width: 250px;
-		min-height: 250px;
+	#rl-settings-subscreen {
+		padding: 10px;
 	}
 
 	html:not(.rl-left-panel-disabled) #rl-right {
@@ -87,11 +71,7 @@
 
 	html.rl-left-panel-disabled {
 		#rl-left {
-			width: 0px !important;
-
-			.opacity-on-panel-disabled {
-				opacity: 0.3;
-			}
+			width: 0 !important;
 		}
 		#rl-right {
 			left: 5px !important;
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 2bcfd2368..c0a5ff70d 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -1,14 +1,12 @@
-
-.rl-view-model {
-	&.RL-Login, &.RL-AdminLogin {
-		position: fixed;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		width: 100%;
-		max-width: 450px;
-		z-index: 5;
-	}
+.RL-Login, .RL-AdminLogin {
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: 100%;
+	min-width: 250px;
+	max-width: 600px;
+	z-index: 5;
 }
 
 @glass-color: #fff;
@@ -17,9 +15,7 @@
 
 .b-login-content {
 
-	.loginFormWrapper {
-		position: relative;
-	}
+	position: relative;
 
 	.descWrapper {
 		color: var(--loading-color, #000);
@@ -29,13 +25,19 @@
 		text-shadow: var(--loading-text-shadow);
 	}
 
-	.loginForm {
+	.controls, .control-group {
+		margin-bottom: 25px;
+	}
+
+	form {
 		background-color: var(--login-bg-color, rgba(0, 0, 0, .5));
 		border: var(--login-border, 1px solid rgba(255, 255, 255, .2));
 		border-radius: var(--login-border-radius, 7px);
 		box-shadow: var(--login-box-shadow);
 		color: var(--login-color, @glass-m-color);
 		margin: 0;
+		padding: 40px 40px 20px 40px;
+		position: relative;
 
 		* {
 			color: var(--login-color, @glass-m-color);
@@ -52,14 +54,28 @@
 				border-color: @glass-error-color;
 			}
 		}
-	}
 
-	.controls, .control-group {
-		margin-bottom: 25px;
-	}
+		&.submitting > * {
+			opacity: 0.3;
+		}
 
-	.wrapper {
-		padding: 40px 40px 20px 40px;
+		&.submitting::after{
+			content: '';
+			position: absolute;
+			width: 60px;
+			height: 60px;
+			top: 50%;
+			left: 50%;
+			margin-top: -30px;
+			margin-left: -30px;
+
+			border: 8px solid transparent;
+			border-top-color: var(--spinner-color, #fff);
+			animation: loginRotation 1s infinite ease-in-out;
+
+			border-radius: 50%;
+			z-index: 1052;
+		}
 	}
 
 	.controls {
@@ -158,8 +174,8 @@
 }
 
 @media screen and (max-width: 480px) {
-	.b-login-content .loginFormWrapper {
-		.wrapper {
+	.b-login-content {
+		form {
 			padding: 30px 4vw 10px;
 		}
 	}
@@ -169,30 +185,6 @@
 	to   {transform: rotate(1turn);}
 }
 
-.submitting-pane {
-	position: relative;
-	&.submitting > * {
-		opacity: 0.3;
-	}
-	html &.submitting::after{
-		content: '';
-		position: absolute;
-		width: 60px;
-		height: 60px;
-		top: 50%;
-		left: 50%;
-		margin-top: -30px;
-		margin-left: -30px;
-
-		border: 8px solid transparent;
-		border-top-color: var(--spinner-color, #fff);
-		animation: loginRotation 1s infinite ease-in-out;
-
-		border-radius: 50%;
-		z-index: 1052;
-	}
-}
-
 .btn-submit-icon-wrp {
 	border: none;
 	background: none;
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 8a73446de..51ce71cb9 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -134,10 +134,6 @@ html.rl-no-preview-pane {
 
 		background-color: #fff;
 
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
-
 		.listClear {
 			text-align: center;
 			padding: 10px;
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 60d89596a..0787a50c4 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -57,10 +57,6 @@
 			color: #DA4F49;
 		}
 
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
-
 		.message-fixed-button-toolbar {
 			z-index: 100;
 			position: absolute;
@@ -190,7 +186,6 @@
 		left: 0;
 		right: 0;
 		overflow: auto;
-		-webkit-overflow-scrolling: touch;
 		border-radius: @rlLowBorderRadius;
 		scroll-behavior: smooth;
 
diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less
index c64c05742..b56b63f99 100644
--- a/dev/Styles/Settings.less
+++ b/dev/Styles/Settings.less
@@ -1,21 +1,11 @@
 
 .b-settins-left {
 
-	.b-toolbar {
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 34px;
-		padding: 8px 0 0 @rlLowMargin;
-	}
-
 	.b-footer {
 		position: absolute;
-		bottom: 20px;
+		bottom: 10px;
 		right: 0;
 		left: 0;
-		height: 20px;
 		padding: 0 10px 0 5px;
 		z-index: 101;
 	}
@@ -27,10 +17,6 @@
 		left: 0;
 		right: 0;
 		overflow: hidden;
-
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
 	}
 }
 
@@ -86,10 +72,6 @@
 		border: @rlMainBorderSize solid @rlMainDarkColor;
 		box-shadow: @rlMainShadow;
 		border-radius: @rlMainBorderRadius;
-
-		.content {
-			-webkit-overflow-scrolling: touch;
-		}
 	}
 
 	td {
diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js
index fd8af23b4..6cdbb11d7 100644
--- a/dev/View/Admin/Login.js
+++ b/dev/View/Admin/Login.js
@@ -21,8 +21,6 @@ class LoginAdminView extends AbstractViewCenter {
 			loginError: false,
 			passwordError: false,
 
-			formHidden: false,
-
 			submitRequest: false,
 			submitError: ''
 		});
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 49a412b4f..2f1644d92 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -46,8 +46,6 @@ class LoginUserView extends AbstractViewCenter {
 			emailError: false,
 			passwordError: false,
 
-			formHidden: false,
-
 			submitRequest: false,
 			submitError: '',
 			submitErrorAddidional: '',
diff --git a/snappymail/v/0.0.0/app/templates/Index.html b/snappymail/v/0.0.0/app/templates/Index.html
index b4d5e41b3..9020336f0 100644
--- a/snappymail/v/0.0.0/app/templates/Index.html
+++ b/snappymail/v/0.0.0/app/templates/Index.html
@@ -33,10 +33,8 @@
 		<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div>
 		<div id="rl-content" hidden="">
 			<div id="rl-popups"></div>
-			<div id="rl-center">
-				<div id="rl-left"></div>
-				<div id="rl-right"></div>
-			</div>
+			<div id="rl-left"></div>
+			<div id="rl-right"></div>
 		</div>
 	</div>
 	{{BaseTemplates}}
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 382ba7a0e..5af3d0b35 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -1,38 +1,36 @@
 <div class="b-login-content">
-	<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
-		<div class="alert" data-bind="hidden: !submitError()">
-			<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
-			<span data-bind="text: submitError"></span>
-		</div>
-		<form class="wrapper submitting-pane loginForm" action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
-			<div class="controls" data-bind="css: {'error': loginError}">
-				<div class="input-append">
-					<input required="" type="text" class="input-block-level inputLogin"
-						autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="textInput: login, disable: submitRequest"
-						data-i18n="[placeholder]LOGIN/LABEL_LOGIN" />
-					<span class="add-on fontastic">👤</span>
-				</div>
-			</div>
-			<div class="controls" data-bind="css: {'error': passwordError}">
-				<div class="input-append">
-					<input required="" type="password" class="input-block-level inputPassword"
-						autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="textInput: password, disable: submitRequest"
-						data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" />
-					<span class="add-on" tabindex="-1"
-						data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_LOGIN">
-						<i class="fontastic" data-bind="visible: '' === password()">🔑</i>
-						<button type="submit" class="btn-submit-icon-wrp login-submit-icon fontastic" data-bind="visible: '' !== password()">❯</button>
-					</span>
-				</div>
-			</div>
-			<div id="plugin-Login-BottomControlGroup"></div>
-			<div class="controls" data-bind="hidden: hideSubmitButton">
-				<button type="submit" class="btn btn-large btn-block buttonLogin"
-					data-bind="command: submitCommand"
-					data-i18n="LOGIN/BUTTON_LOGIN"></button>
-			</div>
-		</form>
+	<div class="alert" data-bind="hidden: !submitError()">
+		<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
+		<span data-bind="text: submitError"></span>
 	</div>
+	<form action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
+		<div class="controls" data-bind="css: {'error': loginError}">
+			<div class="input-append">
+				<input required="" type="text" class="input-block-level inputLogin"
+					autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
+					data-bind="textInput: login, disable: submitRequest"
+					data-i18n="[placeholder]LOGIN/LABEL_LOGIN" />
+				<span class="add-on fontastic">👤</span>
+			</div>
+		</div>
+		<div class="controls" data-bind="css: {'error': passwordError}">
+			<div class="input-append">
+				<input required="" type="password" class="input-block-level inputPassword"
+					autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+					data-bind="textInput: password, disable: submitRequest"
+					data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" />
+				<span class="add-on" tabindex="-1"
+					data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_LOGIN">
+					<i class="fontastic" data-bind="visible: '' === password()">🔑</i>
+					<button type="submit" class="btn-submit-icon-wrp login-submit-icon fontastic" data-bind="visible: '' !== password()">❯</button>
+				</span>
+			</div>
+		</div>
+		<div id="plugin-Login-BottomControlGroup"></div>
+		<div class="controls" data-bind="hidden: hideSubmitButton">
+			<button type="submit" class="btn btn-large btn-block buttonLogin"
+				data-bind="command: submitCommand"
+				data-i18n="LOGIN/BUTTON_LOGIN"></button>
+		</div>
+	</form>
 <div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
index 607c8e9f5..3633ccfe3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
@@ -1,7 +1,3 @@
-<div class="b-admin-left">
-	<div class="b-content opacity-on-panel-disabled">
-		<nav class="b-admin-menu" data-bind="foreach: menu">
-			<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
-		</nav>
-	</div>
-</div>
+<nav data-bind="foreach: menu">
+	<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
+</nav>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index cc1638852..ef55b815b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -6,10 +6,6 @@
 		<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
 	</div>
 	<div class="b-content">
-		<div class="content">
-			<div class="content-wrapper">
-				<div id="rl-settings-subscreen" class="b-settings-content"></div>
-			</div>
-		</div>
+		<div id="rl-settings-subscreen"></div>
 	</div>
 </div>
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 903e409ef..30df35d0c 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
@@ -1,4 +1,4 @@
-<div class="adminSecurity g-ui-user-select-none">
+<div class="g-ui-user-select-none">
 	<div class="legend" data-i18n="TAB_SECURITY/LEGEND_SECURITY"></div>
 	<div class="form-horizontal">
 		<div class="control-group">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 8836b452a..a24f0a7ae 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -1,59 +1,57 @@
 <div class="b-login-content">
-	<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
-		<div class="descWrapper" data-bind="visible: '' !== loadingDesc, text: loadingDesc"></div>
-		<div class="alert" data-bind="hidden: !submitError()" hidden="">
-			<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
-			<span data-bind="text: submitError"></span>
-			<p data-bind="visible: '' !== submitErrorAddidional(), text: submitErrorAddidional"></p>
-		</div>
-		<form class="wrapper submitting-pane loginForm" action="#/"
-			data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
-			<div class="controls" data-bind="css: {'error': emailError}">
-				<div class="input-append">
-					<input required="" type="text" class="input-block-level inputLogin" pattern="[^@\s]+(@[^\s]+)?" inputmode="email"
-						autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="textInput: email, disable: submitRequest"
-						data-i18n="[placeholder]GLOBAL/EMAIL" />
-					<span class="add-on icon-mail"></span>
-				</div>
-			</div>
-			<div class="controls" data-bind="css: {'error': passwordError}">
-				<div class="input-append">
-					<input required="" type="password" class="input-block-level inputPassword"
-						autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-						data-bind="textInput: password, disable: submitRequest"
-						data-i18n="[placeholder]GLOBAL/PASSWORD" />
-					<span class="add-on" tabindex="-1"
-						data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_SIGN_IN">
-						<i class="fontastic" data-bind="visible: '' === password()">🔑</i>
-						<button type="submit" class="btn-submit-icon-wrp login-submit-icon fontastic" data-bind="visible: '' !== password()">❯</button>
-					</span>
-				</div>
-			</div>
-			<div id="plugin-Login-BottomControlGroup"></div>
-			<div class="controls" data-bind="hidden: hideSubmitButton">
-				<button type="submit" class="btn btn-large btn-block buttonLogin"
-					data-bind="command: submitCommand"
-					data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
-			</div>
-			<div class="controls clearfix" style="margin-bottom: 10px">
-				<div class="pull-right language-buttons">
-					<a href="#" tabindex="-1" class="language-button fontastic"
-						data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"
-						data-i18n="[title]POPUPS_LANGUAGES/TITLE_LANGUAGES">
-						🌍
-					</a>
-				</div>
-
-				<div class="signMeLabel" data-bind="visible: signMeVisibility, component: {
-					name: 'CheckboxSimple',
-					params: {
-						label: 'LOGIN/LABEL_SIGN_ME',
-						value: signMe
-					}
-				}"></div>
-
-			</div>
-		</form>
+	<div class="descWrapper" data-bind="visible: '' !== loadingDesc, text: loadingDesc"></div>
+	<div class="alert" data-bind="hidden: !submitError()" hidden="">
+		<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
+		<span data-bind="text: submitError"></span>
+		<p data-bind="visible: '' !== submitErrorAddidional(), text: submitErrorAddidional"></p>
 	</div>
+	<form action="#/"
+		data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
+		<div class="controls" data-bind="css: {'error': emailError}">
+			<div class="input-append">
+				<input required="" type="text" class="input-block-level inputLogin" pattern="[^@\s]+(@[^\s]+)?" inputmode="email"
+					autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off" spellcheck="false"
+					data-bind="textInput: email, disable: submitRequest"
+					data-i18n="[placeholder]GLOBAL/EMAIL" />
+				<span class="add-on icon-mail"></span>
+			</div>
+		</div>
+		<div class="controls" data-bind="css: {'error': passwordError}">
+			<div class="input-append">
+				<input required="" type="password" class="input-block-level inputPassword"
+					autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+					data-bind="textInput: password, disable: submitRequest"
+					data-i18n="[placeholder]GLOBAL/PASSWORD" />
+				<span class="add-on" tabindex="-1"
+					data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_SIGN_IN">
+					<i class="fontastic" data-bind="visible: '' === password()">🔑</i>
+					<button type="submit" class="btn-submit-icon-wrp login-submit-icon fontastic" data-bind="visible: '' !== password()">❯</button>
+				</span>
+			</div>
+		</div>
+		<div id="plugin-Login-BottomControlGroup"></div>
+		<div class="controls" data-bind="hidden: hideSubmitButton">
+			<button type="submit" class="btn btn-large btn-block buttonLogin"
+				data-bind="command: submitCommand"
+				data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
+		</div>
+		<div class="controls clearfix" style="margin-bottom: 10px">
+			<div class="pull-right language-buttons">
+				<a href="#" tabindex="-1" class="language-button fontastic"
+					data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"
+					data-i18n="[title]POPUPS_LANGUAGES/TITLE_LANGUAGES">
+					🌍
+				</a>
+			</div>
+
+			<div class="signMeLabel" data-bind="visible: signMeVisibility, component: {
+				name: 'CheckboxSimple',
+				params: {
+					label: 'LOGIN/LABEL_SIGN_ME',
+					value: signMe
+				}
+			}"></div>
+
+		</div>
+	</form>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 081c655f4..ff6a3c798 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -6,15 +6,11 @@
 		</a>
 		<a class="btn buttonContacts fontastic" data-bind="visible: allowContacts, click: contactsClick" data-i18n="[title]GLOBAL/CONTACTS">📇</a>
 	</div>
-	<div class="b-content opacity-on-panel-disabled" data-bind="css: {'inbox-is-starred': isInboxStarred}">
-		<div class="content">
-			<div class="content-wrapper">
-				<div class="b-folders-system" data-bind="template: { name: 'MailFolderListSystemItem', foreach: folderListSystem }"></div>
-				<hr/>
-				<div class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderList }"></div>
-				<div class="move-action-content-wrapper" data-bind="visible: moveAction"></div>
-			</div>
-		</div>
+	<div class="b-content" data-bind="css: {'inbox-is-starred': isInboxStarred}">
+		<div class="b-folders-system" data-bind="template: { name: 'MailFolderListSystemItem', foreach: folderListSystem }"></div>
+		<hr/>
+		<div class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderList }"></div>
+		<div class="move-action-content-wrapper" data-bind="visible: moveAction"></div>
 	</div>
 	<div class="b-content show-on-panel-disabled" data-bind="click: function () { leftPanelDisabled(false); }"></div>
 	<div class="b-footer btn-toolbar hide-mobile">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index c37f12f96..840979dba 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -163,7 +163,7 @@
 					<div class="input-append" data-bind="visible: allowSearch">
 						<div class="close-input-wrp">
 							<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">×</a>
-							<input type="text" class="span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
+							<input type="search" class="span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
 						</div>
 						<a class="btn buttonMoreSearch" data-bind="visible: allowSearchAdv, click: advancedSearchClick">
 							<span class="caret"></span>
@@ -172,82 +172,78 @@
 				</div>
 			</div>
 			<div class="b-content" data-bind="initDom: dragOverBodyArea">
-				<div class="content">
-					<div class="content-wrapper">
-						<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
-							<i class="fontastic" data-bind="click: cancelThreadUid">⬅</i>
-							<span data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
-						</div>
-						<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc(), text: messageListSearchDesc"></div>
-						<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
-							<i class="fontastic e-icon">⬇</i>
-							<span data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
-						</div>
-						<div class="listClear" data-bind="visible: clearListIsVisible()">
-							<span class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="command: clearCommand"></span>
-						</div>
-						<div class="listError" data-bind="visible: !dragOver() && '' !== messageListError()">
-							<span class="error" data-bind="text: messageListError"></span>
-						</div>
-						<div class="listEmptyList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' === messageListSearch()"
-							data-i18n="MESSAGE_LIST/EMPTY_LIST"></div>
-						<div class="listEmptyListLoading" data-bind="visible: !dragOver() && 0 === messageList().length &&
-							messageListCompleteLoadingThrottle() && '' === messageListError()">
-							<span data-i18n="GLOBAL/LOADING"></span>
-							<span class="textLoadingAnimationD1">.</span>
-							<span class="textLoadingAnimationD2">.</span>
-							<span class="textLoadingAnimationD3">.</span>
-						</div>
-						<div class="listEmptySearchList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' !== messageListSearch()"
-							data-i18n="MESSAGE_LIST/EMPTY_SEARCH_LIST"></div>
-						<div data-bind="dragmessages: getDragData">
-							<div class="messageListPlace" data-bind="foreach: messageList">
+				<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
+					<i class="fontastic" data-bind="click: cancelThreadUid">⬅</i>
+					<span data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
+				</div>
+				<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc(), text: messageListSearchDesc"></div>
+				<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
+					<i class="fontastic e-icon">⬇</i>
+					<span data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
+				</div>
+				<div class="listClear" data-bind="visible: clearListIsVisible()">
+					<span class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="command: clearCommand"></span>
+				</div>
+				<div class="listError" data-bind="visible: !dragOver() && '' !== messageListError()">
+					<span class="error" data-bind="text: messageListError"></span>
+				</div>
+				<div class="listEmptyList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' === messageListSearch()"
+					data-i18n="MESSAGE_LIST/EMPTY_LIST"></div>
+				<div class="listEmptyListLoading" data-bind="visible: !dragOver() && 0 === messageList().length &&
+					messageListCompleteLoadingThrottle() && '' === messageListError()">
+					<span data-i18n="GLOBAL/LOADING"></span>
+					<span class="textLoadingAnimationD1">.</span>
+					<span class="textLoadingAnimationD2">.</span>
+					<span class="textLoadingAnimationD3">.</span>
+				</div>
+				<div class="listEmptySearchList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' !== messageListSearch()"
+					data-i18n="MESSAGE_LIST/EMPTY_SEARCH_LIST"></div>
+				<div data-bind="dragmessages: getDragData">
+					<div class="messageListPlace" data-bind="foreach: messageList">
 
-								<div class="messageListItem" data-bind="css: lineAsCss()">
-									<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-
-									<div class="flagParent">
-										<i class="flagOn fontastic">★</i>
-										<i class="flagOnHalf fontastic">☆</i>
-										<i class="flagOff fontastic">☆</i>
-										<!-- ⚐⚑ -->
-									</div>
-
-									<div class="senderParent actionHandle">
-										<i class="replyFlag fontastic">←</i>
-										<i class="forwardFlag fontastic">→</i>
-										<span class="sender" data-bind="text: senderEmailsString, attr: {'title': senderClearEmailsString}"></span>
-									</div>
-
-									<div class="attachmentParent actionHandle">
-										<i data-bind="css: attachmentIconClass"></i>
-									</div>
-
-									<div class="subjectParent actionHandle">
-										<b class="importantMark">!</b>
-										<span class="emptySubjectText" data-bind="text: $root.emptySubjectValue"></span>
-										<span class="subject" data-bind="text: subject"></span>
-									</div>
-
-									<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
-
-									<div class="threadsParent" data-bind="visible: 1 < threadsLen()">
-										<span class="threads-len">
-											<span class="threads-len-data">
-												<span data-bind="text: threadsLen"></span>
-												<i class="icon-right-mini"></i>
-											</span>
-										</span>
-									</div>
-
-									<time class="actionHandle" data-moment-format="SHORT" data-moment-format-title="FULL" data-bind="moment: dateTimeStampInUTC"></time>
-								</div>
+						<div class="messageListItem" data-bind="css: lineAsCss()">
+							<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 
+							<div class="flagParent">
+								<i class="flagOn fontastic">★</i>
+								<i class="flagOnHalf fontastic">☆</i>
+								<i class="flagOff fontastic">☆</i>
+								<!-- ⚐⚑ -->
 							</div>
+
+							<div class="senderParent actionHandle">
+								<i class="replyFlag fontastic">←</i>
+								<i class="forwardFlag fontastic">→</i>
+								<span class="sender" data-bind="text: senderEmailsString, attr: {'title': senderClearEmailsString}"></span>
+							</div>
+
+							<div class="attachmentParent actionHandle">
+								<i data-bind="css: attachmentIconClass"></i>
+							</div>
+
+							<div class="subjectParent actionHandle">
+								<b class="importantMark">!</b>
+								<span class="emptySubjectText" data-bind="text: $root.emptySubjectValue"></span>
+								<span class="subject" data-bind="text: subject"></span>
+							</div>
+
+							<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
+
+							<div class="threadsParent" data-bind="visible: 1 < threadsLen()">
+								<span class="threads-len">
+									<span class="threads-len-data">
+										<span data-bind="text: threadsLen"></span>
+										<i class="icon-right-mini"></i>
+									</span>
+								</span>
+							</div>
+
+							<time class="actionHandle" data-moment-format="SHORT" data-moment-format-title="FULL" data-bind="moment: dateTimeStampInUTC"></time>
 						</div>
-						<div id="messagesDragImage"><span class="text"></span>&nbsp;<i class="icon-mail"></i></div>
+
 					</div>
 				</div>
+				<div id="messagesDragImage"><span class="text"></span>&nbsp;<i class="icon-mail"></i></div>
 			</div>
 			<div class="b-footer thm-message-list-bottom-toolbar">
 				<span data-bind="visible: 0 < userUsageProc(), attr: { title: quotaTooltip() }" class="e-quota">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index de7b03f9b..5a0967f8f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -244,82 +244,79 @@
 						</div>
 					</div>
 					<div class="messageItem fixIndex" data-bind="css: viewLineAsCss(), attr: {'style': 'top:' + viewBodyTopValue() + 'px' }">
-						<div class="content" tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused }">
+						<div tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused }">
 
-							<div class="content-wrapper">
+							<div>
+								<span class="buttonFull" data-bind="click: toggleFullScreen">
+									<i data-bind="css: { 'icon-arrows-out': !fullScreenMode(), 'icon-arrows-in': fullScreenMode }"></i>
+								</span>
 
-								<div>
-									<span class="buttonFull" data-bind="click: toggleFullScreen">
-										<i data-bind="css: { 'icon-arrows-out': !fullScreenMode(), 'icon-arrows-in': fullScreenMode }"></i>
-									</span>
+								<div class="line-loading e-strip-animation" data-bind="visible: messageLoadingThrottle()"></div>
 
-									<div class="line-loading e-strip-animation" data-bind="visible: messageLoadingThrottle()"></div>
-
-									<div class="loading g-ui-min-height-300" data-bind="visible: messageLoadingThrottle()">
-										<span class="text" data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
-									</div>
+								<div class="loading g-ui-min-height-300" data-bind="visible: messageLoadingThrottle()">
+									<span class="text" data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
 								</div>
+							</div>
 
-								<div class="g-ui-min-height-300 content-content" data-bind="visible: !messageLoadingThrottle()">
-									<div class="bodySubHeader">
-										<div class="showImages" data-bind="visible: message() && message().hasImages(), click: function() { showImages(message()); }">
-											<i class="fontastic">🖼</i>
-											<span class="text" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></span>
-										</div>
-										<div class="readReceipt" data-bind="visible: message() && !isDraftOrSentFolder() && '' !== message().readReceipt() && !message().isReadReceipt(), click: function() { readReceipt(message()); }">
-											<i class="icon-mail"></i>
-											<span class="text" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></span>
-										</div>
-										<div class="attachmentsPlace" data-bind="visible: message() && message().attachments().hasVisible(),
-											css: {'selection-mode' : showAttachmnetControls, 'unselectedAttachmentsError': highlightUnselectedAttachments}">
-											<ul class="attachmentList" data-bind="foreach: message() ? message().attachments() : []">
-												<li class="attachmentItem" draggable="true"
-														data-bind="visible: !isLinked, event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
-													<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
-														<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
-														<div class="showPreview">
-															<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
-																<i class="iconMain" data-bind="css: iconClass()"></i>
-																<div class="iconBG" data-bind="attr: { 'style': linkThumbnailPreviewStyle() }"></div>
-																<div class="iconPreview fontastic">👁</div>
-															</a>
-														</div>
-														<div class="showPreplay">
+							<div class="g-ui-min-height-300" data-bind="visible: !messageLoadingThrottle()">
+								<div class="bodySubHeader">
+									<div class="showImages" data-bind="visible: message() && message().hasImages(), click: function() { showImages(message()); }">
+										<i class="fontastic">🖼</i>
+										<span class="text" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></span>
+									</div>
+									<div class="readReceipt" data-bind="visible: message() && !isDraftOrSentFolder() && '' !== message().readReceipt() && !message().isReadReceipt(), click: function() { readReceipt(message()); }">
+										<i class="icon-mail"></i>
+										<span class="text" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></span>
+									</div>
+									<div class="attachmentsPlace" data-bind="visible: message() && message().attachments().hasVisible(),
+										css: {'selection-mode' : showAttachmnetControls, 'unselectedAttachmentsError': highlightUnselectedAttachments}">
+										<ul class="attachmentList" data-bind="foreach: message() ? message().attachments() : []">
+											<li class="attachmentItem" draggable="true"
+													data-bind="visible: !isLinked, event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
+												<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
+													<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
+													<div class="showPreview">
+														<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
 															<i class="iconMain" data-bind="css: iconClass()"></i>
-															<div class="iconPreview fontastic">▶</div>
-														</div>
+															<div class="iconBG" data-bind="attr: { 'style': linkThumbnailPreviewStyle() }"></div>
+															<div class="iconPreview fontastic">👁</div>
+														</a>
 													</div>
-													<div class="attachmentNameParent">
-														<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;" class="attachmentName" data-bind="text: fileName"></div>
-														<div class="attachmentSize" data-bind="text: friendlySize"></div>
+													<div class="showPreplay">
+														<i class="iconMain" data-bind="css: iconClass()"></i>
+														<div class="iconPreview fontastic">▶</div>
 													</div>
-													<div class="checkboxAttachment fontastic"
-															data-bind="text: checked() ? '☑' : '☐',
-															click: function () { checked(!checked()); return false }"></div>
-												</li>
-											</ul>
-											<i class="fontastic controls-handle" data-bind="visible: allowAttachmnetControls() && !showAttachmnetControls(), click: function () { showAttachmnetControls(true); showAttachmnetControlsState(true); }">⚙</i>
-										</div>
-
-										<div class="attachmentsControls"
-											data-bind="visible: showAttachmnetControls() && message() && message().attachments().hasVisible()">
-
-											<span data-bind="visible: downloadAsZipAllowed">
-												<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
-												<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
-													css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
-												<span class="g-ui-link" data-bind="click: downloadAsZip"
-													data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
-											</span>
-
-											<button type="button" class="close" style="margin-right: 5px;"
-												data-bind="click: function () { showAttachmnetControls(false); showAttachmnetControlsState(false); }">×</button>
-										</div>
+												</div>
+												<div class="attachmentNameParent">
+													<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;" class="attachmentName" data-bind="text: fileName"></div>
+													<div class="attachmentSize" data-bind="text: friendlySize"></div>
+												</div>
+												<div class="checkboxAttachment fontastic"
+														data-bind="text: checked() ? '☑' : '☐',
+														click: function () { checked(!checked()); return false }"></div>
+											</li>
+										</ul>
+										<i class="fontastic controls-handle" data-bind="visible: allowAttachmnetControls() && !showAttachmnetControls(), click: function () { showAttachmnetControls(true); showAttachmnetControlsState(true); }">⚙</i>
 									</div>
 
-									<div class="bodyText g-ui-min-height-300"
-										data-bind="initDom: messagesBodiesDom"></div>
+									<div class="attachmentsControls"
+										data-bind="visible: showAttachmnetControls() && message() && message().attachments().hasVisible()">
+
+										<span data-bind="visible: downloadAsZipAllowed">
+											<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
+											<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
+												css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
+											<span class="g-ui-link" data-bind="click: downloadAsZip"
+												data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
+										</span>
+
+										<button type="button" class="close" style="margin-right: 5px;"
+											data-bind="click: function () { showAttachmnetControls(false); showAttachmnetControlsState(false); }">×</button>
+									</div>
 								</div>
+
+								<div class="bodyText g-ui-min-height-300"
+									data-bind="initDom: messagesBodiesDom"></div>
 							</div>
 						</div>
 					</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index ccf3cc823..70d841995 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -161,32 +161,28 @@
 		</div>
 
 		<div class="attachmentAreaParent b-content" data-bind="visible: attachmentsPlace">
-			<div class="content">
-				<div class="content-wrapper">
-					<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropEnabled() && dragAndDropVisible(), initDom: composeUploaderDropPlace, css: {'dragAndDropOver': dragAndDropOver}"
-						data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
-					<ul class="attachmentList" data-bind="foreach: attachments">
-						<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
-							<div class="attachmentIconParent">
-								<i class="iconMain" data-bind="css: iconClass(), visible: !uploading() || 0 === progress()"></i>
-								<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
-								<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
-							</div>
-							<div class="attachmentNameParent">
-								<button type="button" class="close pull-right" style="margin-top:-4px;" data-bind="click: cancel">×</button>
-								<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
-									<span class="attachmentName" data-bind="text: fileName"></span>&nbsp;
-								</div>
-								<div>
-									<span class="attachmentSize" data-bind="text: friendlySize"></span>&nbsp;
-								</div>
-							</div>
-						</li>
-					</ul>
-					<div class="no-attachments-desc" data-bind="visible: 0 === attachments().length"
-						data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></div>
-				</div>
-			</div>
+			<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropEnabled() && dragAndDropVisible(), initDom: composeUploaderDropPlace, css: {'dragAndDropOver': dragAndDropOver}"
+				data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
+			<ul class="attachmentList" data-bind="foreach: attachments">
+				<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
+					<div class="attachmentIconParent">
+						<i class="iconMain" data-bind="css: iconClass(), visible: !uploading() || 0 === progress()"></i>
+						<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
+						<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
+					</div>
+					<div class="attachmentNameParent">
+						<button type="button" class="close pull-right" style="margin-top:-4px;" data-bind="click: cancel">×</button>
+						<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
+							<span class="attachmentName" data-bind="text: fileName"></span>&nbsp;
+						</div>
+						<div>
+							<span class="attachmentSize" data-bind="text: friendlySize"></span>&nbsp;
+						</div>
+					</div>
+				</li>
+			</ul>
+			<div class="no-attachments-desc" data-bind="visible: 0 === attachments().length"
+				data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></div>
 		</div>
 
 		<div class="textAreaParent" data-bind="visible: !attachmentsPlace(), initDom: composeEditorArea"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index 8bfdb707f..c1bea9e03 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -52,25 +52,23 @@
 		</div>
 		<div class="b-list-content g-ui-user-select-none" data-bind="css: {'hideContactListCheckbox': !useCheckboxesInList()}">
 			<div class="content">
-				<div class="content-wrapper">
-					<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
-						<span class="g-ui-link" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
-					</div>
-					<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()"
-						data-i18n="CONTACTS/EMPTY_LIST"></div>
-					<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
-						<span data-i18n="GLOBAL/LOADING"></span>
-						<span class="textLoadingAnimationD1">.</span>
-						<span class="textLoadingAnimationD2">.</span>
-						<span class="textLoadingAnimationD3">.</span>
-					</div>
-					<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()"
-						data-i18n="CONTACTS/EMPTY_SEARCH"></div>
-					<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: 0 < contacts().length">
-						<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
-							<div class="checkboxItem fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-							<div class="nameParent actionHandle" data-bind="text: display"></div>
-						</div>
+				<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
+					<span class="g-ui-link" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
+				</div>
+				<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()"
+					data-i18n="CONTACTS/EMPTY_LIST"></div>
+				<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
+					<span data-i18n="GLOBAL/LOADING"></span>
+					<span class="textLoadingAnimationD1">.</span>
+					<span class="textLoadingAnimationD2">.</span>
+					<span class="textLoadingAnimationD3">.</span>
+				</div>
+				<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()"
+					data-i18n="CONTACTS/EMPTY_SEARCH"></div>
+				<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: 0 < contacts().length">
+					<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
+						<div class="checkboxItem fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
+						<div class="nameParent actionHandle" data-bind="text: display"></div>
 					</div>
 				</div>
 			</div>
@@ -127,87 +125,83 @@
 			</div>
 		</div>
 		<div class="b-view-content" data-bind="css: {'read-only': viewReadOnly}">
-			<div class="content">
-				<div class="content-wrapper">
-					<div class="b-contact-view-desc" data-bind="visible: emptySelection"
-						data-i18n="CONTACTS/CONTACT_VIEW_DESC"></div>
-					<div data-bind="visible: !emptySelection()">
-						<div class="form-horizontal top-part">
-							<div class="control-group" data-bind="visible: !viewReadOnly() || contactHasValidName()">
-								<label class="control-label fontastic iconsize24">👤</label>
-								<div class="controls">
-									<div data-bind="foreach: viewPropertiesNames">
-										<div class="property-line">
-											<span data-bind="text: value"></span>
-											<input type="text"
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
-										</div>
-									</div>
-									<div data-bind="visible: 0 < viewPropertiesOther().length, foreach: viewPropertiesOther">
-										<div class="property-line">
-											<!-- ko if: !largeValue() -->
-											<span data-bind="text: value"></span>
-											<input type="text"
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
-											<!-- /ko -->
-											<!-- ko if: largeValue -->
-											<span data-bind="text: value"></span>
-											<textarea
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}"></textarea>
-											<!-- /ko -->
-										</div>
-									</div>
+			<div class="b-contact-view-desc" data-bind="visible: emptySelection"
+				data-i18n="CONTACTS/CONTACT_VIEW_DESC"></div>
+			<div data-bind="visible: !emptySelection()">
+				<div class="form-horizontal top-part">
+					<div class="control-group" data-bind="visible: !viewReadOnly() || contactHasValidName()">
+						<label class="control-label fontastic iconsize24">👤</label>
+						<div class="controls">
+							<div data-bind="foreach: viewPropertiesNames">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
 								</div>
 							</div>
-							<div class="control-group" data-bind="visible: !viewReadOnly() || 0 < viewPropertiesEmails().length">
-								<label class="control-label fontastic iconsize24" data-i18n="[title]GLOBAL/EMAIL">@</label>
-								<div class="controls">
-									<div data-bind="foreach: viewPropertiesEmails">
-										<div class="property-line">
-											<span data-bind="text: value"></span>
-											<input type="text"
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
-										</div>
-									</div>
-									<a href="javascript:void(0);" class="g-ui-link add-link" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n="CONTACTS/LINK_ADD_EMAIL"></a>
-								</div>
-							</div>
-							<div class="control-group" data-bind="visible: 0 < viewPropertiesPhones().length">
-								<label class="control-label fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_PHONE">📞</label>
-								<div class="controls">
-									<div data-bind="foreach: viewPropertiesPhones">
-										<div class="property-line">
-											<span data-bind="text: value"></span>
-											<input type="text"
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
-										</div>
-									</div>
-								</div>
-							</div>
-							<div class="control-group" data-bind="visible: 0 < viewPropertiesWeb().length">
-								<label class="control-label fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_WEB">🌍</label>
-								<div class="controls">
-									<div data-bind="foreach: viewPropertiesWeb">
-										<div class="property-line">
-											<span data-bind="text: value"></span>
-											<input type="text" placeholder="https://"
-												autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
-										</div>
-									</div>
+							<div data-bind="visible: 0 < viewPropertiesOther().length, foreach: viewPropertiesOther">
+								<div class="property-line">
+									<!-- ko if: !largeValue() -->
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}" />
+									<!-- /ko -->
+									<!-- ko if: largeValue -->
+									<span data-bind="text: value"></span>
+									<textarea
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}"></textarea>
+									<!-- /ko -->
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: !viewReadOnly() || 0 < viewPropertiesEmails().length">
+						<label class="control-label fontastic iconsize24" data-i18n="[title]GLOBAL/EMAIL">@</label>
+						<div class="controls">
+							<div data-bind="foreach: viewPropertiesEmails">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
+								</div>
+							</div>
+							<a href="javascript:void(0);" class="g-ui-link add-link" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n="CONTACTS/LINK_ADD_EMAIL"></a>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: 0 < viewPropertiesPhones().length">
+						<label class="control-label fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_PHONE">📞</label>
+						<div class="controls">
+							<div data-bind="foreach: viewPropertiesPhones">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: 0 < viewPropertiesWeb().length">
+						<label class="control-label fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_WEB">🌍</label>
+						<div class="controls">
+							<div data-bind="foreach: viewPropertiesWeb">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text" placeholder="https://"
+										autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+										data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
 								</div>
 							</div>
 						</div>
-<!--
-						<div class="e-read-only-sign fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_READ_ONLY">🔒</div>
--->
 					</div>
 				</div>
+<!--
+				<div class="e-read-only-sign fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_READ_ONLY">🔒</div>
+-->
 			</div>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index 334ce3451..08c1ae934 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,17 +1,13 @@
 <div class="b-settins-left">
-	<div class="b-content opacity-on-panel-disabled">
+	<div class="b-content">
 		<nav class="b-settings-menu" data-bind="foreach: menu">
 			<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
 		</nav>
 	</div>
 	<div class="b-content show-on-panel-disabled" data-bind="click: function () { leftPanelDisabled(false); }"></div>
 	<div class="b-footer">
-		<div class="btn-toolbar">
-			<div class="btn-group">
-				<a class="btn buttonResize" data-bind="click: function () { leftPanelDisabled(!leftPanelDisabled()); }">
-					<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
-				</a>
-			</div>
-		</div>
+		<a class="btn buttonResize" data-bind="click: function () { leftPanelDisabled(!leftPanelDisabled()); }">
+			<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
+		</a>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index ab9f9cdae..75c51ddc6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -14,10 +14,6 @@
 		</div>
 	</div>
 	<div class="b-content">
-		<div class="content">
-			<div class="content-wrapper">
-				<div id="rl-settings-subscreen" class="b-settings-content"></div>
-			</div>
-		</div>
+		<div id="rl-settings-subscreen"></div>
 	</div>
 </div>