diff --git a/background.html b/background.html
index 2147cad7e8..c1fa8855e3 100644
--- a/background.html
+++ b/background.html
@@ -65,7 +65,7 @@
       {{> avatar }}
       <div class="bubble">
           <div class='attachments'></div>
-          <p class="content">{{ message }}</p>
+          <p class="content">{{& message }}</p>
           <div class='meta'>
             <span class='timestamp'>{{ timestamp }}</span>
             <span class='checkmark hide'>✓</span>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 7dcd71c066..fa0934d234 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -210,7 +210,7 @@
         updateMessageFieldSize: function (event) {
             var keyCode = event.which || event.keyCode;
 
-            if (keyCode === 13) {
+            if (keyCode === 13 && !event.altKey && !event.shiftKey) {
                 // enter pressed - submit the form now
                 event.preventDefault();
                 return this.$('.bottom-bar form').submit();
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 5c26878b37..25f6356748 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -55,11 +55,16 @@
         autoLink: function(text) {
             return text.replace(/(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi, "$1<a href='$2' target='_blank'>$2</a>");
         },
+        sanitizeMessage: function (message) {
+            var element = document.createElement('span');
+            element.innerText = message;
+            return element.innerHTML.trim().replace(/\n/g, '<br>');
+        },
         render: function() {
             var contact = this.model.getContact();
             this.$el.html(
                 Mustache.render(this.template, {
-                    message: this.model.get('body'),
+                    message: this.sanitizeMessage(this.model.get('body')),
                     timestamp: moment(this.model.get('sent_at')).fromNow(),
                     sender: (contact && contact.getTitle()) || '',
                     avatar: (contact && contact.getAvatar())