diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b99e329749..cd80ceaef4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4264,6 +4264,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             }
         });
 
+        MenuCompat.setGroupDividerEnabled(menu, true);
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 91db7a39b5..fc245e9ae1 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -107,66 +107,70 @@
         </menu>
     </item>
 
-    <item
-        android:id="@+id/menu_zoom"
-        android:icon="@drawable/twotone_format_size_24"
-        android:title="@string/title_zoom"
-        app:showAsAction="ifRoom" />
+    <group android:id="@+id/group_appearance">
+        <item
+            android:id="@+id/menu_zoom"
+            android:icon="@drawable/twotone_format_size_24"
+            android:title="@string/title_zoom"
+            app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/menu_compact"
-        android:checkable="true"
-        android:title="@string/title_compact"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_compact"
+            android:checkable="true"
+            android:title="@string/title_compact"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_theme"
-        android:title="@string/title_setup_theme"
-        app:showAsAction="never">
-        <menu />
-    </item>
+        <item
+            android:id="@+id/menu_theme"
+            android:title="@string/title_setup_theme"
+            app:showAsAction="never">
+            <menu />
+        </item>
+    </group>
 
-    <item
-        android:id="@+id/menu_select_all"
-        android:title="@string/title_select_all"
-        app:showAsAction="never" />
+    <group android:id="@+id/group_operations">
+        <item
+            android:id="@+id/menu_select_all"
+            android:title="@string/title_select_all"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_select_found"
-        android:title="@string/title_select_found"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_select_found"
+            android:title="@string/title_select_found"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_mark_all_read"
-        android:title="@string/title_mark_all_read"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_mark_all_read"
+            android:title="@string/title_mark_all_read"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_view_thread"
-        android:title="@string/title_view_thread"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_view_thread"
+            android:title="@string/title_view_thread"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_sync_more"
-        android:title="@string/title_synchronize_more"
-        app:showAsAction="never">
-        <menu />
-    </item>
+        <item
+            android:id="@+id/menu_sync_more"
+            android:title="@string/title_synchronize_more"
+            app:showAsAction="never">
+            <menu />
+        </item>
 
-    <item
-        android:id="@+id/menu_force_sync"
-        android:title="@string/title_force_sync"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_force_sync"
+            android:title="@string/title_force_sync"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_force_send"
-        android:title="@string/title_force_send"
-        app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_force_send"
+            android:title="@string/title_force_send"
+            app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_edit_properties"
-        android:title="@string/title_edit_properties"
-        app:showAsAction="never">
-        <menu />
-    </item>
+        <item
+            android:id="@+id/menu_edit_properties"
+            android:title="@string/title_edit_properties"
+            app:showAsAction="never">
+            <menu />
+        </item>
+    </group>
 </menu>