diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index 39d1f320a0..f5f8fa503c 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -14,15 +14,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvAttachment"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
-
     <CheckBox
         android:id="@+id/cbInline"
         android:layout_width="0dp"
@@ -31,7 +22,7 @@
         android:text="@string/title_show_inline"
         app:layout_constraintEnd_toStartOf="@+id/ibDownloadAttachments"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rvAttachment" />
+        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
     <ImageButton
         android:id="@+id/ibDownloadAttachments"
@@ -45,7 +36,7 @@
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_download_all"
         app:layout_constraintEnd_toStartOf="@id/ibSaveAttachments"
-        app:layout_constraintTop_toBottomOf="@+id/rvAttachment"
+        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
         app:srcCompat="@drawable/baseline_cloud_download_24" />
 
     <ImageButton
@@ -60,7 +51,7 @@
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_save_all"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rvAttachment"
+        app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
         app:srcCompat="@drawable/baseline_save_24" />
 
     <androidx.constraintlayout.widget.Barrier
@@ -70,6 +61,15 @@
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="cbInline,ibSaveAttachments,ibDownloadAttachments" />
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvAttachment"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/barrier_internet" />
+
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvNoInternetAttachments"
         android:layout_width="wrap_content"
@@ -80,7 +80,7 @@
         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" />
+        app:layout_constraintTop_toBottomOf="@id/rvAttachment" />
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/grpAttachments"