diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index ac093436..ffc99275 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -177,7 +177,7 @@
             android:text="123 KB"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintTop_toBottomOf="@id/tvSubject"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd" />
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
             android:id="@+id/tvError"
@@ -191,7 +191,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvSize" />
+            app:layout_constraintTop_toBottomOf="@id/tvCount" />
 
         <View
             android:id="@+id/paddingEnd"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index d3a07af4..e556b121 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -173,7 +173,7 @@
             android:maxLines="1"
             android:text="123 KB"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
         <TextView
@@ -189,7 +189,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/tvSize" />
+            app:layout_constraintTop_toBottomOf="@id/tvCount" />
 
         <View
             android:id="@+id/paddingEnd"