diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index fe992b752..0300c5f91 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -102,14 +102,19 @@ html.rl-no-preview-pane {
 		flex-shrink: 0;
 
 		.subjectParent {
+			display: flex;
 			font-size: 18px;
 			font-weight: bold;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: nowrap;
 			margin-bottom: 8px;
 		}
 
+		.subject, .emptySubjectText {
+			flex-grow: 1;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+
 		.messageButtons {
 			margin-top: 5px;
 		}
@@ -157,16 +162,11 @@ html.rl-no-preview-pane {
 		}
 
 		.emptySubjectText {
-			display: none;
 			font-style: italic;
 			font-weight: normal;
 			color: #999;
 		}
 
-		&.emptySubject .emptySubjectText {
-			display: inline;
-		}
-
 		.hasVirus {
 			background: #f00;
 			color: #fff;
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 0df7b1a4d..c230f4288 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
@@ -160,12 +160,12 @@
 		<div class="b-message" data-bind="visible: message">
 			<div class="messageItemHeader" data-bind="css: {'emptySubject': '' === viewSubject()}">
 				<div class="subjectParent">
-					<a href="#" class="close" data-bind="command: closeMessageCommand" style="margin-top: -2px;">×</a>
 					<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: function() { showFullInfo(!showFullInfo()); }">ℹ</span>
 					<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: viewIsFlagged() ? '★' : '☆', css: {'flagOn': viewIsFlagged, 'flagOff': !viewIsFlagged()}"></span>
 					<b style="color: red; margin-right: 5px" data-bind="visible: viewIsImportant">!</b>
-					<span class="subject" data-bind="text: viewSubject, title: viewSubject, event: { 'dblclick': toggleFullScreen }"></span>
-					<span class="emptySubjectText" data-i18n="MESSAGE/EMPTY_SUBJECT_TEXT" data-bind="event: { 'dblclick': toggleFullScreen }"></span>
+					<span class="subject" data-bind="hidden: !viewSubject(), text: viewSubject, title: viewSubject, event: { 'dblclick': toggleFullScreen }"></span>
+					<span class="emptySubjectText" data-i18n="MESSAGE/EMPTY_SUBJECT_TEXT" data-bind="hidden: viewSubject(), event: { 'dblclick': toggleFullScreen }"></span>
+					<a href="#" class="close" data-bind="command: closeMessageCommand" style="margin-top: -8px;">×</a>
 				</div>
 				<div data-bind="hidden: showFullInfo(), event: { 'dblclick': toggleFullScreen }">
 					<div class="informationShort">