diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index e316ee298..b9807ff13 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -313,8 +313,8 @@
 	}
 
 	.attachmentsControls {
-		padding: 7px 5px 7px 14px;
-		border-bottom: 1px solid var(--border-color, #bbb);
+		padding-top: 7px;
+		border-top: 1px solid var(--border-color, #bbb);
 	}
 	.attachmentsControls > * {
 		display: inline-block;
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 d74d936b7..5326857d0 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
@@ -263,21 +263,18 @@
 								</li>
 							</ul>
 							<!-- /ko -->
-							<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls(), click: toggleAttachmentControls">⚙</i>
+							<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls, click: toggleAttachmentControls">⚙</i>
+							<div class="attachmentsControls" data-bind="visible: showAttachmentControls">
+								<span data-bind="visible: downloadAsZipAllowed">
+									<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
+									<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
+										css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
+									<span class="g-ui-link" data-bind="click: downloadAsZip"
+										data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
+								</span>
+							</div>
 						</details>
 
-						<div class="attachmentsControls"
-							data-bind="visible: showAttachmentControls() && hasAttachments()">
-
-							<span data-bind="visible: downloadAsZipAllowed">
-								<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
-								<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
-									css: {'icon-file-archive': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
-								<span class="g-ui-link" data-bind="click: downloadAsZip"
-									data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
-							</span>
-						</div>
-
 						<div class="btn-toolbar showImages" data-bind="visible: message().hasImages()">
 							<div class="btn" data-bind="click: showImages" data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
 							<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, visible: showWhitelistOptions" style="display: inline-block">