diff --git a/modules/chat/client/controllers/chat.client.controller.js b/modules/chat/client/controllers/chat.client.controller.js
index 00699365..52c86043 100644
--- a/modules/chat/client/controllers/chat.client.controller.js
+++ b/modules/chat/client/controllers/chat.client.controller.js
@@ -224,10 +224,16 @@
      * @param evt
      */
     vm.onInputKeyDown = function (evt) {
-      if (evt.keyCode === 13 && vm.messageText) {
-        vm.sendMessage();
-        //evt.stopPropagation();
-        evt.preventDefault();
+      if (evt.keyCode === 13) {
+        if (evt.shiftKey) {
+          return;
+        } else {
+          if (vm.messageText) {
+            vm.sendMessage();
+            //evt.stopPropagation();
+            evt.preventDefault();
+          }
+        }
       }
     };
 
@@ -318,6 +324,8 @@
     vm.getMessageText = function (msg) {
       var newmsg = msg.text;
 
+      newmsg = newmsg.replace(/(?:\r\n|\r|\n)/g, '<br />');
+
       var matches = newmsg.match(/\[@(.*?)\]/g);
       angular.forEach(matches, function (m) {
         var atu = m.substr(1, m.length - 2);
@@ -326,7 +334,7 @@
       });
 
       if (msg.fontColor) {
-        newmsg = '<font color="' + msg.fontColor + '">' + newmsg + '</font>';
+        newmsg = '<font color="' + msg.fontColor + '">' + (newmsg || '&nbsp;') + '</font>';
       }
 
       return newmsg || '&nbsp;';
diff --git a/modules/core/client/directives/mt-scale.client.directive.js b/modules/core/client/directives/mt-scale.client.directive.js
index 1da3faaa..b41ac13c 100644
--- a/modules/core/client/directives/mt-scale.client.directive.js
+++ b/modules/core/client/directives/mt-scale.client.directive.js
@@ -17,10 +17,7 @@
 
         var mtScale = JSON.parse(JSON.stringify(eval('(' + attrs.mtScale + ')')));
 
-        console.log(mtScale);
-
         element.css('transition-property', 'transform, opacity');
-        console.log('mtScale.duration=' + mtScale.duration);
         element.css('transition-duration', mtScale.duration || '.5s');
         element.css('transition-timing-function', mtScale.function || 'ease');