diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java
index 3678c51620..97d7af79ce 100644
--- a/app/src/main/java/eu/faircode/email/ImageHelper.java
+++ b/app/src/main/java/eu/faircode/email/ImageHelper.java
@@ -621,7 +621,10 @@ class ImageHelper {
                 return getScaledDrawable(file, dm.widthPixels);
             }
 
-            bm = getScaledBitmap(urlConnection.getInputStream(), source, dm.widthPixels);
+            bm = getScaledBitmap(
+                    urlConnection.getInputStream(),
+                    source,
+                    Math.max(dm.widthPixels, dm.heightPixels));
         } finally {
             if (urlConnection != null)
                 urlConnection.disconnect();