diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
index 7f1054c86..e70be9473 100644
--- a/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud25/styles.css
@@ -959,10 +959,20 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll {
  * message view
  */
 
- #rl-app #V-MailMessageView {
+#rl-app #V-MailMessageView {
     bottom: 0;
 }
 
+#rl-app #V-MailMessageList .btn-toolbar,
+#rl-app #V-MailMessageView .btn-toolbar {
+    padding: 10px 1px;
+}
+
+#rl-app .messageList,
+#rl-app .messageView {
+    height: calc(100% - 60px);
+}
+
 html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar {
     /* TODO Improve mobile experience */
 }
@@ -1242,7 +1252,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar
  * account selector
  */
 
-#rl-app .btn-toolbar.g-ui-user-select-none {
+#rl-app #V-SystemDropDown .btn-toolbar.g-ui-user-select-none {
     border: solid 1px var(--color-border-dark);
     border-radius: var(--border-radius-large);
     height: 36px;