diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 91f296330a..8544516720 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -259,6 +259,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         boolean canFold = Helper.canFold(this);
         boolean close_pane = prefs.getBoolean("close_pane", !duo && !canFold);
         boolean nav_categories = prefs.getBoolean("nav_categories", false);
+        boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false);
 
         // 1=small, 2=normal, 3=large, 4=xlarge
         if (layout > 0)
@@ -748,6 +749,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             }
         });
 
+        if (edge_to_edge)
+            findViewById(R.id.nav).setPadding(0, 0, 0, Helper.dp2pixels(this, 24 + 2 * 8));
+
         getSupportFragmentManager().addOnBackStackChangedListener(this);
         getOnBackPressedDispatcher().addCallback(this, backPressedCallback);
 
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index 7454ac6ade..c37e2559b7 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/nav"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:animateLayoutChanges="false"