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 d143345064..13b3a11899 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -454,6 +454,10 @@ 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));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c1bc9e2d0..8265a5718a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1370,6 +1370,9 @@
     <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">To help prevent spam on Signal, please complete verification.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">After verifying, you can continue messaging. Any paused messages will automatically be sent.</string>
 
+    <!-- Recipient -->
+    <string name="Recipient_you">You</string>
+
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Block</string>
     <string name="RecipientPreferenceActivity_unblock">Unblock</string>