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 4696a7145c..373c8b3da8 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
@@ -45,6 +45,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dp"
+        android:layout_marginEnd="8dp"
         android:bufferType="spannable"
         android:singleLine="false"
         android:textAppearance="@style/TextAppearance.K9.Small"
@@ -133,15 +134,15 @@
 
     <ImageView
         android:id="@+id/star"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="-8dp"
-        android:paddingHorizontal="12dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="14dp"
         android:src="@drawable/btn_select_star"
-        app:layout_constraintBottom_toBottomOf="@+id/divider"
+        app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/date"
-        app:layout_constraintVertical_bias="1.0" />
+        app:layout_constraintTop_toTopOf="@+id/preview"
+        app:layout_constraintVertical_bias="0.0" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/top_guideline"
@@ -150,6 +151,13 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_begin="12dp" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/bottom_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_end="12dp" />
+
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier_first_line_bottom"
         android:layout_width="wrap_content"