diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index cc42f6ac..ffa2fb77 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -13,8 +13,8 @@
             android:id="@+id/ivState"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="6dp"
             android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
             android:src="@drawable/baseline_cloud_off_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -23,8 +23,8 @@
             android:id="@+id/tvName"
             android:layout_width="0dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="6dp"
             android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
             android:ellipsize="start"
             android:gravity="center_vertical"
             android:singleLine="true"
@@ -54,6 +54,12 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="ivState,tvName,tvMessages,ivMessages" />
 
         <ImageView
             android:id="@+id/ivUnified"
@@ -62,7 +68,7 @@
             android:layout_marginStart="6dp"
             android:src="@drawable/baseline_folder_special_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivState" />
+            app:layout_constraintTop_toBottomOf="@id/barrier1" />
 
         <TextView
             android:id="@+id/tvType"
@@ -73,7 +79,7 @@
             android:text="type"
             android:textAppearance="@android:style/TextAppearance.Small"
             app:layout_constraintStart_toEndOf="@id/ivUnified"
-            app:layout_constraintTop_toBottomOf="@id/ivState" />
+            app:layout_constraintTop_toBottomOf="@id/barrier1" />
 
         <TextView
             android:id="@+id/tvAfter"
@@ -84,7 +90,7 @@
             android:text="30"
             android:textAppearance="@android:style/TextAppearance.Small"
             app:layout_constraintEnd_toStartOf="@+id/ivSync"
-            app:layout_constraintTop_toBottomOf="@id/ivState" />
+            app:layout_constraintTop_toBottomOf="@id/barrier1" />
 
         <ImageView
             android:id="@+id/ivSync"
@@ -93,27 +99,34 @@
             android:layout_marginEnd="6dp"
             android:src="@drawable/baseline_sync_24"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivState" />
+            app:layout_constraintTop_toBottomOf="@id/barrier1" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="ivUnified,tvType,tvAfter,ivSync" />
 
         <TextView
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
             android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
             android:text="error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvType" />
+            app:layout_constraintTop_toBottomOf="@id/barrier2" />
 
         <View
             android:id="@+id/vSeparator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginBottom="6dp"
             android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />