diff --git a/app/src/main/java/eu/faircode/email/FixedImageButton.java b/app/src/main/java/eu/faircode/email/FixedImageButton.java
index 90b6df0ecd..57dddb10c7 100644
--- a/app/src/main/java/eu/faircode/email/FixedImageButton.java
+++ b/app/src/main/java/eu/faircode/email/FixedImageButton.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
@@ -49,7 +50,9 @@ public class FixedImageButton extends AppCompatImageButton {
             Log.e(new Throwable(Helper.getViewName(this), ex));
             Context context = getContext();
             Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
-            d.setBounds(getDrawable().getBounds());
+            Rect b = getDrawable().getBounds();
+            int px = Math.min(b.width(), b.height());
+            d.setBounds(0, 0, px, px);
             d.draw(canvas);
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FixedImageView.java b/app/src/main/java/eu/faircode/email/FixedImageView.java
index d3bb81a08a..6e018a80cd 100644
--- a/app/src/main/java/eu/faircode/email/FixedImageView.java
+++ b/app/src/main/java/eu/faircode/email/FixedImageView.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
@@ -50,7 +51,9 @@ public class FixedImageView extends androidx.appcompat.widget.AppCompatImageView
             Log.e(new Throwable(Helper.getViewName(this), ex));
             Context context = getContext();
             Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
-            d.setBounds(getDrawable().getBounds());
+            Rect b = getDrawable().getBounds();
+            int px = Math.min(b.width(), b.height());
+            d.setBounds(0, 0, px, px);
             d.draw(canvas);
         }
     }