diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 03bec80b66..a9947ae71b 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -191,7 +191,7 @@
             android:paddingBottom="6dp"
             android:src="@drawable/baseline_star_24"
             android:visibility="visible"
-            app:layout_constraintBottom_toTopOf="@id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier2"
             app:layout_constraintEnd_toEndOf="@id/paddingEnd"
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index cb1a8a3275..40d2ecb8b1 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -50,10 +50,9 @@
             android:id="@+id/ivAvatar"
             android:layout_width="0dp"
             android:layout_height="48dp"
-            android:layout_marginStart="6dp"
             android:padding="6dp"
             android:src="@drawable/baseline_person_24"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
@@ -111,15 +110,54 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/barrier1" />
 
+        <TextView
+            android:id="@+id/tvSubject"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:text="Subject"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
+            app:layout_constraintStart_toEndOf="@id/ivAvatar"
+            app:layout_constraintTop_toBottomOf="@id/padding1" />
+
+        <ImageView
+            android:id="@+id/ivFlagged"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="6dp"
+            android:src="@drawable/baseline_star_24"
+            android:visibility="visible"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
+            app:layout_constraintEnd_toEndOf="@id/paddingEnd"
+            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+
+        <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="tvSubject" />
+
+        <View
+            android:id="@+id/padding2"
+            android:layout_width="match_parent"
+            android:layout_height="6dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/barrier2" />
+
         <ImageView
             android:id="@+id/ivAnswered"
             android:layout_width="21dp"
             android:layout_height="21dp"
             android:layout_marginStart="6dp"
             android:src="@drawable/baseline_reply_24"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toBottomOf="@id/padding2" />
 
         <ImageView
             android:id="@+id/ivAttachments"
@@ -127,34 +165,24 @@
             android:layout_height="21dp"
             android:layout_marginStart="6dp"
             android:src="@drawable/baseline_attachment_24"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toBottomOf="@id/padding2" />
 
         <TextView
-            android:id="@+id/tvSubject"
+            android:id="@+id/tvFolder"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:text="Subject"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
-            app:layout_constraintEnd_toStartOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
-
-        <TextView
-            android:id="@+id/tvFolder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
+            android:gravity="end"
             android:maxLines="1"
             android:text="folder"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintEnd_toStartOf="@+id/tvCount"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintStart_toEndOf="@id/ivAttachments"
+            app:layout_constraintTop_toBottomOf="@id/padding2" />
 
         <TextView
             android:id="@+id/tvCount"
@@ -164,9 +192,9 @@
             android:maxLines="1"
             android:text="3"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintEnd_toStartOf="@+id/ivThread"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toBottomOf="@id/padding2" />
 
         <ImageView
             android:id="@+id/ivThread"
@@ -174,27 +202,16 @@
             android:layout_height="15dp"
             android:layout_marginEnd="6dp"
             android:src="@drawable/baseline_message_24"
-            app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintBottom_toTopOf="@+id/barrier3"
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
-
-        <ImageView
-            android:id="@+id/ivFlagged"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:padding="6dp"
-            android:src="@drawable/baseline_star_24"
-            android:visibility="visible"
-            app:layout_constraintBottom_toTopOf="@id/barrier2"
-            app:layout_constraintEnd_toEndOf="@id/paddingEnd"
-            app:layout_constraintTop_toBottomOf="@id/paddingTop" />
+            app:layout_constraintTop_toBottomOf="@id/padding2" />
 
         <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/barrier2"
+            android:id="@+id/barrier3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:barrierDirection="bottom"
-            app:constraint_referenced_ids="ivAvatar,ivAnswered,ivAttachments,tvSubject,tvFolder,tvCount,ivThread,ivFlagged" />
+            app:constraint_referenced_ids="ivAvatar,ivAnswered,ivAttachments,tvFolder,tvCount,ivThread,ivFlagged" />
 
         <TextView
             android:id="@+id/tvPreview"
@@ -211,7 +228,7 @@
             android:textStyle="italic"
             app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/barrier2" />
+            app:layout_constraintTop_toBottomOf="@id/barrier3" />
 
         <TextView
             android:id="@+id/tvError"