diff --git a/css/glowingbear.css b/css/glowingbear.css
index 983c98d..4a37e45 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -311,3 +311,8 @@ li.notification {
 img.embed {
   max-height: 300px;
 }
+
+.highlight {
+    color: yellow;
+    font-weight: bold;
+}
diff --git a/js/models.js b/js/models.js
index 3f88c31..5aa8f17 100644
--- a/js/models.js
+++ b/js/models.js
@@ -187,6 +187,12 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
         var content = weeChat.Protocol.rawText2Rich(message['message']);
         addClasses(content);
 
+        if (highlight) {
+            prefix.forEach(function(textEl) {
+                textEl.classes.push('highlight');
+            });
+        }
+
         var rtext = "";
         if(content[0] != undefined) {
             rtext = content[0]['text'];