From 2e34d144a27283cd7bc2c48e0a519a72f540b244 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 4 Dec 2021 14:10:11 +0100
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterMessage.java     |  7 ++---
 .../java/eu/faircode/email/HtmlHelper.java    | 30 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f17500030d..21047630e3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2612,8 +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 (!overview_mode && override_width)
-                            HtmlHelper.overrideWidth(document);
+                        HtmlHelper.overrideWidth(document, overview_mode);
                         if (inline || show_images)
                             HtmlHelper.embedInlineImages(context, message.id, document, show_images);
 
@@ -5545,8 +5544,8 @@ 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(d, overview_mode);
-                        if (!overview_mode && override_width)
-                            HtmlHelper.overrideWidth(d);
+                        if (override_width)
+                            HtmlHelper.overrideWidth(d, overview_mode);
                     }
 
                     List<CSSStyleSheet> sheets =
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 05d6cfb991..5974679e02 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2064,21 +2064,23 @@ public class HtmlHelper {
             Log.i(document.head().html());
     }
 
-    static void overrideWidth(Document document) {
-        for (Element e : document.select("*")) {
-            String width = e.attr("width");
-            if (TextUtils.isEmpty(width))
-                continue;
-            e.attr("style", mergeStyles(
-                    e.attr("style"),
-                    "width: " + width));
-            e.removeAttr("width");
-        }
+    static void overrideWidth(Document document, boolean overview_mode) {
+        if (!overview_mode) {
+            for (Element e : document.select("*")) {
+                String width = e.attr("width");
+                if (TextUtils.isEmpty(width))
+                    continue;
+                e.attr("style", mergeStyles(
+                        e.attr("style"),
+                        "width: " + width));
+                e.removeAttr("width");
+            }
 
-        for (Element e : document.body().children())
-            e.attr("style", mergeStyles(
-                    e.attr("style"),
-                    "min-width: 0 !important; max-width: 100% !important;"));
+            for (Element e : document.body().children())
+                e.attr("style", mergeStyles(
+                        e.attr("style"),
+                        "min-width: 0 !important; max-width: 100% !important;"));
+        }
     }
 
     static String getLanguage(Context context, String subject, String text) {