diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index d2df675416..14602a1129 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -21,7 +21,6 @@
                       android:layout_gravity="center_vertical"
                       android:gravity="center_vertical"
                       android:textCursorDrawable="@null"
-                      android:textSize="18sp"
                       android:fontFamily="sans-serif"/>
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index b4abaf761d..f60b8fc24c 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -1,51 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.conversation.ConversationTitleView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/conversation_title_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical">
+<org.thoughtcrime.securesms.conversation.ConversationTitleView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/conversation_title_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="center_vertical"
+    tools:background="#007fff">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo_image"
-            android:foreground="@drawable/contact_photo_background"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="10dp"
-            android:cropToPadding="true"
-            android:transitionName="contact_photo"
-            android:clickable="true"
-            app:inverted="true"
-            tools:src="@drawable/ic_contact_picture"
-            android:contentDescription="@string/conversation_list_item_view__contact_photo_image"/>
+        android:id="@+id/contact_photo_image"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="10dp"
+        android:clickable="true"
+        android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
+        android:cropToPadding="true"
+        android:foreground="@drawable/contact_photo_background"
+        android:transitionName="contact_photo"
+        app:inverted="true"
+        tools:src="@drawable/ic_contact_picture" />
 
     <LinearLayout
         android:id="@+id/content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_centerVertical="true"
         android:layout_toEndOf="@id/contact_photo_image"
-        android:layout_centerVertical="true">
+        android:orientation="vertical">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/title"
+            style="@style/TextSecure.TitleTextStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textSize="18dp"
-            android:transitionName="recipient_name"
-            android:drawablePadding="5dp"
-            android:gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            style="@style/TextSecure.TitleTextStyle"
-            tools:text="Contact name"
-            tools:ignore="UnusedAttribute"/>
+            android:drawablePadding="5dp"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:transitionName="recipient_name"
+            tools:ignore="UnusedAttribute"
+            tools:text="Contact name" />
 
         <LinearLayout
             android:id="@+id/subtitle_container"
@@ -55,26 +54,39 @@
 
             <ImageView
                 android:id="@+id/verified_indicator"
-                android:src="@drawable/ic_check_circle_white_18dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="3dp"
                 android:layout_gravity="bottom"
+                android:layout_marginEnd="3dp"
                 android:alpha="0.7"
-                android:visibility="gone"/>
+                android:src="@drawable/ic_check_circle_white_18dp"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/verified_subtitle"
+                style="@style/TextSecure.SubtitleTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:layout_marginEnd="3dp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:text="@string/ConversationTitleView_verified"
+                android:textDirection="ltr" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/subtitle"
+                style="@style/TextSecure.SubtitleTextStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
                 android:layout_gravity="center_vertical|start"
+                android:ellipsize="end"
                 android:gravity="center_vertical"
+                android:maxLines="1"
                 android:textDirection="ltr"
-                android:textSize="13dp"
-                tools:text="(123) 123-1234"
-                style="@style/TextSecure.SubtitleTextStyle"/>
+                tools:text="(123) 123-1234" />
 
         </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 931410a934..4f69236b8e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -266,6 +266,9 @@
     <!-- ConversationListItemAction -->
     <string name="ConversationListItemAction_archived_conversations_d">Archived conversations (%d)</string>
 
+    <!-- ConversationTitleView -->
+    <string name="ConversationTitleView_verified">Verified</string>
+
     <!-- CreateProfileActivity -->
     <string name="CreateProfileActivity_your_profile_info">Your profile info</string>
     <string name="CreateProfileActivity_error_setting_profile_photo">Error setting profile photo</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 57adeda4c1..f03e2577a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -91,10 +91,12 @@
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/white</item>
         <item name="android:textColorHint">#BFffffff</item>
+        <item name="android:textSize">18sp</item>
     </style>
 
     <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
         <item name="android:textColor">#BFffffff</item>
+        <item name="android:textSize">13sp</item>
     </style>
 
     <style name="Registration.Description" parent="@android:style/TextAppearance">
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index f2ad87de18..cd1eaeb362 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -32,6 +32,7 @@ public class ConversationTitleView extends RelativeLayout {
   private TextView        subtitle;
   private ImageView       verified;
   private View            subtitleContainer;
+  private View            verifiedSubtitle;
 
   public ConversationTitleView(Context context) {
     this(context, null);
@@ -51,6 +52,7 @@ public class ConversationTitleView extends RelativeLayout {
     this.subtitle          = ViewUtil.findById(this, R.id.subtitle);
     this.verified          = ViewUtil.findById(this, R.id.verified_indicator);
     this.subtitleContainer = ViewUtil.findById(this, R.id.subtitle_container);
+    this.verifiedSubtitle  = ViewUtil.findById(this, R.id.verified_subtitle);
     this.avatar            = ViewUtil.findById(this, R.id.contact_photo_image);
 
     ViewUtil.setTextViewGravityStart(this.title, getContext());
@@ -58,6 +60,8 @@ public class ConversationTitleView extends RelativeLayout {
   }
 
   public void setTitle(@NonNull GlideRequests glideRequests, @Nullable Recipient recipient) {
+    this.subtitleContainer.setVisibility(View.VISIBLE);
+
     if      (recipient == null) setComposeTitle();
     else                        setRecipientTitle(recipient);
 
@@ -72,10 +76,14 @@ public class ConversationTitleView extends RelativeLayout {
     if (recipient != null) {
       this.avatar.setAvatar(glideRequests, recipient, false);
     }
+
+    updateVerifiedSubtitleVisibility();
   }
 
   public void setVerified(boolean verified) {
     this.verified.setVisibility(verified ? View.VISIBLE : View.GONE);
+
+    updateVerifiedSubtitleVisibility();
   }
 
   @Override
@@ -113,7 +121,6 @@ public class ConversationTitleView extends RelativeLayout {
                                 .collect(Collectors.joining(", ")));
 
     this.subtitle.setVisibility(View.VISIBLE);
-    this.subtitleContainer.setVisibility(VISIBLE);
   }
 
   private void setSelfTitle() {
@@ -124,7 +131,6 @@ public class ConversationTitleView extends RelativeLayout {
   @SuppressLint("SetTextI18n")
   private void setNonContactRecipientTitle(Recipient recipient) {
     this.title.setText(recipient.getAddress().serialize());
-    this.subtitleContainer.setVisibility(VISIBLE);
 
     if (TextUtils.isEmpty(recipient.getProfileName())) {
       this.subtitle.setText(null);
@@ -138,10 +144,16 @@ public class ConversationTitleView extends RelativeLayout {
   private void setContactRecipientTitle(Recipient recipient) {
     this.title.setText(recipient.getName());
 
-    if (recipient.getCustomLabel() != null) this.subtitle.setText(recipient.getCustomLabel());
-    else                                    this.subtitle.setText(recipient.getAddress().serialize());
+    if (TextUtils.isEmpty(recipient.getCustomLabel())) {
+      this.subtitle.setText(null);
+      this.subtitle.setVisibility(View.GONE);
+    } else {
+      this.subtitle.setText(recipient.getCustomLabel());
+      this.subtitle.setVisibility(View.VISIBLE);
+    }
+  }
 
-    this.subtitle.setVisibility(View.VISIBLE);
-    this.subtitleContainer.setVisibility(VISIBLE);
+  private void updateVerifiedSubtitleVisibility() {
+    verifiedSubtitle.setVisibility(subtitle.getVisibility() != VISIBLE && verified.getVisibility() == VISIBLE ? VISIBLE : GONE);
   }
 }