diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 06a412aa6e..e45305415b 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -107,7 +107,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     public void setContentView(@NonNull View view) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         boolean hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE);
-        boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false);
+        boolean edge_to_edge = prefs.getBoolean("edge_to_edge", !BuildConfig.PLAY_STORE_RELEASE);
 
         int colorPrimary = Helper.resolveColor(this, androidx.appcompat.R.attr.colorPrimary);
         double lum = ColorUtils.calculateLuminance(colorPrimary);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 25748310a2..cbfde03bf9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -647,7 +647,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             }
         });
 
-        swEdgeToEdge.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
         swEdgeToEdge.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -1620,7 +1619,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             sbColumnWidth.setProgress(column_width);
 
             swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE));
-            swEdgeToEdge.setChecked(prefs.getBoolean("edge_to_edge", false));
+            swEdgeToEdge.setChecked(prefs.getBoolean("edge_to_edge", !BuildConfig.PLAY_STORE_RELEASE));
             swNavOptions.setChecked(prefs.getBoolean("nav_options", true));
             swNavCategories.setChecked(prefs.getBoolean("nav_categories", false));
             swNavLastSync.setChecked(prefs.getBoolean("nav_last_sync", true));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da29ac99bf..e38384b80a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -583,7 +583,7 @@
     <string name="title_advanced_close_pane">Collapse row or column when closing a conversation</string>
     <string name="title_advanced_column_width">Message column width / row height: %1$s %%</string>
     <string name="title_advanced_hide_toolbar">Hide top toolbar when scrolling messages</string>
-    <string name="title_advanced_edge_to_edge" translatable="false">Edge-to-edge (experimental)</string>
+    <string name="title_advanced_edge_to_edge">Use app background color for Android navigation bar</string>
     <string name="title_advanced_nav_options">Show navigation menu options</string>
     <string name="title_advanced_nav_categories">Show account categories in the navigation menu</string>
     <string name="title_advanced_nav_pin">Pin navigation menu</string>