diff --git a/js/views/message_view.js b/js/views/message_view.js
index 50361dff9f..6dd9e58361 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -39,6 +39,8 @@
                 if (this.model.isIncoming()) {
                     this.$('.content').text(this.model.getDescription()).addClass('error-message');
                 }
+            } else {
+                this.$el.removeClass('error');
             }
         },
         renderControl: function() {