diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 1880e3581ef6400242787aea0dc391aedb28ce33..a74fd2deb3c6a4198b4450cede0995fa3d086654 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -21,21 +21,11 @@
             android:layout_gravity="center_vertical"
             android:orientation="horizontal">
 
-            <View
-                android:id="@+id/unread_message_indicator"
-                android:layout_width="10dp"
-                android:layout_height="10dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/ic_unread_message"
-                android:visibility="invisible" />
-
             <RelativeLayout
                 android:id="@+id/list_item_inner"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="13dp"
                 android:layout_marginTop="7dp"
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="7dp"
@@ -49,18 +39,27 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
+                    android:gravity="center_vertical"
                     android:layout_toStartOf="@+id/date">
 
+                    <View
+                        android:id="@+id/unread_message_indicator"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="13dp"
+                        android:background="@drawable/ic_unread_message"
+                        android:visibility="invisible" />
+
                     <CheckBox
                         android:id="@+id/star"
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="9dp"
                         android:button="@drawable/ic_star"
                         android:enabled="false"
                         android:focusable="false"
                         android:gravity="center_vertical"
+                        android:layout_marginEnd="12dp"
                         android:visibility="visible"
                         tools:text="&#x200B;" />
 
@@ -82,6 +81,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/subject_wrapper"
                     android:layout_alignParentStart="true"
+                    android:layout_marginStart="@dimen/messageListItemStartPadding"
                     android:layout_toStartOf="@id/extra_info_holder">
 
                     <ImageView
diff --git a/app/ui/legacy/src/main/res/values/dimensions.xml b/app/ui/legacy/src/main/res/values/dimensions.xml
index 5953db7e0a933d95c15f3f786e7a4524ed20cfed..c58d0e1fca2c89ab4784908b1f0e590a55698bfa 100644
--- a/app/ui/legacy/src/main/res/values/dimensions.xml
+++ b/app/ui/legacy/src/main/res/values/dimensions.xml
@@ -18,4 +18,8 @@
     <dimen name="floatingActionButtonMargin">16dp</dimen>
     <!-- Height of ExtendedFloatingActionButton (48dp) plus two times floatingActionButtonMargin -->
     <dimen name="floatingActionButtonSpacing">80dp</dimen>
+
+    <!-- This padding is calculated from unread_message_indicator-->
+    <!-- Equals size of the dot (10dp) + left margin (12dp) + right margin (13dp) -->
+    <dimen name="messageListItemStartPadding">34dp</dimen>
 </resources>