diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 4c7872bbadf..e6351295c0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -2,9 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -12,6 +9,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
@@ -22,7 +22,6 @@
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -152,8 +151,6 @@ private void setContactRecipientTitle(Recipient recipient) {
   }
 
   private void setGroupRecipientTitle(Recipient recipient) {
-    String localNumber = TextSecurePreferences.getLocalNumber(getContext());
-
     if (FeatureFlags.profileDisplay()) {
       this.title.setText(recipient.getDisplayName(getContext()));
     } else {
@@ -161,8 +158,9 @@ private void setGroupRecipientTitle(Recipient recipient) {
     }
 
     this.subtitle.setText(Stream.of(recipient.getParticipants())
-                                .filterNot(Recipient::isLocalNumber)
-                                .map(r -> r.toShortString(getContext()))
+                                .sorted((a, b) -> Boolean.compare(a.isLocalNumber(), b.isLocalNumber()))
+                                .map(r -> r.isLocalNumber() ? getResources().getString(R.string.ConversationTitleView_you)
+                                                            : r.getDisplayName(getContext()))
                                 .collect(Collectors.joining(", ")));
 
     updateSubtitleVisibility();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 66fd596c6ae..bb8b4d4678a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,6 +353,7 @@
 
     <!-- ConversationTitleView -->
     <string name="ConversationTitleView_verified">Verified</string>
+    <string name="ConversationTitleView_you">You</string>
 
     <!-- CreateProfileActivity -->
     <string name="CreateProfileActivity__profile">Profile</string>