diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
index c7ec55ab8..7fefd1727 100644
--- a/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
@@ -782,6 +782,7 @@ select option {
 
 #rl-app .squire-toolbar {
     height: 50px;
+    padding: 5px;
     box-sizing: content-box;
     border: none;
 }
@@ -852,27 +853,33 @@ input[type="checkbox"] {
     appearance: none;
 }
 
-input[type="checkbox"],
 #rl-app .e-checkbox.material-design>div {
+    position: relative;
+    width: 18px;
+    top: 2px;
+}
+
+input[type="checkbox"],
+#rl-app .e-checkbox.material-design input+div {
     position: unset;
-    height: 18px !important;
-    width: 18px !important;
-    min-width: 18px !important;
+    height: 18px;
+    width: 18px;
     flex-shrink: 0 !important;
     border: 2px solid var(--color-primary-element);
     border-radius: 2px;
-    animation: none;
     box-sizing: border-box;
+    animation: none;
+    transform: unset;
 }
 
 input[type="checkbox"]:checked,
 #rl-app .e-checkbox.material-design input:checked+div {
-    animation: none;
     --svg-checked: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='3 3 18 18'><path d='M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z'></path></svg>");
     -webkit-mask-image: var(--svg-checked);
     mask-image: var(--svg-checked);
     background: var(--color-primary-element);
     border-width: 0;
+    animation: none;
     transform: unset;
 }
 
@@ -1194,6 +1201,10 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     background-color: unset;
 }
 
+#rl-app #messageItem .bodySubHeader>* {
+    border-color: var(--color-border);
+}
+
 #rl-app #messageItem .readReceipt,
 #rl-app #messageItem .showImages {
     margin: 8px;
@@ -1709,10 +1720,6 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
     text-shadow: unset;
 }
 
-#rl-app #V-PopupsCompose .attachmentAreaParent {
-    border-color: var(--color-border);
-}
-
 #rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:hover,
 #rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:active {
     background-color: var(--color-background-dark);