diff --git a/public/javascripts/chat.js b/public/javascripts/chat.js
index 6e59864..90488cb 100644
--- a/public/javascripts/chat.js
+++ b/public/javascripts/chat.js
@@ -99,6 +99,7 @@ jQuery(function($) {
      },
 
      render_body_message: function(body) {
+        body = body.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r?\n/g, '<br>');
         body = $().emoticon(body);
         body = linkify(body, {
            callback: function(text, href) {
--
libgit2 0.21.2