Revert "Workaround barrier problem"

This reverts commit 4165fabe34.

app/src/main/res/layout/include_message_attachments.xml

@@ -4,14 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/workaround"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
     <View
         android:id="@+id/vSeparatorAttachments"
         android:layout_width="0dp"
@@ -58,7 +50,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
         app:srcCompat="@drawable/twotone_save_alt_24" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <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="cbInline,ibSaveAttachments,ibDownloadAttachments" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvAttachment"
@@ -67,7 +65,7 @@
         android:layout_marginTop="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/workaround" />
+        app:layout_constraintTop_toBottomOf="@+id/barrier_internet" />
 
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvNoInternetAttachments"