From 0b723b39c8af8f70b853befa4168d1cf8def15c9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 3 Dec 2021 18:25:33 +0100
Subject: [PATCH] Revert "Removed limitation"

This reverts commit 92a49dfbcc0e362598af60a8bf493831f71383d6.
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java         | 2 +-
 app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java | 2 ++
 app/src/main/res/layout/fragment_options_display.xml            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ecfd8a1d01..06556aaa2e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2612,7 +2612,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         boolean overview_mode = prefs.getBoolean("overview_mode", false);
                         boolean override_width = prefs.getBoolean("override_width", false);
                         HtmlHelper.setViewport(document, overview_mode);
-                        if (override_width)
+                        if (!overview_mode && override_width)
                             HtmlHelper.overrideWidth(document);
                         if (inline || show_images)
                             HtmlHelper.embedInlineImages(context, message.id, document, show_images);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 9a4e8fd4a9..5553ea26da 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -900,6 +900,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("overview_mode", checked).apply();
+                swOverrideWidth.setEnabled(!checked);
             }
         });
 
@@ -1223,6 +1224,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
 
         swOverviewMode.setChecked(prefs.getBoolean("overview_mode", false));
         swOverrideWidth.setChecked(prefs.getBoolean("override_width", false));
+        swOverrideWidth.setEnabled(!swOverviewMode.isChecked());
 
         swContrast.setChecked(prefs.getBoolean("contrast", false));
         swMonospaced.setChecked(prefs.getBoolean("monospaced", false));
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 468c24ccdb..e67d556e6c 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1352,6 +1352,7 @@
                     android:id="@+id/swOverrideWidth"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:text="@string/title_advanced_override_width"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -1363,6 +1364,7 @@
                     android:id="@+id/tvOverrideWidthHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginEnd="48dp"
                     android:text="@string/title_advanced_override_width_hint"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"