diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index d39f75612..ed8931467 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -458,5 +458,15 @@
     "safetyNumbersSettingDescription": {
       "message": "Require approval of new safety numbers when they change.",
       "description": "Description for safety numbers setting"
+    },
+    "keychanged": {
+      "message": "$name$'s safety numbers have changed",
+      "description": "",
+      "placeholders": {
+        "name": {
+          "content": "$1",
+          "example": "John"
+        }
+      }
     }
 }
diff --git a/background.html b/background.html
index a14fe3747..e386799a7 100644
--- a/background.html
+++ b/background.html
@@ -155,6 +155,9 @@
     {{ messageNotSent }}
     <span href='#' class='retry'>{{ resend }}</span>
   </script>
+  <script type='text/x-tmpl-mustache' id='keychange'>
+      <span class='content' dir='auto'>{{ content }}</span>
+  </script>
   <script type='text/x-tmpl-mustache' id='message'>
       {{> avatar }}
       <div class='bubble {{ avatar.color }}'>
diff --git a/js/models/conversations.js b/js/models/conversations.js
index f1b05cd25..58eb9d021 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -41,6 +41,25 @@
         this.on('change:avatar', this.updateAvatarUrl);
         this.on('destroy', this.revokeAvatarUrl);
         this.on('read', this.onReadMessage);
+        this.fetchContacts().then(function() {
+            this.contactCollection.each(function(contact) {
+                textsecure.storage.protocol.on('keychange:' + contact.id, function() {
+                    this.addKeyChange(contact.id);
+                }.bind(this));
+            }.bind(this));
+        }.bind(this));
+    },
+
+    addKeyChange: function(id) {
+        var now = Date.now();
+        var message = this.messageCollection.add({
+            conversationId : this.id,
+            type           : 'keychange',
+            sent_at        : now,
+            received_at    : now,
+            key_changed    : id
+        });
+        message.save();
     },
 
     onReadMessage: function(message) {
diff --git a/js/models/messages.js b/js/models/messages.js
index 0e51e4bb4..efa967fb3 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -132,6 +132,15 @@
             }
             return c;
         },
+        getModelForKeyChange: function() {
+            var id = this.get('key_changed');
+            var c = ConversationController.get(id);
+            if (!c) {
+                c = ConversationController.create({ id: id, type: 'private' });
+                c.fetch();
+            }
+            return c;
+        },
         isOutgoing: function() {
             return this.get('type') === 'outgoing';
         },
diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index c8d42616c..c5c167f73 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -261,20 +261,15 @@
                 var identityKey = new IdentityKey({id: number});
                 identityKey.fetch().always(function() {
                     var oldpublicKey = identityKey.get('publicKey');
-                    var matches = equalArrayBuffers(oldpublicKey, publicKey);
-                    var changed = !!oldpublicKey && !matches;
-                    if (changed) {
-                        console.log('Key changed for', identifier);
-                        this.trigger('keychange', identifier);
-                    }
-                    var trusted = !oldpublicKey || matches;
-                    if (trusted) {
+                    if (!oldpublicKey || equalArrayBuffers(oldpublicKey, publicKey)) {
                         resolve(true);
                     } else if (!storage.get('safety-numbers-approval', true)) {
                         this.removeIdentityKey(identifier).then(function() {
                             this.saveIdentity(identifier, publicKey).then(function() {
+                                console.log('Key changed for', identifier);
+                                this.trigger('keychange:' + identifier);
                                 resolve(true);
-                            });
+                            }.bind(this));
                         }.bind(this));
                     } else {
                         resolve(false);
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index e3dfa6856..0545c87f4 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -149,7 +149,8 @@
             'loadMore .message-list': 'fetchMessages',
             'close .menu': 'closeMenu',
             'select .message-list .entry': 'messageDetail',
-            'force-resize': 'forceUpdateMessageFieldSize'
+            'force-resize': 'forceUpdateMessageFieldSize',
+            'verify-identity': 'verifyIdentity'
         },
         enableDisappearingMessages: function() {
             if (!this.model.get('expireTimer')) {
@@ -252,10 +253,13 @@
             this.model.markRead();
         },
 
-        verifyIdentity: function() {
-            if (this.model.isPrivate()) {
+        verifyIdentity: function(ev, model) {
+            if (!model && this.model.isPrivate()) {
+                model = this.model;
+            }
+            if (model) {
                 var view = new Whisper.KeyVerificationPanelView({
-                    model: { their_number: this.model.id }
+                    model: { their_number: model.id }
                 });
                 this.listenBack(view);
             }
diff --git a/js/views/message_list_view.js b/js/views/message_list_view.js
index fdcb6f37a..703eb68c2 100644
--- a/js/views/message_list_view.js
+++ b/js/views/message_list_view.js
@@ -46,6 +46,8 @@
             var view;
             if (model.isExpirationTimerUpdate()) {
                 view = new Whisper.ExpirationTimerUpdateView({model: model}).render();
+            } else if (model.get('type') === 'keychange') {
+                view = new Whisper.KeyChangeView({model: model}).render();
             } else {
                 view = new this.itemView({model: model}).render();
                 this.listenTo(view, 'beforeChangeHeight', this.measureScrollPosition);
diff --git a/js/views/message_view.js b/js/views/message_view.js
index d1e1273c8..6e2691f78 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -67,6 +67,27 @@
         }
     });
 
+    Whisper.KeyChangeView = Whisper.View.extend({
+        tagName:   'li',
+        className: 'keychange',
+        templateName: 'keychange',
+        initialize: function() {
+            this.conversation = this.model.getModelForKeyChange();
+            this.listenTo(this.conversation, 'change', this.render);
+        },
+        events: {
+            'click .content': 'verifyIdentity'
+        },
+        render_attributes: function() {
+            return {
+              content: i18n('keychanged', this.conversation.getTitle())
+            };
+        },
+        verifyIdentity: function() {
+            this.$el.trigger('verify-identity', this.conversation);
+        }
+    });
+
     Whisper.MessageView = Whisper.View.extend({
         tagName:   'li',
         templateName: 'message',
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 92de42cf4..af521b140 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -601,3 +601,12 @@ li.entry .error-icon-container {
     }
   }
 }
+.message-list li.keychange {
+  text-align: center;
+  .content {
+    display: inline-block;
+    padding: 5px 10px;
+    background: #fff5c4;
+    border-radius: $border-radius;
+  }
+}
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 468439c8c..d2585b7f9 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1380,6 +1380,14 @@ li.entry .error-icon-container {
         background-color: #d9d9d9;
         border-color: silver; }
 
+.message-list li.keychange {
+  text-align: center; }
+  .message-list li.keychange .content {
+    display: inline-block;
+    padding: 5px 10px;
+    background: #fff5c4;
+    border-radius: 5px; }
+
 .ios #header {
   height: 64px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);