diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index 97bcd1bf5..d1e752040 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -434,7 +434,9 @@ class MessageModel
 
         val contents = chatMessage.contents
         allFilesDownloaded = true
-        val exactly4Contents = contents.size == 4
+        val exactly4Contents = contents.count {
+            it.isFile || it.isFileTransfer
+        } == 4
 
         for (content in contents) {
             val isFileEncrypted = content.isFileEncrypted
diff --git a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
index 4378bfc62..33d4ba3d4 100644
--- a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
@@ -18,23 +18,25 @@
         android:layout_height="wrap_content"
         app:layout_wrapBefore="@{model.flexboxLayoutWrapBefore}">
 
-        <include
+        <ViewStub
             android:id="@+id/media_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            layout="@layout/chat_bubble_media_grid_cell"
+            android:layout="@layout/chat_bubble_media_grid_cell"
             android:visibility="@{model.isImage || model.isVideoPreview ? View.VISIBLE : View.GONE}"
+            bind:inflatedVisibility="@{model.isImage || model.isVideoPreview ? View.VISIBLE : View.GONE}"
             bind:model="@{model}"
             bind:onLongClickListener="@{onLongClickListener}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
 
-        <include
+        <ViewStub
             android:id="@+id/file_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            layout="@layout/chat_bubble_file_grid_cell"
+            android:layout="@layout/chat_bubble_file_grid_cell"
             android:visibility="@{!model.isImage &amp;&amp; !model.isVideoPreview ? View.VISIBLE : View.GONE}"
+            bind:inflatedVisibility="@{!model.isImage &amp;&amp; !model.isVideoPreview ? View.VISIBLE : View.GONE}"
             bind:model="@{model}"
             bind:onLongClickListener="@{onLongClickListener}"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index a3a1a8aa2..604d429ab 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -5,7 +5,6 @@
 
     <data>
         <import type="android.view.View" />
-        <import type="com.google.android.flexbox.JustifyContent" />
         <import type="org.linphone.core.ChatMessage.State" />
         <variable
             name="onLongClickListener"
@@ -179,7 +178,7 @@
                 android:visibility="@{model.filesList.size() >= 2 ? View.VISIBLE : View.GONE, default=gone}"
                 app:alignItems="center"
                 app:flexWrap="wrap"
-                app:justifyContent="@{model.outgoing ? JustifyContent.FLEX_END : JustifyContent.FLEX_START}"
+                app:justifyContent="flex_start"
                 entries="@{model.filesList}"
                 layout="@{@layout/chat_bubble_content_grid_cell}"
                 onLongClick="@{onLongClickListener}"/>
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index ed494e3af..237a06551 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -5,7 +5,6 @@
 
     <data>
         <import type="android.view.View" />
-        <import type="com.google.android.flexbox.JustifyContent" />
         <import type="org.linphone.core.ChatMessage.State" />
         <variable
             name="onLongClickListener"
@@ -151,7 +150,7 @@
                 android:visibility="@{model.filesList.size() >= 2 ? View.VISIBLE : View.GONE, default=gone}"
                 app:alignItems="center"
                 app:flexWrap="wrap"
-                app:justifyContent="@{model.outgoing ? JustifyContent.FLEX_END : JustifyContent.FLEX_START}"
+                app:justifyContent="flex_end"
                 entries="@{model.filesList}"
                 layout="@{@layout/chat_bubble_content_grid_cell}"
                 onLongClick="@{onLongClickListener}"/>