diff --git a/js/models/messages.js b/js/models/messages.js
index 36fc8fbdc..97e5b1054 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -59,7 +59,7 @@
                 return 'Received message with unknown identity key.';
             }
             if (this.isIncoming() && this.hasErrors()) {
-                return 'Error decrypting incoming message.';
+                return 'Error handling incoming message.';
             }
 
             return this.get('body');
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 835b90de6..50361dff9 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -34,7 +34,12 @@
         },
         renderErrors: function() {
             var errors = this.model.get('errors');
-            if (_.size(errors) > 0) { this.$el.addClass('error'); }
+            if (_.size(errors) > 0) {
+                this.$el.addClass('error');
+                if (this.model.isIncoming()) {
+                    this.$('.content').text(this.model.getDescription()).addClass('error-message');
+                }
+            }
         },
         renderControl: function() {
             if (this.model.isEndSession() || this.model.isGroupUpdate()) {
@@ -63,8 +68,8 @@
 
             this.renderSent();
             this.renderDelivered();
-            this.renderErrors();
             this.renderControl();
+            this.renderErrors();
 
             this.$('.attachments').append(
                 this.model.get('attachments').map(function(attachment) {