diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index f7e716df..c9ceadce 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -850,7 +850,7 @@ MessageComposer.prototype.setValue = function (text) {
 }
 
 MessageComposer.prototype.getRichHtml = function (text) {
-  return $('<div>').text(text).html().replace(/:([A-Za-z0-9\-\+\*_]+?):/gi, (function (all, shortcut) {
+  return $('<div>').text(text).html().replace(/\n/g, '<br/>').replace(/:([A-Za-z0-9\-\+\*_]+?):/gi, (function (all, shortcut) {
     var code = EmojiHelper.shortcuts[shortcut];
     if (code !== undefined) {
       return this.getEmojiHtml(code);