diff --git a/dev/Styles/User/Attachments.less b/dev/Styles/User/Attachments.less
index 6f8108397..14693e551 100644
--- a/dev/Styles/User/Attachments.less
+++ b/dev/Styles/User/Attachments.less
@@ -120,3 +120,22 @@
 		cursor: pointer;
 	}
 }
+
+.attachmentListSimple {
+	margin: 0;
+
+	.attachmentItem {
+		min-height: 1em;
+		border: 1px solid var(--border-color);
+		padding: 0 2px;
+	}
+
+	.attachmentName {
+		margin:0;
+	}
+
+	.checkboxAttachment {
+		position: initial;
+		margin-left:.5em;
+	}
+}
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 9ba14a9c3..76a78bf86 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -95,7 +95,6 @@ html.rl-no-preview-pane {
 	}
 
 	.messageTags {
-		margin-top: 6px;
 		align-items: baseline;
 		display: flex;
 	}
@@ -128,7 +127,6 @@ html.rl-no-preview-pane {
 			display: flex;
 			font-size: 18px;
 			font-weight: bold;
-			margin-bottom: 8px;
 		}
 
 		.subject {
@@ -148,7 +146,7 @@ html.rl-no-preview-pane {
 		}
 
 		.informationShort {
-			margin: 4px 40px 0 0;
+			margin: 0 40px 0 0;
 			overflow: hidden;
 			text-overflow: ellipsis;
 
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 8d1bd6bd3..02671db9d 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -98,6 +98,7 @@ export class MailMessageView extends AbstractViewRight {
 			downloadAsZipLoading: false,
 			showFullInfo: '1' === Local.get(ClientSideKeyNameMessageHeaderFullInfo),
 			moreDropdownTrigger: false,
+			attachmentListSimple: false,
 
 			// viewer
 			viewFromShort: '',
@@ -281,7 +282,7 @@ export class MailMessageView extends AbstractViewRight {
 				}
 			}
 
-			el = eqs(event, '.attachmentsPlace .attachmentItem .attachmentNameParent');
+			el = eqs(event, '.attachmentsPlace .attachmentName');
 			if (el) {
 				const attachment = ko.dataFor(el);
 				if (attachment?.linkDownload()) {
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 4680ad695..20323f49e 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
@@ -232,6 +232,7 @@
 							<div class="readReceipt" data-bind="visible: !isDraftOrSentFolder() && message().readReceipt() && !message().isReadReceipt(), click: readReceipt"
 								data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
 							<div class="attachmentsPlace" data-bind="visible: message().hasAttachments(), css: {'selection-mode' : showAttachmentControls}">
+								<!-- ko ifnot: attachmentListSimple -->
 								<ul class="attachmentList" data-bind="foreach: message().listAttachments()">
 									<li class="attachmentItem" draggable="true"
 											data-bind="event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
@@ -250,7 +251,7 @@
 											</div>
 										</div>
 										<div class="attachmentNameParent">
-											<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;" class="attachmentName" data-bind="text: fileName"></div>
+											<div class="attachmentName" data-bind="text: fileName"></div>
 											<div class="attachmentSize" data-bind="text: friendlySize()"></div>
 										</div>
 										<div class="checkboxAttachment fontastic"
@@ -258,6 +259,17 @@
 												click: function () { checked(!checked()); return false }"></div>
 									</li>
 								</ul>
+								<!-- /ko -->
+								<!-- ko if: attachmentListSimple -->
+								<ul class="attachmentListSimple" data-bind="foreach: message().listAttachments()">
+									<li class="attachmentItem" data-bind="attr: { 'title': fileName }, css: {'checked': checked}">
+										<span class="attachmentName" data-bind="text: fileName"></span>
+										<i class="checkboxAttachment fontastic"
+											data-bind="visible: download, text: checked() ? '☑' : '☐',
+											click: function () { checked(!checked()); return false }"></i>
+									</li>
+								</ul>
+								<!-- /ko -->
 								<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls(), click: toggleAttachmentControls">⚙</i>
 							</div>