diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index fd4be7491e0674e967eaaf993c820fd37d7a8f42..2d5941a356b3aff76988806585ef6acbf3d79429 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -17,7 +17,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_marginEnd="0dp"
-            android:scaleType="fitXY"
+            android:scaleType="centerCrop"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 2ce36112c77b6fded31655ce84d5b47754f74a7e..618db169dde055d840f51ea8610d70d024c43005 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -23,7 +23,7 @@
                 android:id="@+id/message_photo"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:scaleType="fitXY"
+                android:scaleType="centerCrop"
                 app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
         </LinearLayout>
 
diff --git a/src/main/res/layout/item_message_status.xml b/src/main/res/layout/item_message_status.xml
index a591163e9da8f93410fa4de0e680077b2476aed2..b563582f7b67c016177ba72a58225de74688ba98 100644
--- a/src/main/res/layout/item_message_status.xml
+++ b/src/main/res/layout/item_message_status.xml
@@ -28,7 +28,7 @@
             android:layout_alignParentTop="true"
             android:layout_marginEnd="-1.5dp"
             android:padding="0dp"
-            android:scaleType="fitXY"
+            android:scaleType="centerCrop"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <TextView
diff --git a/src/main/res/layout/item_user_preview.xml b/src/main/res/layout/item_user_preview.xml
index 45fffec9c249bc9f10c8e627920a91575073be8b..9645b23159b9e68e3c078499750f75ec3e0d1c08 100644
--- a/src/main/res/layout/item_user_preview.xml
+++ b/src/main/res/layout/item_user_preview.xml
@@ -11,7 +11,7 @@
             android:id="@+id/avatar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitXY"
+            android:scaleType="centerCrop"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
     </eu.siacs.conversations.ui.widget.SquareFrameLayout>
 </layout>