diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index af2c0c547..f4aa3b739 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -198,13 +198,9 @@ html.rl-no-preview-pane {
 		}
 	}
 
-	&.message-focused {
-		.b-message-list-wrapper {
-			background-color: #000;
-		}
-		.b-content {
-			opacity: 0.97;
-		}
+	&.focused .b-message-list-wrapper {
+		background-color: #000;
+		border-color: #9d9d9d;
 	}
 }
 
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 7971ce0f9..18460603c 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -458,7 +458,7 @@
 		}
 	}
 
-	&.message-focused .b-content {
+	&.focused .b-content {
 		z-index: 101;
 		box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 		border-color: darken(@rlMainDarkColor, 5%);
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index df76e305e..93cf540cd 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -838,8 +838,10 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 			return false;
 		});
 		shortcuts.add('tab,arrowright', '', Scope.MessageList, () => {
-			MessageUserStore.message() && AppUserStore.focusedState(Scope.MessageView);
-			return false;
+			if (MessageUserStore.message()){
+				AppUserStore.focusedState(Scope.MessageView);
+				return false;
+			}
 		});
 
 		shortcuts.add('arrowleft', 'meta', Scope.MessageView, ()=>false);
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 343edcb7b..ff05cfe41 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
@@ -1,5 +1,5 @@
 <div id="rl-sub-left" class="messageList g-ui-user-select-none"
-	data-bind="css: {'message-selected': isMessageSelected, 'message-focused': !messageListFocused() }">
+	data-bind="css: {'message-selected': isMessageSelected, 'focused': messageListFocused() }">
 	<div class="toolbar">
 		<div class="btn-toolbar">
 			<a class="btn btn-thin-2 fontastic show-mobile" data-bind="click: hideLeft, visible: !leftPanelDisabled()">❮</a>
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 5a0967f8f..792355a41 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
@@ -1,5 +1,5 @@
 <div id="rl-sub-right">
-	<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'message-focused': messageFocused}">
+	<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'focused': messageFocused}">
 		<div class="toolbar top-toolbar g-ui-user-select-none">
 			<div class="messageButtons btn-toolbar">
 				<div class="btn-group" data-i18n="[title]GLOBAL/CLOSE">
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.less b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
index b24e1e61e..a0b5da470 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.less
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
@@ -144,3 +144,7 @@
 .b-admin-about .rl-logo {
 	filter: drop-shadow(0 0 1px #FFF);
 }
+
+.b-folders .e-item a.focused {
+	background-color: #111;
+}