diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 6a85f016e..280fd7aab 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -45,7 +45,27 @@
     },
     "youMarkedAsNotVerified": {
       "message": "You marked $name$ as not verified.",
-      "description": "Shown in the conversation history when the user marks a contact as verified, whether on the safety number screen or by dismissing a banner or dialog.",
+      "description": "Shown in the conversation history when the user marks a contact as not verified, whether on the safety number screen or by dismissing a banner or dialog.",
+      "placeholders": {
+        "name": {
+          "content": "$1",
+          "example": "Bob"
+        }
+      }
+    },
+    "youMarkedAsVerifiedOtherDevice": {
+      "message": "You marked $name$ as verified on another device.",
+      "description": "Shown in the conversation history when we discover that the user marked a contact as verified on another device.",
+      "placeholders": {
+        "name": {
+          "content": "$1",
+          "example": "Bob"
+        }
+      }
+    },
+    "youMarkedAsNotVerifiedOtherDevice": {
+      "message": "You marked $name$ as not verified on anther device.",
+      "description": "Shown in the conversation history when we discover that the user marked a contact as not verified on another device.",
       "placeholders": {
         "name": {
           "content": "$1",
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 2135b36e9..c5532b768 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -101,7 +101,7 @@
         return promise.then(function() {
             return this.save({verified: DEFAULT});
         }.bind(this)).then(function() {
-            this.addVerifiedChange(this.id, false);
+            this.addVerifiedChange(this.id, false, {local: !options.viaSyncMessage});
             if (!options.viaSyncMessage) {
                 this.sendVerifySyncMessage(this.id, DEFAULT);
             }
@@ -134,7 +134,7 @@
         return promise.then(function() {
             return this.save({verified: VERIFIED});
         }.bind(this)).then(function() {
-            this.addVerifiedChange(this.id, true);
+            this.addVerifiedChange(this.id, true, {local: !options.viaSyncMessage});
             if (!options.viaSyncMessage) {
                 this.sendVerifySyncMessage(this.id, VERIFIED);
             }
@@ -270,7 +270,10 @@
         });
         message.save().then(this.trigger.bind(this,'newmessage', message));
     },
-    addVerifiedChange: function(id, verified) {
+    addVerifiedChange: function(id, verified, options) {
+        options = options || {};
+        _.defaults(options, {local: true});
+
         console.log('adding verified change advisory for', this.id, id, this.get('timestamp'));
         var timestamp = Date.now();
         var message = new Whisper.Message({
@@ -280,7 +283,8 @@
             sent_at         : this.get('timestamp'),
             received_at     : timestamp,
             verifiedChanged : id,
-            verified        : verified
+            verified        : verified,
+            local           : options.local
         });
         message.save().then(this.trigger.bind(this,'newmessage', message));
 
diff --git a/js/views/message_view.js b/js/views/message_view.js
index ab61974c0..14b0c9446 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -113,16 +113,29 @@
             'click .content': 'showIdentity'
         },
         render_attributes: function() {
+            var key;
+
             if (this.model.get('verified')) {
+                if (this.model.get('local')) {
+                    key = 'youMarkedAsVerified';
+                } else {
+                    key = 'youMarkedAsVerifiedOtherDevice';
+                }
                 return {
                     icon: 'verified',
-                    content: i18n('youMarkedAsVerified', this.conversation.getTitle())
+                    content: i18n(key, this.conversation.getTitle())
                 };
             }
 
+            if (this.model.get('local')) {
+                key = 'youMarkedAsNotVerified';
+            } else {
+                key = 'youMarkedAsNotVerifiedOtherDevice';
+            }
+
             return {
                 icon: 'shield',
-                content: i18n('youMarkedAsNotVerified', this.conversation.getTitle())
+                content: i18n(key, this.conversation.getTitle())
             };
         },
         showIdentity: function() {