diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 18ba3efe32..e77f8bfdb1 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -662,6 +662,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean nav_count = prefs.getBoolean("nav_count", false);
+
         // Fixed menus
 
         final List<NavMenuItem> menus = new ArrayList<>();
@@ -673,7 +676,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     drawerLayout.closeDrawer(drawerContainer);
                 onMenuOperations();
             }
-        }).setExtraCount(BuildConfig.DEBUG);
+        }).setExtraCount(nav_count);
 
         menus.add(navOperations);
 
@@ -824,7 +827,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         // Live data
 
         DB db = DB.getInstance(this);
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         db.account().liveAccountFolder().observe(owner, new Observer<List<TupleAccountFolder>>() {
             @Override