diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 9035f667c7..7436dca148 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -241,9 +241,10 @@ public class HtmlHelper {
 
                     String awidth = img.attr("width");
                     String aheight = img.attr("height");
-                    if (!TextUtils.isEmpty(awidth))
+
+                    if (!TextUtils.isEmpty(awidth) && !"auto".equals(awidth.toLowerCase()))
                         width = Integer.parseInt(awidth);
-                    if (!TextUtils.isEmpty(aheight))
+                    if (!TextUtils.isEmpty(aheight) && !"auto".equals(aheight.toLowerCase()))
                         height = Integer.parseInt(aheight);
 
                     if (width != 0 || height != 0) {