diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 7d5f171c..29c261e2 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -1022,7 +1022,7 @@ function formatChatMessage(data) {
         var time = $("<span/>").addClass("timestamp").appendTo(div);
         var timestamp = new Date(data.time).toTimeString().split(" ")[0];
         time.text("["+timestamp+"] ");
-        if(data.msgclass != "greentext" && data.msgclass != "drink")
+        if(data.msgclass == "shout" || data.msgclass == "server-whisper")
             time.addClass(data.msgclass);
     }
     var name = $("<span/>");