diff --git a/js/views/message_view.js b/js/views/message_view.js
index 31b3b468e..2310b2099 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -20,9 +20,17 @@
         tagName: 'span',
         className: 'hasRetry',
         templateName: 'hasRetry',
-        render_attributes: {
-            messageNotSent: i18n('messageNotSent'),
-            resend: i18n('resend')
+        render_attributes: function() {
+            var messageNotSent;
+
+            if (!this.model.someRecipientsFailed()) {
+                messageNotSent = i18n('messageNotSent');
+            }
+
+            return {
+                messageNotSent: messageNotSent,
+                resend: i18n('resend')
+            };
         }
     });
     var SomeFailedView = Whisper.View.extend({
@@ -248,11 +256,13 @@
             }
             this.$('.meta .hasRetry').remove();
             if (this.model.hasNetworkError()) {
-                this.$('.meta').prepend(new NetworkErrorView().render().el);
+                var networkErrorView = new NetworkErrorView({model: this.model});
+                this.$('.meta').prepend(networkErrorView.render().el);
             }
             this.$('.meta .some-failed').remove();
             if (this.model.someRecipientsFailed()) {
-                this.$('.meta').prepend(new SomeFailedView().render().el);
+                var someFailedView = new SomeFailedView();
+                this.$('.meta').prepend(someFailedView.render().el);
             }
         },
         renderControl: function() {
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 3474573c3..404995e13 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -410,13 +410,14 @@ li.entry .error-icon-container {
       float: left;
       margin-left: 6px;
       margin-right: 6px;
+      cursor: pointer;
     }
 
     .hasRetry, .timestamp, .status, .timer {
       float: left;
     }
 
-    .timestamp, .status, .some-failed {
+    .timestamp, .status {
       cursor: pointer;
       opacity: 0.5;
 
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index cc8dc584d..d2ca59992 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1336,23 +1336,22 @@ li.entry .error-icon-container {
     .message-list .meta .some-failed {
       float: left;
       margin-left: 6px;
-      margin-right: 6px; }
+      margin-right: 6px;
+      cursor: pointer; }
     .message-container .meta .hasRetry, .message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .timer,
     .message-list .meta .hasRetry,
     .message-list .meta .timestamp,
     .message-list .meta .status,
     .message-list .meta .timer {
       float: left; }
-    .message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .some-failed,
+    .message-container .meta .timestamp, .message-container .meta .status,
     .message-list .meta .timestamp,
-    .message-list .meta .status,
-    .message-list .meta .some-failed {
+    .message-list .meta .status {
       cursor: pointer;
       opacity: 0.5; }
-      .message-container .meta .timestamp:hover, .message-container .meta .status:hover, .message-container .meta .some-failed:hover,
+      .message-container .meta .timestamp:hover, .message-container .meta .status:hover,
       .message-list .meta .timestamp:hover,
-      .message-list .meta .status:hover,
-      .message-list .meta .some-failed:hover {
+      .message-list .meta .status:hover {
         opacity: 1.0; }
   .message-container .status,
   .message-list .status {