diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2c7d6cad36..f2389845cd 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -61,6 +61,10 @@
         }
       }
     },
+    "retryDescription": {
+      "message": "You can retry sending this message to each of the failed recipients with these buttons:",
+      "description": "Shows on the message details view when it's a message error which can be retried."
+    },
     "sendAnyway": {
       "message": "Send Anyway",
       "description": "Used on a warning dialog to specifiy "
diff --git a/background.html b/background.html
index e9df1b896c..43e3db9f20 100644
--- a/background.html
+++ b/background.html
@@ -293,6 +293,14 @@
   <script type='text/x-tmpl-mustache' id='message-detail'>
     <div class='container'>
       <div class='message-container'></div>
+      {{ #allowRetry }}
+        <div class='retries'>
+          <div>{{ retryDescription }}</div>
+          {{ #retryTargets }}
+            <button class='retry gray' data-number='{{ number }}'>{{ title }}</button>
+          {{ /retryTargets }}
+        </div>
+      {{ /allowRetry }}
       <div class='info'>
         <table>
           {{ #errors }}
diff --git a/js/models/messages.js b/js/models/messages.js
index 7a9b2cf38c..47bb0e21ab 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -199,6 +199,15 @@
                 }
                 this.save({sent: true, expirationStartTimestamp: now});
                 this.sendSyncMessage();
+
+                // var error = new Error('OutgoingIdentityKeyError');
+                // error.name = 'OutgoingIdentityKeyError';
+                // error.number = result.successfulNumbers[0];
+                // throw error;
+
+                // var error = new Error('OutgoingMessageError');
+                // error.name = 'OutgoingMessageError';
+                // throw error;
             }.bind(this)).catch(function(result) {
                 var now = Date.now();
                 this.trigger('done');
@@ -273,7 +282,8 @@
                     (e.name === 'MessageError' ||
                      e.name === 'OutgoingMessageError' ||
                      e.name === 'SendMessageNetworkError' ||
-                     e.name === 'SignedPreKeyRotationError');
+                     e.name === 'SignedPreKeyRotationError' ||
+                     e.name === 'OutgoingIdentityKeyError');
             });
             this.set({errors: errors[1]});
             return errors[0][0];
@@ -282,9 +292,9 @@
             return (e.name === 'MessageError' ||
                     e.name === 'OutgoingMessageError' ||
                     e.name === 'SendMessageNetworkError' ||
-                    e.name === 'SignedPreKeyRotationError');
+                    e.name === 'SignedPreKeyRotationError' ||
+                    e.name === 'OutgoingIdentityKeyError');
         },
-
         resend: function(number) {
             var error = this.removeOutgoingErrors(number);
             if (error) {
@@ -292,7 +302,6 @@
                 this.send(promise);
             }
         },
-
         handleDataMessage: function(dataMessage) {
             // This function can be called from the background script on an
             // incoming message or from the frontend after the user accepts an
diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js
index d4413bd44b..b9de420da2 100644
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@@ -10,8 +10,7 @@
         templateName: 'contact-detail',
         initialize: function(options) {
             this.errors = _.reject(options.errors, function(e) {
-                return (e.name === 'IncomingIdentityKeyError' ||
-                        e.name === 'OutgoingIdentityKeyError' ||
+                return (e.name === 'OutgoingIdentityKeyError' ||
                         e.name === 'OutgoingMessageError' ||
                         e.name === 'SendMessageNetworkError');
             });
@@ -36,6 +35,33 @@
 
             this.listenTo(this.model, 'change', this.render);
         },
+        events: {
+            'click button.retry': 'onRetry'
+        },
+        onRetry: function(e) {
+            var number = _.find(e.target.attributes, function(attribute) {
+                return attribute.name === 'data-number';
+            });
+            if (number) {
+                this.model.resend(number.value);
+            }
+        },
+        getContact: function(number) {
+            var c = ConversationController.get(number);
+            return {
+                number: number,
+                title: c ? c.getTitle() : number
+            };
+        },
+        buildRetryTargetList: function() {
+            var targets = _.filter(this.model.get('errors'), function(e) {
+                return e.number && e.name === 'OutgoingIdentityKeyError';
+            });
+
+            return _.map(targets, function(e) {
+                return this.getContact(e.number);
+            }.bind(this));
+        },
         contacts: function() {
             if (this.model.isIncoming()) {
                 var number = this.model.get('source');
@@ -45,35 +71,36 @@
             }
         },
         renderContact: function(contact) {
+            var grouped = _.groupBy(this.model.get('errors'), 'number');
+
             var view = new ContactView({
                 model: contact,
-                errors: this.errors[contact.id]
+                errors: grouped[contact.id]
             }).render();
             this.$('.contacts').append(view.el);
         },
         render: function() {
-            this.errors = _.groupBy(this.model.get('errors'), 'number');
-            var unknownErrors = this.errors['undefined'];
-            if (unknownErrors) {
-                unknownErrors = unknownErrors.filter(function(e) {
-                    return (e.name !== 'MessageError');
-                });
-            }
+            var retryTargets = this.buildRetryTargetList();
+            var allowRetry = retryTargets.length > 0;
+
             this.$el.html(Mustache.render(_.result(this, 'template', ''), {
-                sent_at     : moment(this.model.get('sent_at')).format('LLLL'),
-                received_at : this.model.isIncoming() ? moment(this.model.get('received_at')).format('LLLL') : null,
-                tofrom      : this.model.isIncoming() ? i18n('from') : i18n('to'),
-                errors      : unknownErrors,
-                title       : i18n('messageDetail'),
-                sent        : i18n('sent'),
-                received    : i18n('received'),
-                errorLabel  : i18n('error')
+                sent_at         : moment(this.model.get('sent_at')).format('LLLL'),
+                received_at     : this.model.isIncoming() ? moment(this.model.get('received_at')).format('LLLL') : null,
+                tofrom          : this.model.isIncoming() ? i18n('from') : i18n('to'),
+                errors          : this.model.get('errors'),
+                allowRetry      : allowRetry,
+                retryTargets    : retryTargets,
+                title           : i18n('messageDetail'),
+                sent            : i18n('sent'),
+                received        : i18n('received'),
+                errorLabel      : i18n('error'),
+                retryDescription: i18n('retryDescription')
             }));
             this.view.$el.prependTo(this.$('.message-container'));
 
             if (this.model.isOutgoing()) {
                 this.conversation.contactCollection.reject(function(c) {
-                    return c.id === textsecure.storage.user.getNumber();
+                    return c.isMe();
                 }).forEach(this.renderContact.bind(this));
             } else {
                 this.renderContact(
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 923f6e3582..c3048d4b98 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -159,6 +159,13 @@
     }
   }
 
+  .retries {
+    padding: 1em;
+  }
+  button.retry {
+    margin: 0.5em;
+  }
+
   .contacts .contact-detail {
     padding: 0 36px;
     margin-bottom: 5px;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index e0c99f9e3e..8cc3c3bd4e 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1125,6 +1125,10 @@ input.search {
       font-weight: bold; }
       .message-detail .info button span {
         vertical-align: middle; }
+  .message-detail .retries {
+    padding: 1em; }
+  .message-detail button.retry {
+    margin: 0.5em; }
   .message-detail .contacts .contact-detail {
     padding: 0 36px;
     margin-bottom: 5px; }