diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index b5dd1bb22..4a21bea36 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -121,7 +121,6 @@ export class AbstractApp {
 		initOnStartOrLangChange();
 
 		if (mobile) {
-			$htmlCL.toggle('rl-mobile', mobile);
 			leftPanelDisabled(true);
 		} else {
 			window.addEventListener('resize', () => leftPanelDisabled(767 >= window.innerWidth));
diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less
index 2945b501f..2697280b4 100644
--- a/dev/Styles/Admin.less
+++ b/dev/Styles/Admin.less
@@ -114,7 +114,3 @@
 		}
 	}
 }
-
-html.rl-mobile .b-settings-content .legend {
-	width: auto;
-}
diff --git a/dev/Styles/AdminDomains.less b/dev/Styles/AdminDomains.less
index 40d6e94de..1fae6b1e9 100644
--- a/dev/Styles/AdminDomains.less
+++ b/dev/Styles/AdminDomains.less
@@ -1,13 +1,4 @@
 
-.b-admin-domains {
-	.process-place {
-		width: 600px;
-		padding: 14px 0;
-		text-align: center;
-		visibility: hidden;
-	}
-}
-
 .b-admin-domains-list-table {
 
 	width: 600px;
diff --git a/dev/Styles/AdminPackages.less b/dev/Styles/AdminPackages.less
index f4c6291b4..6239f544e 100644
--- a/dev/Styles/AdminPackages.less
+++ b/dev/Styles/AdminPackages.less
@@ -5,9 +5,6 @@
 		width: 650px;
 	}
 
-	.process-place {
-		visibility: hidden;
-	}
 }
 
 .b-admin-packages-list-table {
diff --git a/dev/Styles/AdminPlugins.less b/dev/Styles/AdminPlugins.less
index 780cab125..67056ba54 100644
--- a/dev/Styles/AdminPlugins.less
+++ b/dev/Styles/AdminPlugins.less
@@ -1,10 +1,4 @@
 
-.b-admin-plugins {
-	.process-place {
-		visibility: hidden;
-	}
-}
-
 .b-admin-plugins-list-table {
 
 	&.disabled {
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 366391b62..e1b15214f 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -39,7 +39,7 @@
 	}
 }
 
-html.rl-mobile {
+@media screen and (max-width: 999px) {
 	.b-languages-content .lang-item {
 		width: calc(~'100% - 40px');
 	}
diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less
index 87638efa8..b423d11cf 100644
--- a/dev/Styles/Layout.less
+++ b/dev/Styles/Layout.less
@@ -389,15 +389,10 @@ html.rl-bottom-preview-pane {
 	}
 }
 
-.show-on-mobile,
 html.rl-mobile .hide-on-mobile {
 	display: none !important;
 }
 
-html.rl-mobile .show-on-mobile {
-	display: initial !important;
-}
-
 html.rl-mobile .width100-on-mobile {
 	width: 100% !important;
 }
diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less
index 9a0850ea3..5906e1ab9 100644
--- a/dev/Styles/Settings.less
+++ b/dev/Styles/Settings.less
@@ -117,6 +117,15 @@
 			width: 600px;
 		}
 	}
+
+	td {
+		padding: 4px 8px;
+		line-height: 30px;
+	}
+}
+
+html.rl-mobile .rl-settings-view-model {
+	margin-right: 15px;
 }
 
 html.rl-mobile .b-settings-content .legend {
diff --git a/dev/Styles/SettingsAccounts.less b/dev/Styles/SettingsAccounts.less
index bbb1b4d99..88d5538ca 100644
--- a/dev/Styles/SettingsAccounts.less
+++ b/dev/Styles/SettingsAccounts.less
@@ -1,25 +1,10 @@
 
 .b-settings-accounts {
 
-	html.rl-mobile &{
-		margin-right: 15px;
-	}
-
-	.process-place {
-		text-align: center;
-		width: 600px;
-		padding: 14px 0;
-	}
-
 	.list-table {
 
 		width: 600px;
 
-		td {
-			padding: 4px 8px;
-			line-height: 30px;
-		}
-
 		.account-img, .identity-img {
 			font-size: 12px;
 			margin-right: 5px;
diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less
index 8d1eed601..78b3726a1 100644
--- a/dev/Styles/SettingsFilters.less
+++ b/dev/Styles/SettingsFilters.less
@@ -1,19 +1,9 @@
 
-html.rl-mobile .b-settings-filters {
-	margin-right: 15px;
-}
-
 .b-filter-script {
 	width: auto;
 	max-width: 720px;
 }
 
-.filter-item td,
-.script-item td {
-	padding: 4px 8px;
-	line-height: 30px;
-}
-
 .filter-item td.drag-wrapper {
 	padding: 4px 0;
 }
diff --git a/dev/Styles/SettingsFolders.less b/dev/Styles/SettingsFolders.less
index 283e06157..d7e826dd1 100644
--- a/dev/Styles/SettingsFolders.less
+++ b/dev/Styles/SettingsFolders.less
@@ -1,22 +1,12 @@
 
 .b-settings-folders {
 
-	html.rl-mobile &{
-		margin-right: 35px;
-	}
-
 	&.ignore-folder-subscribe {
 		.subscribe-folder, .unsubscribe-folder {
 			display: none;
 		}
 	}
 
-	.process-place {
-		text-align: center;
-		width: 600px;
-		padding: 14px 0;
-	}
-
 	.folders-list-error {
 		width: 550px;
 		margin: 10px 0;
@@ -30,11 +20,6 @@
 			cursor: pointer;
 		}
 
-		td {
-			padding: 4px 8px;
-			line-height: 30px;
-		}
-
 		.folder-padding {
 			display: inline-block;
 			width: 0;
diff --git a/dev/Styles/SettingsGeneral.less b/dev/Styles/SettingsGeneral.less
index fd3136366..a5f891dae 100644
--- a/dev/Styles/SettingsGeneral.less
+++ b/dev/Styles/SettingsGeneral.less
@@ -1,10 +1,6 @@
 
 .b-settings-general {
 
-	html.rl-mobile &{
-		margin-right: 15px;
-	}
-
 	.flag-selector {
 		padding-top: 5px;
 	}
diff --git a/dev/Styles/SettingsOpenPGP.less b/dev/Styles/SettingsOpenPGP.less
index dccabccf2..6ba0e43e5 100644
--- a/dev/Styles/SettingsOpenPGP.less
+++ b/dev/Styles/SettingsOpenPGP.less
@@ -1,25 +1,10 @@
 
 .b-settings-open-pgp {
 
-	html.rl-mobile &{
-		margin-right: 15px;
-	}
-
-	.process-place {
-		text-align: center;
-		width: 600px;
-		padding: 14px 0;
-	}
-
 	.list-table {
 
 		width: 750px;
 
-		td {
-			padding: 4px 8px;
-			line-height: 30px;
-		}
-
 		.open-pgp-key-img {
 			margin-right: 10px;
 			vertical-align: top;
diff --git a/dev/Styles/SettingsTemplates.less b/dev/Styles/SettingsTemplates.less
index 89c7a7447..24a116aa0 100644
--- a/dev/Styles/SettingsTemplates.less
+++ b/dev/Styles/SettingsTemplates.less
@@ -1,25 +1,10 @@
 
 .b-settings-templates {
 
-	html.rl-mobile &{
-		margin-right: 15px;
-	}
-
-	.process-place {
-		text-align: center;
-		width: 600px;
-		padding: 14px 0;
-	}
-
 	.list-table {
 
 		width: 600px;
 
-		td {
-			padding: 4px 8px;
-			line-height: 30px;
-		}
-
 		.template-img {
 			font-size: 12px;
 			margin-right: 5px;
diff --git a/dev/Styles/SettingsThemes.less b/dev/Styles/SettingsThemes.less
index 9fa3a34bb..6cc1c48a2 100644
--- a/dev/Styles/SettingsThemes.less
+++ b/dev/Styles/SettingsThemes.less
@@ -1,22 +1,6 @@
 
-.b-settings-content {
-	.b-settings-themes {
-		.legend {
-			width: 100%;
-		}
-	}
-}
-
-html.rl-mobile .b-settings-content .b-settings-theme .legend {
-	width: auto;
-}
-
 .b-themes-list {
 
-	html.rl-mobile &{
-		margin-right: 15px;
-	}
-
 	.e-item {
 
 		display: inline-block;
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index c11755249..6a8b698cb 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -266,10 +266,10 @@ select {
 	padding-top: 0;
 }
 
-html.rl-mobile {
+/* mobile and tablet */
+@media screen and (max-width: 999px) {
 
 	#rl-popups .modal {
-		width: 100% !important;
 		width: calc(~'100% - 20px') !important;
 	}
 
@@ -295,6 +295,7 @@ html.rl-mobile {
 		}
 	}
 }
+
 .close-input-wrp {
 	display: inline-block;
 	position: relative;
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 1ef76b237..6e7a7d774 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
@@ -16,7 +16,7 @@
 		</div>
 	</div>
 	<div class="b-content">
-		<div class="content g-scrollbox">
+		<div class="content">
 			<div class="content-wrapper">
 				<div id="rl-settings-subscreen" class="b-settings-content" style="position: relative; z-index: 2"></div>
 			</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 ee655da48..9b2ec9b65 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
@@ -11,7 +11,7 @@
 		</a>
 	</div>
 	<div class="b-content opacity-on-panel-disabled" data-bind="visible: allowFolders, css: {'inbox-is-starred': isInboxStarred}">
-		<div class="content g-scrollbox">
+		<div class="content">
 			<div class="content-wrapper">
 				<div class="b-folders-system" data-bind="template: { name: 'MailFolderListSystemItem', foreach: folderListSystem }"></div>
 				<hr class="b-list-delimiter" />
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 1b305deb2..e16da178d 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
@@ -158,7 +158,7 @@
 			<div class="line-loading e-strip-animation" data-bind="visible: messageListCompleteLoadingThrottle"></div>
 			<div class="mainDelimiter toolbarDelimiter"></div>
 			<div class="b-content" data-bind="initDom: dragOverBodyArea">
-				<div class="content g-scrollbox">
+				<div class="content">
 					<div class="content-wrapper">
 						<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
 							<i class="icon-left" data-bind="click: cancelThreadUid"></i>
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 50a189087..559369771 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
@@ -283,7 +283,7 @@
 						</div>
 					</div>
 					<div class="messageItem fixIndex" data-bind="css: viewLineAsCss(), attr: {'style': 'top:' + viewBodyTopValue() + 'px' }">
-						<div class="content g-scrollbox" tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused },
+						<div class="content" tabindex="0" data-bind="hasfocus: messageDomFocused, css: { 'focused': messageDomFocused },
 							style: {'background-color': messageLoadingThrottle() ? '' : bodyBackgroundColor()}">
 
 							<div class="content-wrapper">
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 9beb4cd37..c094528f7 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
@@ -183,7 +183,7 @@
 		</div>
 
 		<div class="attachmentAreaParent b-content" data-bind="visible: attachmentsPlace">
-			<div class="content g-scrollbox">
+			<div class="content">
 				<div class="content-wrapper">
 					<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropEnabled() && dragAndDropVisible(), initDom: composeUploaderDropPlace, css: {'dragAndDropOver': dragAndDropOver}">
 						<span class="i18n" data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></span>
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 8d02e1fab..a1e8869e3 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
@@ -69,7 +69,7 @@
 			<input type="text" class="i18n span3 e-search" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: search" />
 		</div>
 		<div class="b-list-content g-ui-user-select-none" data-bind="css: {'hideContactListCheckbox': !useCheckboxesInList()}">
-			<div class="content g-scrollbox">
+			<div class="content">
 				<div class="content-wrapper">
 					<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
 						<span class="g-ui-link i18n" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
@@ -161,7 +161,7 @@
 			</div>
 		</div>
 		<div class="b-view-content" data-bind="css: {'read-only': viewReadOnly}">
-			<div class="content g-scrollbox">
+			<div class="content">
 				<div class="content-wrapper">
 					<div class="b-contact-view-desc" data-bind="visible: emptySelection">
 						<span class="i18n" data-i18n="CONTACTS/CONTACT_VIEW_DESC"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 28089e249..f6a5924ff 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -17,7 +17,7 @@
 	</div>
 	<div class="row">
 		<div class="span8 width100-on-mobile">
-			<table class="table table-hover list-table scripts-list g-ui-user-select-none"
+			<table class="table table-hover list-table g-ui-user-select-none"
 				data-bind="i18nUpdate: scripts">
 				<colgroup>
 					<col style="width: 30px" />
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 7f920b880..14532a71a 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
@@ -19,7 +19,7 @@
 		</div>
 	</div>
 	<div class="b-content">
-		<div class="content g-scrollbox">
+		<div class="content">
 			<div class="content-wrapper">
 				<div id="rl-settings-subscreen" class="b-settings-content" style="position: relative; z-index: 2"></div>
 			</div>