diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index 38d532116..a242649c0 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -244,6 +244,7 @@
 		overflow: hidden;
 		height: 19px;
 		display: inline-block;
+		margin-top: 1px;
 	}
 }
 
@@ -258,7 +259,7 @@ html.rl-left-panel-disabled, html.rl-left-panel-short {
 		margin-top: 10px !important;
 		margin-left: 0 !important;
 	}
-	#rl-left {
+	&.rl-mobile #rl-left {
 		visibility: hidden;
 	}
 }
diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less
index cc6c8b96a..41bbac63c 100644
--- a/dev/Styles/Layout.less
+++ b/dev/Styles/Layout.less
@@ -371,16 +371,17 @@ html.rl-ctrl-key-pressed {
 }
 
 html.rl-mobile .hide-on-mobile {
-	display: none;
+	display: none !important;
 }
 
 .show-on-mobile {
-	display: none;
+	display: none !important;
 }
 
 html.rl-mobile .show-on-mobile {
-	display: initial;
+	display: initial !important;
 }
+
 html.rl-mobile .width100-on-mobile {
-	width: 100%;
+	width: 100% !important;
 }
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 8c3151842..2a467a869 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -66,8 +66,6 @@
 		this.folderList = FolderStore.folderList;
 
 		this.composeInEdit = AppStore.composeInEdit;
-		this.allowComposer = !!Settings.capa(Enums.Capa.Composer);
-
 		this.leftPanelDisabled = Globals.leftPanelDisabled;
 
 		this.selectorMessageSelected = MessageStore.selectorMessageSelected;
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 6a7395738..fe72239f8 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -3,18 +3,18 @@
 		data-bind="css: {'message-selected': isMessageSelected, 'message-focused': !messageListFocused(), 'loading': messageListCompleteLoadingThrottle, 'hideMessageListCheckbox': !useCheckboxesInList() }">
 		<div class="toolbar">
 			<div class="btn-toolbar">
-				<div class="btn-group show-on-mobile" data-bind="visible: leftPanelDisabled">
+				<div class="btn-group" data-bind="visible: mobile && leftPanelDisabled()">
 					<a class="btn single" data-bind="click: showLeft">
 						<i class="icon-right-middle"></i>
 					</a>
 				</div>
-				<div class="btn-group show-on-mobile" data-bind="visible: !leftPanelDisabled()" style="margin-left: -1px">
+				<div class="btn-group" data-bind="visible: mobile && !leftPanelDisabled()" style="margin-left: -1px">
 					<a class="btn single" data-bind="click: hideLeft">
 						<i class="icon-left-middle"></i>
 					</a>
 				</div>
 				<div class="btn-group show-on-mobile">&nbsp;</div>
-				<div class="btn-group show-on-mobile" data-bind="visible: allowComposer">
+				<div class="btn-group" data-bind="visible: mobile && allowComposer">
 					<a class="btn single buttonCompose" data-tooltip-join="top" data-bind="click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}">
 						<i class="icon-paper-plane"></i>
 					</a>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index bc595e747..5b18f0d4c 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -37,7 +37,7 @@
 			<tbody data-bind="template: { name: 'SettingsFolderItem', foreach: folderList }"></tbody>
 		</table>
 	</div>
-	<div class="span4 show-on-mobile" style="position: relative" data-bind="visible: '' !== folderListHelp()">
+	<div class="span4 hide-on-mobile" style="position: relative" data-bind="visible: '' !== folderListHelp()">
 		<div class="alert alert-info" style="position: fixed">
 			<span data-bind="text: folderListHelp"></span>
 		</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html
index 7ebab87c8..3bd73d149 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -1,12 +1,12 @@
 <div class="b-settings b-settins-right">
 	<div class="b-toolbar" style="padding-left: 0">
 		<div class="btn-toolbar" style="margin-top: 2px;">
-			<div class="btn-group show-on-mobile" data-bind="visible: leftPanelDisabled">
+			<div class="btn-group" data-bind="visible: mobile && leftPanelDisabled()">
 				<a class="btn single" data-bind="click: showLeft">
 					<i class="icon-right-middle"></i>
 				</a>
 			</div>
-			<div class="btn-group show-on-mobile" data-bind="visible: !leftPanelDisabled()" style="margin-left: -1px">
+			<div class="btn-group" data-bind="visible: mobile && !leftPanelDisabled()" style="margin-left: -1px">
 				<a class="btn single" data-bind="click: hideLeft">
 					<i class="icon-left-middle"></i>
 				</a>