Workaround barrier problem

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

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