diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index cd1444b050..8c8d03c0ea 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -175,8 +175,10 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             else
                 boot.execute(this, new Bundle(), "main:accounts");
         } else {
-            // Enable compact view on small screens
-            if (!getResources().getConfiguration().isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE))
+            // Enable 3-col mode on large screen / compact view on small screens
+            if (getResources().getConfiguration().isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE))
+                prefs.edit().putBoolean("landscape3", true).apply();
+            else
                 prefs.edit().putBoolean("compact", true).apply();
 
             setTheme(R.style.AppThemeBlueOrangeLight);
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 6c5d4e8030..1da737b0b7 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -226,6 +226,10 @@ public class ApplicationEx extends Application {
                 editor.putBoolean("resize_attachments", autoresize);
                 editor.remove("autoresize");
             }
+        } else if (version < 930) {
+            boolean large = context.getResources().getConfiguration()
+                    .isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+            editor.putBoolean("landscape3", large);
         }
 
         if (BuildConfig.DEBUG && false) {
diff --git a/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java b/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java
index a6c175e5b5..f2bdb33fae 100644
--- a/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java
+++ b/app/src/main/java/eu/faircode/email/DrawerLayoutEx.java
@@ -52,7 +52,7 @@ public class DrawerLayoutEx extends DrawerLayout {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         boolean normal = config.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_NORMAL);
         boolean landscape = prefs.getBoolean("landscape", true);
-        boolean landscape3 = prefs.getBoolean("landscape3", true);
+        boolean landscape3 = prefs.getBoolean("landscape3", false);
 
         if (normal && landscape && landscape3 &&
                 config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index da1598e3b4..bbf02b4b0c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -599,7 +599,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
 
         swLandscape.setChecked(prefs.getBoolean("landscape", true));
         swLandscape.setEnabled(normal);
-        swLandscape3.setChecked(prefs.getBoolean("landscape3", true));
+        swLandscape3.setChecked(prefs.getBoolean("landscape3", false));
         swLandscape3.setEnabled(normal && swLandscape.isChecked());
 
         String startup = prefs.getString("startup", "unified");
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 53dfe47cc3..5c73c9e26e 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -53,7 +53,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:checked="true"
             android:text="@string/title_advanced_landscape3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"