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 4cabb17db..af7d090d8 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
@@ -329,7 +329,7 @@ class MessageModel @WorkerThread constructor(
                 parseConferenceInvite(content)
 
                 displayableContentFound = true
-            } else if (content.isText) {
+            } else if (content.isText && !content.isFile) {
                 Log.d("$TAG Found plain text content")
                 computeTextContent(content)
 
@@ -416,7 +416,7 @@ class MessageModel @WorkerThread constructor(
                         Log.e("$TAG No name found for FileTransfer Content!")
                     }
                 } else {
-                    Log.i("$TAG Content is not a File")
+                    Log.w("$TAG Content [${content.name}] is not a File")
                 }
             }
         }
diff --git a/app/src/main/res/layout/file_viewer_fragment.xml b/app/src/main/res/layout/file_viewer_fragment.xml
index a4cda0228..d02444b99 100644
--- a/app/src/main/res/layout/file_viewer_fragment.xml
+++ b/app/src/main/res/layout/file_viewer_fragment.xml
@@ -48,9 +48,11 @@
 
         <ScrollView
             android:id="@+id/text"
+            android:onClick="@{() -> viewModel.toggleFullScreen()}"
             android:background="?attr/color_main2_000"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:fillViewport="true"
             android:visibility="@{viewModel.isText ? View.VISIBLE : View.GONE, default=gone}" >
 
             <TextView