diff --git a/app/src/main/java/eu/faircode/email/ActivityAMP.java b/app/src/main/java/eu/faircode/email/ActivityAMP.java
index 0fcdc2473d..35979508c4 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAMP.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java
@@ -81,7 +81,7 @@ public class ActivityAMP extends ActivityBase {
         wvAmp.clearCache(true);
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean overview_mode = prefs.getBoolean("overview_mode", false);
+        boolean overview_mode = prefs.getBoolean("overview_mode", true);
         boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
 
         WebSettings settings = wvAmp.getSettings();
@@ -233,7 +233,7 @@ public class ActivityAMP extends ActivityBase {
                         message == null || message.subject == null ? "AMP" : message.subject);
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean overview_mode = prefs.getBoolean("overview_mode", false);
+                boolean overview_mode = prefs.getBoolean("overview_mode", true);
 
                 String html;
                 ContentResolver resolver = context.getContentResolver();
diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index e4515c3c28..0cd675d2ff 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -140,7 +140,7 @@ public class ActivitySignature extends ActivityBase {
             public void onClick(View view) {
                 Bundle args = new Bundle();
                 args.putString("html", getHtml());
-                args.putBoolean("overview_mode", false);
+                args.putBoolean("overview_mode", true);
                 args.putBoolean("safe_browsing", false);
                 args.putBoolean("force_light", true);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5b288e8b5c..ca302d72a8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3307,7 +3307,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (message.ui_found && found && !TextUtils.isEmpty(searched))
                             HtmlHelper.highlightSearched(context, document, searched);
 
-                        boolean overview_mode = prefs.getBoolean("overview_mode", false);
+                        boolean overview_mode = prefs.getBoolean("overview_mode", true);
                         HtmlHelper.setViewport(document, overview_mode);
                         if (inline || show_images)
                             HtmlHelper.embedInlineImages(context, message.id, document, show_images);
@@ -4792,7 +4792,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_fullscreen, 1, R.string.title_fullscreen);
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_fit_width, 2, R.string.title_fit_width)
                         .setCheckable(true)
-                        .setChecked(prefs.getBoolean("overview_mode", false));
+                        .setChecked(prefs.getBoolean("overview_mode", true));
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_monospaced_pre, 4, R.string.title_monospaced_pre)
                         .setCheckable(true)
                         .setChecked(prefs.getBoolean("monospaced_pre", false));
@@ -5912,7 +5912,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 @Override
                 protected String onExecute(Context context, Bundle args) throws Throwable {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean overview_mode = prefs.getBoolean("overview_mode", false);
+                    boolean overview_mode = prefs.getBoolean("overview_mode", true);
                     boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
                     boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false);
 
@@ -5937,7 +5937,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 @Override
                 protected void onExecuted(Bundle args, String html) {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean overview_mode = prefs.getBoolean("overview_mode", false);
+                    boolean overview_mode = prefs.getBoolean("overview_mode", true);
                     boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
 
                     Bundle fargs = new Bundle();
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index c2c24712bc..401f910733 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -873,6 +873,9 @@ public class ApplicationEx extends Application
         } else if (version < 2196) {
             if (!prefs.contains("forward_new"))
                 editor.putBoolean("forward_new", true);
+        } else if (version < 2197) {
+            if (!prefs.contains("overview_mode"))
+                editor.putBoolean("overview_mode", false);
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 4d8e164d2b..4771c8b29e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -1685,7 +1685,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 sbMessageZoom.setProgress(message_zoom - 50);
 
             swEditorZoom.setChecked(prefs.getBoolean("editor_zoom", true));
-            swOverviewMode.setChecked(prefs.getBoolean("overview_mode", false));
+            swOverviewMode.setChecked(prefs.getBoolean("overview_mode", true));
 
             swContrast.setChecked(prefs.getBoolean("contrast", false));
             swHyphenation.setChecked(prefs.getBoolean("hyphenation", false));
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 922097f34d..d66dce7c5d 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -69,7 +69,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         this.viewportHeight = prefs.getInt("viewport_height", getDefaultViewportHeight(context));
-        boolean overview_mode = prefs.getBoolean("overview_mode", false);
+        boolean overview_mode = prefs.getBoolean("overview_mode", true);
         boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
 
         setVerticalScrollBarEnabled(false);