diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 50d7e62b78..05d6cfb991 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2065,23 +2065,20 @@ public class HtmlHelper {
     }
 
     static void overrideWidth(Document document) {
-        List<String> tags = new ArrayList<>();
         for (Element e : document.select("*")) {
-            String tag = e.tagName();
-            if ("img".equals(tag))
-                continue;
-            if (tags.contains(tag))
+            String width = e.attr("width");
+            if (TextUtils.isEmpty(width))
                 continue;
-            tags.add(tag);
+            e.attr("style", mergeStyles(
+                    e.attr("style"),
+                    "width: " + width));
+            e.removeAttr("width");
         }
 
-        StringBuilder sb = new StringBuilder();
-        sb.append("<style type=\"text/css\">");
-        for (String tag : tags)
-            sb.append(tag).append("{max-width: 100% !important;}");
-        sb.append("</style>");
-
-        document.select("head").append(sb.toString());
+        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) {