diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a888d738..84bfbe167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Types of changes can be: Added/Changed/Deprecated/Removed/Fixed/Security
 ### Added
 
 ### Changed
-- improve conversation list design and dark/light theming
+- improve conversation list design and dark/light theming (@AndyScherzinger)
 
 ### Fixed
 - @ in username is allowed for phonebook sync
@@ -17,6 +17,7 @@ Types of changes can be: Added/Changed/Deprecated/Removed/Fixed/Security
 - avoid creation of multiple "chat via"-links in phonebook
 - delete "chat via"-link from phonebook if phone number was deleted on server
 - remove all "chat via"-links from phonebook when sync is disabled
+- fix to show avatars for incoming pictures in group chats (@starypatyk)
 
 ## [11.1.0] - 2021-03-12
 ### Added
diff --git a/app/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
index f39f8796a..d3f0b4c16 100644
--- a/app/src/main/res/layout/item_custom_incoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
@@ -28,13 +28,21 @@
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="2dp">
 
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@id/messageUserAvatar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginEnd="8dp"
+        app:roundAsCircle="true" />
+
     <com.google.android.flexbox.FlexboxLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_toEndOf="@id/messageUserAvatar"
         android:orientation="vertical"
-        android:layout_alignParentStart="true"
         app:alignContent="stretch"
         app:alignItems="stretch"
         app:flexWrap="wrap"