diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index 19e1946..60477c1 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -146,7 +146,6 @@
                     android:layout_height="wrap_content"
                     android:layout_alignBottom="@+id/subject"
                     android:layout_alignParentRight="true"
-                    android:layout_marginBottom="6dp"
                     android:layout_marginTop="-1dp"
                     android:layout_marginRight="-9dp"
                     android:src="@drawable/ic_btn_star_off" />
@@ -156,7 +155,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/star"
-                    android:layout_marginRight="7dp"
                     android:lines="2"
                     android:textSize="13sp"
                     android:includeFontPadding="false"
@@ -180,12 +178,12 @@
         android:layout_marginBottom="12dp"
         android:visibility="gone" />
 
-    <!-- Folders should be 10dp below the subject, so we cancel out part of the 12dp bottom margin above -->
+    <!-- Folders should be ~7dp below the subject *baseline*, so we cancel out part of the 12dp bottom margin above -->
     <TextView
         android:id="@+id/folders"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
+        android:layout_marginTop="-8dp"
         android:fontFamily="sans-serif-light"
         android:includeFontPadding="false"
         android:text="@string/long_string"
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index fbb6823..602d4e6 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -146,7 +146,6 @@
                     android:layout_height="wrap_content"
                     android:layout_alignBottom="@+id/subject"
                     android:layout_alignParentRight="true"
-                    android:layout_marginBottom="6dp"
                     android:layout_marginTop="-1dp"
                     android:layout_marginRight="-8dp"
                     android:src="@drawable/ic_btn_star_off" />
@@ -156,7 +155,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toLeftOf="@id/star"
-                    android:layout_marginRight="7dp"
                     android:lines="2"
                     android:textSize="13sp"
                     android:includeFontPadding="false"
@@ -183,12 +181,12 @@
         android:layout_marginBottom="16dp"
         android:visibility="gone" />
 
-    <!-- Labels should be 10dp below the subject, so we cancel out part of the 16dp bottom margin -->
+    <!-- Labels should be ~7dp below the subject *baseline*, so we cancel out part of the 16dp bottom margin -->
     <TextView
         android:id="@+id/folders"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-6dp"
+        android:layout_marginTop="-12dp"
         android:fontFamily="sans-serif-light"
         android:includeFontPadding="false"
         android:text="@string/long_string"