diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7b582f1b5d..06797c3044 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -469,6 +469,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
                 tvSubject.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize * 0.9f);
                 tvBody.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+
+                int px = Math.round(TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_PX, textSize * (compact ? 1.5f : 3.0f),
+                        context.getResources().getDisplayMetrics()));
+                if (compact && tvFrom.getMinHeight() != px)
+                    tvFrom.setMinimumHeight(px);
+
+                ViewGroup.LayoutParams lparams = ivAvatar.getLayoutParams();
+                if (lparams.height != px) {
+                    lparams.width = px;
+                    lparams.height = px;
+                    ivAvatar.requestLayout();
+                }
             }
 
             // Date header
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index de44d994d7..f235fc4ab6 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -77,8 +77,9 @@
         <ImageView
             android:id="@+id/ivAvatar"
             android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:padding="6dp"
+            android:layout_height="0dp"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
             android:src="@drawable/baseline_person_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintDimensionRatio="1:1"