diff --git a/lib/server.js b/lib/server.js
index a0958090..03d07536 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -355,8 +355,8 @@ function event(e, data) {
 		var type = "";
 		var text = data.message;
 		var network = this;
-		text.split(" ").forEach(function(w) {
-			if (w == network.client.me) type = "highlight";
+		text.split(/ |'|:/).forEach(function(w) {
+			if (w.indexOf(network.client.me) == 0) type = "highlight";
 		});
 		var msg = new Msg({
 			type: type,