diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b4b8bce7df..a2d6840c49 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1748,7 +1748,10 @@ 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 = tvBody.getWidth();
+                        ConstraintLayout.LayoutParams params =
+                                (ConstraintLayout.LayoutParams) tvBody.getLayoutParams();
+                        float width = context.getResources().getDisplayMetrics().widthPixels
+                                - params.leftMargin - params.rightMargin;
                         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 64c05f96c2..a3891a0097 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -92,6 +92,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.cursoradapter.widget.SimpleCursorAdapter;
 import androidx.exifinterface.media.ExifInterface;
@@ -2818,7 +2819,10 @@ public class FragmentCompose extends FragmentBase {
                                 public Drawable getDrawable(String source) {
                                     Drawable image = HtmlHelper.decodeImage(source, id, show_images, tvReference);
 
-                                    float width = tvReference.getWidth();
+                                    ConstraintLayout.LayoutParams params =
+                                            (ConstraintLayout.LayoutParams) tvReference.getLayoutParams();
+                                    float width = context.getResources().getDisplayMetrics().widthPixels
+                                            - params.leftMargin - params.rightMargin;
                                     if (image.getIntrinsicWidth() > width) {
                                         float scale = width / image.getIntrinsicWidth();
                                         image.setBounds(0, 0,