diff --git a/app/src/main/res/layout/conversation_settings_toolbar.xml b/app/src/main/res/layout/conversation_settings_toolbar.xml
index 1f9f77dedd..aadfa9e157 100644
--- a/app/src/main/res/layout/conversation_settings_toolbar.xml
+++ b/app/src/main/res/layout/conversation_settings_toolbar.xml
@@ -18,7 +18,8 @@
     <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="wrap_content"
+        android:minHeight="56dp"
         android:theme="?attr/settingsToolbarStyle"
         app:contentInsetStartWithNavigation="60dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -40,7 +41,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:alpha="0"
+            android:ellipsize="end"
             android:gravity="center_vertical"
+            android:maxLines="1"
             android:textAppearance="@style/Signal.Text.Title"
             android:translationY="56dp"
             tools:text="Miles Morales" />
diff --git a/app/src/main/res/layout/group_recipient_list_item.xml b/app/src/main/res/layout/group_recipient_list_item.xml
index 4c3780cfa0..e2675ff642 100644
--- a/app/src/main/res/layout/group_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_recipient_list_item.xml
@@ -34,7 +34,7 @@
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/recipient_name"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:gravity="start|center_vertical"
@@ -51,7 +51,7 @@
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/recipient_about"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
@@ -71,7 +71,7 @@
     <TextView
         android:id="@+id/admin"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:gravity="start|center_vertical"
         android:text="@string/GroupRecipientListItem_admin"