diff --git a/client/client.js b/client/client.js
index a77c888..cc64fcd 100644
--- a/client/client.js
+++ b/client/client.js
@@ -85,6 +85,14 @@ var COMMANDS = {
 		else if (myNick == args.nick) {
 			cls = 'me'
 		}
+		else if (myNick != args.nick)
+		{
+			var re = new RegExp(myNick)
+			if(re.test(args.text))
+			{
+				args.text = args.text.replace(myNick, "$\\red{" + myNick + "}$")
+			}
+		}
 		pushMessage(args.nick, args.text, args.time, cls)
 	},
 	info: function(args) {
@@ -365,3 +373,4 @@ if (localStorage) {
 }
 
 $('#scheme-selector').value = currentScheme
+