diff --git a/client/css/style.css b/client/css/style.css
index a1135ed6..c58eb0ee 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -635,6 +635,7 @@ button, .user {
color: #50a656;
}
#chat.no-colors .from .user,
+#chat.no-colors .text .user,
#chat.no-colors .sidebar .user {
color: #50a656 !important;
}
diff --git a/client/js/shout.templates.js b/client/js/shout.templates.js
index 47f8b66f..be093f58 100644
--- a/client/js/shout.templates.js
+++ b/client/js/shout.templates.js
@@ -125,7 +125,9 @@ templates['msg_action'] = template({"1":function(depth0,helpers,partials,data) {
if (stack1 != null) { buffer += stack1; }
buffer += "\">\n \n "
+ escapeExpression(((helpers.tz || (depth0 && depth0.tz) || helperMissing).call(depth0, (depth0 != null ? depth0.time : depth0), {"name":"tz","hash":{},"data":data})))
- + "\n \n \n \n "
+ + "\n \n \n \n "
+ escapeExpression(((helper = (helper = helpers.mode || (depth0 != null ? depth0.mode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"mode","hash":{},"data":data}) : helper)))
+ escapeExpression(((helper = (helper = helpers.from || (depth0 != null ? depth0.from : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"from","hash":{},"data":data}) : helper)))
+ "\n "
diff --git a/client/views/msg_action.tpl b/client/views/msg_action.tpl
index 78d2373e..68617600 100644
--- a/client/views/msg_action.tpl
+++ b/client/views/msg_action.tpl
@@ -4,7 +4,7 @@
- {{mode}}{{from}}
+ {{mode}}{{from}}
{{formattedAction}}
{{{parse text}}}