diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 6bb88817a..fe5c486a0 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -39,6 +39,8 @@
                         android:id="@+id/subject"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:maxLines="3"
+                        android:ellipsize="end"
                         android:textSize="10sp"
                         android:textStyle="bold"
                         android:textColor="?android:attr/textColorSecondary"
@@ -83,8 +85,8 @@
                             android:id="@+id/to"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:singleLine="false"
-                            android:ellipsize="none"
+                            android:maxLines="2"
+                            android:ellipsize="end"
                             android:textSize="10sp"
                             android:textColor="?android:attr/textColorSecondary"
                             android:textAppearance="?android:attr/textAppearanceSmall"/>
@@ -112,8 +114,8 @@
                             android:id="@+id/cc"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:singleLine="false"
-                            android:ellipsize="none"
+                            android:maxLines="2"
+                            android:ellipsize="end"
                             android:textSize="10sp"
                             android:textColor="?android:attr/textColorSecondary"
                             android:textAppearance="?android:attr/textAppearanceSmall"/>