diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 68a92b14b..eb3eaa094 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -288,11 +288,11 @@ html.rl-no-preview-pane {
 		padding: 50px 0;
 	}
 
-	.showImages, .readReceipt, .pgpSigned, .pgpEncrypted {
+	.bodySubHeader > * {
+		background-color: #eee;
+		border-bottom: 1px solid #ddd;
 		cursor: pointer;
 		padding: 10px 15px;
-		border-bottom: 1px solid #ddd;
-		background-color: #eee;
 	}
 
 	.pgpInfo {
@@ -346,7 +346,8 @@ html.rl-no-preview-pane {
 		border-bottom: 1px solid #ddd;
 	}
 	.attachmentsControls > * {
-		margin-right: 0.5em
+		margin-right: 0.5em;
+		white-space: nowrap;
 	}
 
 	.sm-bq-switcher > summary {
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index 12a8aa544..682465f1d 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -255,6 +255,7 @@ class NextcloudCalendarsPopupView extends rl.pluginPopupView {
 //				 && getDavElementsByTagName(getDavElementByTagName(e, 'current-user-privilege-set'), 'write').length) {
 					const li = document.createElement('li'),
 						btn = document.createElement('button');
+					li.dataset.icon = '📅';
 					li.textContent = getDavElementByTagName(e, 'displayname').textContent;
 					btn.href = getDavElementByTagName(e, 'href').textContent
 						.replace(pathRegex, '').replace(/\/$/, '');
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index 7b553ee35..6fae3964a 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -112,12 +112,7 @@
 }
 
 .messageView .messageItemHeader,
-.messageView #messageItem .pgpEncrypted,
-.messageView #messageItem .pgpSigned,
-.messageView #messageItem .readReceipt,
-.messageView #messageItem .showImages,
-.messageView #messageItem .attachmentsPlace,
-.messageView #messageItem .attachmentsControls {
+.messageView #messageItem .bodySubHeader > * {
 	background-color: #222;
 	border-bottom-color: #444;
 }