diff --git a/app/src/main/res/layout/include_message.xml b/app/src/main/res/layout/include_message.xml
index 902835be30..90b972ea6c 100644
--- a/app/src/main/res/layout/include_message.xml
+++ b/app/src/main/res/layout/include_message.xml
@@ -88,79 +88,6 @@
         app:layout_constraintStart_toStartOf="@id/tvHeaders"
         app:layout_constraintTop_toTopOf="@id/tvHeaders" />
 
-    <View
-        android:id="@+id/vSeparatorAttachments"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="6dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        android:background="?attr/colorSeparator"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvHeaders" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvAttachment"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
-
-    <CheckBox
-        android:id="@+id/cbInline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:text="@string/title_show_inline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
-
-    <Button
-        android:id="@+id/btnDownloadAttachments"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="@string/title_download_all"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/cbInline" />
-
-    <Button
-        android:id="@+id/btnSaveAttachments"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="@string/title_save_all"
-        app:layout_constraintEnd_toEndOf="@id/rvAttachment"
-        app:layout_constraintTop_toBottomOf="@id/cbInline" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier_internet"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="btnDownloadAttachments,btnSaveAttachments" />
-
-    <TextView
-        android:id="@+id/tvNoInternetAttachments"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:text="@string/title_no_internet"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintEnd_toEndOf="@id/rvAttachment"
-        app:layout_constraintStart_toStartOf="@id/rvAttachment"
-        app:layout_constraintTop_toBottomOf="@id/barrier_internet" />
-
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bnvActions"
         android:layout_width="0dp"
@@ -172,7 +99,7 @@
         app:labelVisibilityMode="labeled"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvNoInternetAttachments"
+        app:layout_constraintTop_toBottomOf="@id/tvHeaders"
         app:menu="@menu/action_message" />
 
     <ToggleButton
@@ -262,12 +189,6 @@
         android:layout_height="0dp"
         app:constraint_referenced_ids="vSeparatorHeaders,tvHeaders" />
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/grpAttachments"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
-
     <androidx.constraintlayout.widget.Group
         android:id="@+id/grpExpanded"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index f8c601d768..d32fb27de1 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -350,6 +350,79 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/inMessage" />
 
+        <View
+            android:id="@+id/vSeparatorAttachments"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vwBody" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAttachment"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
+
+        <CheckBox
+            android:id="@+id/cbInline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/title_show_inline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
+
+        <Button
+            android:id="@+id/btnDownloadAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_download_all"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
+
+        <Button
+            android:id="@+id/btnSaveAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_save_all"
+            app:layout_constraintEnd_toEndOf="@id/rvAttachment"
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_internet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="btnDownloadAttachments,btnSaveAttachments" />
+
+        <TextView
+            android:id="@+id/tvNoInternetAttachments"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="@string/title_no_internet"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/rvAttachment"
+            app:layout_constraintStart_toStartOf="@id/rvAttachment"
+            app:layout_constraintTop_toBottomOf="@id/barrier_internet" />
+
         <View
             android:id="@+id/vSeparatorImages"
             android:layout_width="0dp"
@@ -371,6 +444,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorImages" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpAttachments"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpImages"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index e6d8cd5cde..18bccf42d3 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -343,6 +343,79 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/inMessage" />
 
+        <View
+            android:id="@+id/vSeparatorAttachments"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vwBody" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAttachment"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="6dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
+
+        <CheckBox
+            android:id="@+id/cbInline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/title_show_inline"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
+
+        <Button
+            android:id="@+id/btnDownloadAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_download_all"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
+
+        <Button
+            android:id="@+id/btnSaveAttachments"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/title_save_all"
+            app:layout_constraintEnd_toEndOf="@id/rvAttachment"
+            app:layout_constraintTop_toBottomOf="@id/cbInline" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_internet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="btnDownloadAttachments,btnSaveAttachments" />
+
+        <TextView
+            android:id="@+id/tvNoInternetAttachments"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="@string/title_no_internet"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/rvAttachment"
+            app:layout_constraintStart_toStartOf="@id/rvAttachment"
+            app:layout_constraintTop_toBottomOf="@id/barrier_internet" />
+
         <View
             android:id="@+id/vSeparatorImages"
             android:layout_width="0dp"
@@ -364,6 +437,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorImages" />
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpAttachments"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="vSeparatorAttachments,rvAttachment" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpImages"
             android:layout_width="0dp"