diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 91685ae3a..39c98f42f 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -51,7 +51,7 @@
                   android:layout_toStartOf="@+id/thumbnail"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:textColor="?attr/conversation_list_item_contact_color"
-                  android:singleLine="true"
+                  android:maxLines="1"
                   tools:text="Jules Bonnot"
                   android:ellipsize="end"
                   android:layout_marginBottom="2dp"
@@ -84,7 +84,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
                 android:fontFamily="sans-serif-light"
-                android:singleLine="true"
+                android:maxLines="1"
                 tools:text="Wheels arrive at 3pm flat. This is a somewhat longer message."
                 android:ellipsize="end" />
 
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index 6e474a4e8..3f1d6bb86 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -50,7 +50,7 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:ellipsize="end"
                 android:textSize="18dp"
                 android:transitionName="recipient_name"
@@ -80,7 +80,7 @@
                 android:id="@+id/subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:ellipsize="end"
                 android:layout_gravity="center_vertical|start"
                 android:gravity="center_vertical"
diff --git a/res/layout/recipient_filter_item.xml b/res/layout/recipient_filter_item.xml
index 4891ba185..4f5f49cd9 100644
--- a/res/layout/recipient_filter_item.xml
+++ b/res/layout/recipient_filter_item.xml
@@ -35,7 +35,7 @@
             style="?android:attr/dropDownItemStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:singleLine="true"
+            android:maxLines="1"
         />
 
         <TextView android:id="@+id/label"