diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
index 4d45acc7a..fed9ace28 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
@@ -46,6 +46,9 @@ class FileModel @AnyThread constructor(
             mimeType = FileUtils.getMimeType(mime)
             isImage = mimeType == FileUtils.MimeType.Image
             isVideoPreview = mimeType == FileUtils.MimeType.Video
+            Log.d(
+                "$TAG File has already been downloaded, extension is [$extension], MIME is [$mime]"
+            )
         } else {
             mimeType = FileUtils.MimeType.Unknown
             isPdf = false
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 94c39c281..50e4f2007 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
@@ -166,10 +166,12 @@ class MessageModel @WorkerThread constructor(
         override fun onMsgStateChanged(message: ChatMessage, messageState: ChatMessage.State?) {
             statusIcon.postValue(LinphoneUtils.getChatIconResId(chatMessage.state))
 
-            if (messageState == ChatMessage.State.FileTransferDone && !message.isOutgoing) {
+            if (messageState == ChatMessage.State.FileTransferDone) {
                 Log.i("$TAG File transfer is done")
-                downloadingFileModel?.downloadProgress?.postValue(-1)
-                downloadingFileModel = null
+                if (!message.isOutgoing) {
+                    downloadingFileModel?.downloadProgress?.postValue(-1)
+                    downloadingFileModel = null
+                }
                 computeContentsList()
             }
         }
@@ -300,13 +302,16 @@ class MessageModel @WorkerThread constructor(
         val contents = chatMessage.contents
         for (content in contents) {
             if (content.isIcalendar) {
+                Log.d("$TAG Found iCal content")
                 parseConferenceInvite(content)
                 displayableContentFound = true
             } else if (content.isText) {
+                Log.d("$TAG Found plain text content")
                 computeTextContent(content)
                 displayableContentFound = true
             } else {
                 if (content.isFile) {
+                    Log.d("$TAG Found file content with type [${content.type}/${content.subtype}]")
                     filesContentCount += 1
                     val path = content.filePath ?: ""
                     if (path.isNotEmpty()) {
@@ -351,11 +356,14 @@ class MessageModel @WorkerThread constructor(
                         Log.e("$TAG No path found for File Content!")
                     }
                 } else if (content.isFileTransfer) {
+                    Log.d(
+                        "$TAG Found file content (not downloaded yet) with type [${content.type}/${content.subtype}] and name [${content.name}]"
+                    )
                     filesContentCount += 1
                     val name = content.name ?: ""
                     if (name.isNotEmpty()) {
                         val fileModel = FileModel(name, content.fileSize.toLong(), true) { model ->
-                            Log.i("$TAG Starting downloading content for file [${model.fileName}]")
+                            Log.d("$TAG Starting downloading content for file [${model.fileName}]")
 
                             if (content.filePath.orEmpty().isEmpty()) {
                                 val contentName = content.name
@@ -390,6 +398,7 @@ class MessageModel @WorkerThread constructor(
         filesList.postValue(filesPath)
 
         if (!displayableContentFound) { // Temporary workaround to prevent empty bubbles
+            Log.w("$TAG No displayable content found, generating text based description")
             val describe = LinphoneUtils.getTextDescribingMessage(chatMessage)
             val spannable = Spannable.Factory.getInstance().newSpannable(describe)
             text.postValue(spannable)
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index c8d383be4..70191a2e0 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -166,7 +166,7 @@
                 android:adjustViewBounds="true"
                 android:scaleType="fitCenter"
                 android:visibility="@{model.filesList.size() == 1 && model.firstImagePath.length() >= 0 ? View.VISIBLE : View.GONE}"
-                coilBubble="@{model.firstImagePath}"/>/>
+                coilBubble="@{model.firstImagePath}"/>
 
             <ViewStub
                 android:id="@+id/meeting_info"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 86deecd31..a14d12bf1 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -108,7 +108,7 @@
             app:layout_constraintEnd_toEndOf="parent">
 
             <com.google.android.flexbox.FlexboxLayout
-                android:id="@+id/images_grid"
+                android:id="@+id/files_grid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:onLongClick="@{onLongClickListener}"