diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7cb447b915..7f94f7ef04 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1762,8 +1762,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     public Drawable getDrawable(String source) {
                         Drawable image = HtmlHelper.decodeImage(source, message.id, show_images, tvBody);
 
-                        float width = context.getResources().getDisplayMetrics().widthPixels -
-                                Helper.dp2pixels(context, 12); // margins
+                        float width = tvBody.getWidth();
                         if (image.getIntrinsicWidth() > width) {
                             float scale = width / image.getIntrinsicWidth();
                             image.setBounds(0, 0,
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 19c06ebc83..99ad8521a8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2762,8 +2762,7 @@ public class FragmentCompose extends FragmentBase {
                                 public Drawable getDrawable(String source) {
                                     Drawable image = HtmlHelper.decodeImage(source, id, show_images, tvReference);
 
-                                    float width = context.getResources().getDisplayMetrics().widthPixels -
-                                            Helper.dp2pixels(context, 12); // margins;
+                                    float width = tvReference.getWidth();
                                     if (image.getIntrinsicWidth() > width) {
                                         float scale = width / image.getIntrinsicWidth();
                                         image.setBounds(0, 0,