diff --git a/app/src/main/res/layout/chat_message_generic_file_content_cell.xml b/app/src/main/res/layout/chat_message_generic_file_content_cell.xml
index e52d2d9e6..5fc5951c9 100644
--- a/app/src/main/res/layout/chat_message_generic_file_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_generic_file_content_cell.xml
@@ -17,6 +17,8 @@
     </data>
 
     <RelativeLayout
+        android:onClick="@{() -> data.openFile()}"
+        android:onLongClick="@{longClickListener}"
         android:layout_width="@dimen/chat_message_bubble_file_size"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/chat_message_bubble_file_size"
@@ -34,8 +36,6 @@
             android:drawablePadding="5dp"
             android:ellipsize="middle"
             android:gravity="center"
-            android:onClick="@{() -> data.openFile()}"
-            android:onLongClick="@{longClickListener}"
             android:singleLine="true"
             android:text="@{data.fileName, default=`test.pdf`}"
             android:textAlignment="center"
diff --git a/app/src/main/res/layout/chat_message_image_content_cell.xml b/app/src/main/res/layout/chat_message_image_content_cell.xml
index 631381f5f..aa47d9402 100644
--- a/app/src/main/res/layout/chat_message_image_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_image_content_cell.xml
@@ -18,14 +18,14 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:onClick="@{() -> data.openFile()}"
+        android:onLongClick="@{longClickListener}"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="@{inflatedVisibility}"
         inflatedLifecycleOwner="@{true}">
 
         <ImageView
-            android:onClick="@{() -> data.openFile()}"
-            android:onLongClick="@{longClickListener}"
             android:contentDescription="@string/content_description_downloaded_file_transfer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_message_video_content_cell.xml b/app/src/main/res/layout/chat_message_video_content_cell.xml
index c8cbe548f..04d3ac979 100644
--- a/app/src/main/res/layout/chat_message_video_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_video_content_cell.xml
@@ -17,6 +17,8 @@
     </data>
 
     <RelativeLayout
+        android:onClick="@{() -> data.openFile()}"
+        android:onLongClick="@{longClickListener}"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="@{inflatedVisibility}"
@@ -38,8 +40,6 @@
             app:drawableTopCompat="@drawable/file_video" />
 
         <ImageView
-            android:onClick="@{() -> data.openFile()}"
-            android:onLongClick="@{longClickListener}"
             android:contentDescription="@string/content_description_downloaded_file_transfer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"