diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 498a9ff6df..15409e942a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -19,6 +19,8 @@ package eu.faircode.email;
     Copyright 2018-2021 by Marcel Bokhorst (M66B)
 */
 
+import static android.app.Activity.RESULT_OK;
+
 import android.app.Dialog;
 import android.app.NotificationManager;
 import android.content.ContentResolver;
@@ -49,6 +51,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.app.NotificationCompat;
+import androidx.core.view.MenuCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
@@ -82,8 +85,6 @@ import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.InternetAddress;
 
-import static android.app.Activity.RESULT_OK;
-
 public class FragmentFolders extends FragmentBase {
     private ViewGroup view;
     private SwipeRefreshLayout swipeRefresh;
@@ -453,6 +454,7 @@ public class FragmentFolders extends FragmentBase {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_folders, menu);
+        MenuCompat.setGroupDividerEnabled(menu, true);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
index 1587d7b423..de6d821ece 100644
--- a/app/src/main/res/menu/menu_folders.xml
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -14,42 +14,48 @@
         android:title="@string/title_folder_unified"
         app:showAsAction="always" />
 
-    <item
-        android:id="@+id/menu_theme"
-        android:title="@string/title_setup_theme"
-        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_show_hidden"
-        android:checkable="true"
-        android:title="@string/title_show_folders"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_show_flagged"
-        android:checkable="true"
-        android:title="@string/title_show_flagged"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_subscribed_only"
-        android:checkable="true"
-        android:title="@string/title_subscribed_only"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_apply_all"
-        android:title="@string/title_apply_to_all"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_force_sync"
-        android:title="@string/title_force_sync"
-        app:showAsAction="never" />
+    <group android:id="@+id/group_appearance">
+        <item
+            android:id="@+id/menu_theme"
+            android:title="@string/title_setup_theme"
+            app:showAsAction="never" />
+
+        <item
+            android:id="@+id/menu_compact"
+            android:checkable="true"
+            android:title="@string/title_compact"
+            app:showAsAction="never" />
+    </group>
+
+    <group android:id="@+id/group_options">
+        <item
+            android:id="@+id/menu_show_hidden"
+            android:checkable="true"
+            android:title="@string/title_show_folders"
+            app:showAsAction="never" />
+
+        <item
+            android:id="@+id/menu_show_flagged"
+            android:checkable="true"
+            android:title="@string/title_show_flagged"
+            app:showAsAction="never" />
+
+        <item
+            android:id="@+id/menu_subscribed_only"
+            android:checkable="true"
+            android:title="@string/title_subscribed_only"
+            app:showAsAction="never" />
+    </group>
+
+    <group android:id="@+id/group_operations">
+        <item
+            android:id="@+id/menu_apply_all"
+            android:title="@string/title_apply_to_all"
+            app:showAsAction="never" />
+
+        <item
+            android:id="@+id/menu_force_sync"
+            android:title="@string/title_force_sync"
+            app:showAsAction="never" />
+    </group>
 </menu>