diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 1e94a54f3f..813e3309af 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -190,31 +190,33 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         if (getIntentImport().resolveActivity(pm) != null)
             items.add(new DrawerItem(-2, R.drawable.baseline_unarchive_24, R.string.title_setup_import));
 
+        items.add(new DrawerItem(-3));
+
+        if (getIntentNotifications(this).resolveActivity(pm) != null)
+            items.add(new DrawerItem(-4, R.drawable.baseline_notifications_24, R.string.title_setup_notifications));
+
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         String theme = prefs.getString("theme", "system");
         if ("light".equals(theme))
-            items.add(new DrawerItem(-3, R.drawable.baseline_palette_24, R.string.title_setup_dark_theme));
+            items.add(new DrawerItem(-5, R.drawable.baseline_palette_24, R.string.title_setup_dark_theme));
         else if ("dark".equals(theme))
-            items.add(new DrawerItem(-4, R.drawable.baseline_palette_24, R.string.title_setup_black_theme));
+            items.add(new DrawerItem(-6, R.drawable.baseline_palette_24, R.string.title_setup_black_theme));
         else if ("black".equals(theme))
-            items.add(new DrawerItem(-5, R.drawable.baseline_palette_24, R.string.title_setup_system_theme));
+            items.add(new DrawerItem(-7, R.drawable.baseline_palette_24, R.string.title_setup_system_theme));
         else
-            items.add(new DrawerItem(-6, R.drawable.baseline_palette_24, R.string.title_setup_light_theme));
-
-        if (getIntentNotifications(this).resolveActivity(pm) != null)
-            items.add(new DrawerItem(-7, R.drawable.baseline_notifications_24, R.string.title_setup_notifications));
+            items.add(new DrawerItem(-8, R.drawable.baseline_palette_24, R.string.title_setup_light_theme));
 
-        items.add(new DrawerItem(-8, R.drawable.baseline_settings_applications_24, R.string.title_setup_advanced));
-        items.add(new DrawerItem(-9, R.drawable.baseline_person_24, R.string.menu_contacts));
+        items.add(new DrawerItem(-9, R.drawable.baseline_settings_applications_24, R.string.title_setup_advanced));
+        items.add(new DrawerItem(-10, R.drawable.baseline_person_24, R.string.menu_contacts));
 
-        items.add(new DrawerItem(-10));
+        items.add(new DrawerItem(-11));
 
-        items.add(new DrawerItem(-11, R.drawable.baseline_help_24, R.string.menu_legend));
+        items.add(new DrawerItem(-12, R.drawable.baseline_help_24, R.string.menu_legend));
         if (Helper.getIntentFAQ().resolveActivity(getPackageManager()) != null)
-            items.add(new DrawerItem(-12, R.drawable.baseline_question_answer_24, R.string.menu_faq));
+            items.add(new DrawerItem(-13, R.drawable.baseline_question_answer_24, R.string.menu_faq));
         if (Helper.getIntentPrivacy().resolveActivity(getPackageManager()) != null)
-            items.add(new DrawerItem(-13, R.drawable.baseline_account_box_24, R.string.menu_privacy));
-        items.add(new DrawerItem(-14, R.drawable.baseline_info_24, R.string.menu_about));
+            items.add(new DrawerItem(-14, R.drawable.baseline_account_box_24, R.string.menu_privacy));
+        items.add(new DrawerItem(-15, R.drawable.baseline_info_24, R.string.menu_about));
 
         drawerArray.set(items);