diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 13b3a11899..7d2a54e5fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -454,10 +454,6 @@ public class Recipient {
 
       List<String> names = new LinkedList<>();
 
-      if (participants.stream().anyMatch(Recipient::isSelf)) {
-        names.add(context.getString(R.string.Recipient_you));
-      }
-
       for (Recipient participant : others) {
         String shortName = participant.getShortDisplayName(context);
         int    count     = Objects.requireNonNull(shortNameCounts.getOrDefault(shortName, 0));
@@ -469,6 +465,10 @@ public class Recipient {
         }
       }
 
+      if (participants.stream().anyMatch(Recipient::isSelf)) {
+        names.add(context.getString(R.string.Recipient_you));
+      }
+
       return Util.join(names, ", ");
     } else {
       return this.groupName;