diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 151c811d6..68628b1cf 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -446,5 +446,9 @@
           "example": "1w"
         }
       }
+    },
+    "you": {
+      "message": "You",
+      "description": "A gender-neutral second-person prounoun used as a subject, as in, 'You set the timer to 5 seconds'"
     }
 }
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 5e430fd47..e9299bb2d 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -53,11 +53,13 @@
         },
         render_attributes: function() {
             var seconds = this.model.get('expirationTimerUpdate').expireTimer;
+            var name = this.conversation.getTitle();
+            if (this.conversation.id === textsecure.storage.user.getNumber()) {
+                name = i18n('you');
+            }
             return {
-              content: i18n('changedTheTimer', [
-                         this.conversation.getTitle(),
-                         Whisper.ExpirationTimerOptions.getName(seconds)
-              ])
+              content: i18n('changedTheTimer', [name,
+                         Whisper.ExpirationTimerOptions.getName(seconds)])
             };
         }
     });