diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 5191e05d77..b1bd55b20a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -140,7 +140,7 @@ class ConversationView : LinearLayout {
         val body = getDisplayBody(context)
 
         when {
-            recipient.isLocalNumber -> body // Note to self
+            recipient.isLocalNumber || lastMessage?.isControlMessage == true -> body // Note to self
             lastMessage?.isOutgoing == true -> {
                 TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
             }