diff --git a/dev/Styles/Attachmnets.less b/dev/Styles/Attachmnets.less
index 7376450e2..9b2262def 100644
--- a/dev/Styles/Attachmnets.less
+++ b/dev/Styles/Attachmnets.less
@@ -11,6 +11,7 @@
 	line-height: 24px;
 	border: 0;
 	background-color: #fff;
+	color: #333;
 
 	box-shadow: 0 1px 4px #ccc;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2);
@@ -40,7 +41,7 @@
 
 	.attachmentSize {
 		font-size: 12px;
-		color: #999;
+		opacity: 0.5;
 	}
 
 	&.error {
@@ -54,7 +55,6 @@
 		position: absolute;
 		height: 56px;
 		width: 60px;
-		background: none;
 		text-align: center;
 
 		.iconProgress {
@@ -88,8 +88,6 @@
 
 		cursor: pointer;
 
-		color: #333;
-		background: #fafafa;
 		border-left: 1px solid #ddd;
 	}
 
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 427eef980..604df394d 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -121,8 +121,7 @@ html.rl-no-preview-pane {
 		left: 0;
 		right: 0;
 		padding: 0;
-		overflow-x: hidden;
-		overflow-y: auto;
+		overflow: auto;
 		z-index: 101;
 		scroll-behavior: smooth;
 
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 05108609e..38a8d1104 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
@@ -264,9 +264,9 @@
 										<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 clearfix" draggable="true"
+												<li class="attachmentItem" draggable="true"
 														data-bind="visible: !isLinked, event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
-													<div class="attachmentIconParent pull-left" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
+													<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
 														<div class="hidePreview">
 															<div class="iconMain">
 																<i class="attachmentIcon attachmentMainIcon" data-bind="css: iconClass()"></i>
@@ -291,12 +291,8 @@
 														</div>
 													</div>
 													<div class="attachmentNameParent">
-														<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 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() ? '☑' : '☐',
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.less b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
index 15eb72cbf..c1366e38c 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.less
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
@@ -114,7 +114,8 @@
 .messageView .b-content .messageItem .pgpSigned,
 .messageView .b-content .messageItem .readReceipt,
 .messageView .b-content .messageItem .showImages,
-.messageView .b-content .messageItem .attachmentsPlace {
+.messageView .b-content .messageItem .attachmentsPlace,
+.messageView .b-content .messageItem .attachmentsControls {
 	background-color: #222;
 	border-bottom-color: #444;
 }