diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 89f91a95dc..2aa03182f4 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -102,15 +102,6 @@
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-        <View
-            android:id="@+id/padding1"
-            android:layout_width="match_parent"
-            android:layout_height="6dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
-
         <ImageView
             android:id="@+id/ivAnswered"
             android:layout_width="21dp"
@@ -119,7 +110,7 @@
             android:src="@drawable/baseline_reply_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <ImageView
             android:id="@+id/ivAttachments"
@@ -129,7 +120,7 @@
             android:src="@drawable/baseline_attachment_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <TextView
             android:id="@+id/tvSubject"
@@ -145,7 +136,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toStartOf="@+id/tvFolder"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
         <TextView
             android:id="@+id/tvFolder"
@@ -161,7 +152,7 @@
             app:layout_constraintBottom_toBottomOf="@id/tvSubject"
             app:layout_constraintEnd_toStartOf="@+id/tvCount"
             app:layout_constraintStart_toEndOf="@id/tvSubject"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <TextView
             android:id="@+id/tvCount"
@@ -174,7 +165,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@id/tvSubject"
             app:layout_constraintEnd_toStartOf="@+id/ivThread"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <ImageView
             android:id="@+id/ivThread"
@@ -184,7 +175,7 @@
             android:src="@drawable/baseline_message_24"
             app:layout_constraintBottom_toBottomOf="@id/tvSubject"
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <ImageView
             android:id="@+id/ivFlagged"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 49a0d2bb69..f2e4b7ac85 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -98,19 +98,12 @@
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-        <View
-            android:id="@+id/padding1"
-            android:layout_width="match_parent"
-            android:layout_height="6dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
-
         <TextView
             android:id="@+id/tvSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:gravity="center_vertical"
             android:minHeight="24dp"
@@ -118,7 +111,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/padding1" />
+            app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
         <ImageView
             android:id="@+id/ivFlagged"
@@ -132,14 +125,6 @@
             app:layout_constraintEnd_toEndOf="@id/paddingEnd"
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-        <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_toBottomOf="@id/tvSubject" />
-
         <ImageView
             android:id="@+id/ivAnswered"
             android:layout_width="21dp"
@@ -148,7 +133,7 @@
             android:src="@drawable/baseline_reply_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
-            app:layout_constraintTop_toBottomOf="@id/padding2" />
+            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
         <ImageView
             android:id="@+id/ivAttachments"
@@ -158,13 +143,14 @@
             android:src="@drawable/baseline_attachment_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
-            app:layout_constraintTop_toBottomOf="@id/padding2" />
+            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
         <TextView
             android:id="@+id/tvFolder"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:gravity="end|center_vertical"
             android:minHeight="21dp"
@@ -172,7 +158,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toStartOf="@+id/tvCount"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/padding2" />
+            app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
         <TextView
             android:id="@+id/tvCount"
@@ -185,7 +171,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintEnd_toStartOf="@+id/ivThread"
-            app:layout_constraintTop_toBottomOf="@id/padding2" />
+            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
         <ImageView
             android:id="@+id/ivThread"
@@ -195,7 +181,7 @@
             android:src="@drawable/baseline_message_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
-            app:layout_constraintTop_toBottomOf="@id/padding2" />
+            app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
         <TextView
             android:id="@+id/tvPreview"