diff --git a/themes/chatview/psi/new_classic/index.html b/themes/chatview/psi/new_classic/index.html
index 9d719b9ee..c1f5475c1 100644
--- a/themes/chatview/psi/new_classic/index.html
+++ b/themes/chatview/psi/new_classic/index.html
@@ -28,13 +28,13 @@
     float: right;
 }
 
-.msg { padding-left:3.2em; border-top: 1px solid #ddd; }
+.msg { padding-left:3.2em; }
 .grmsg {  }
 .usertext { }
 .alert {font-weight:bold; color:red;}
 
 .avmsg {
-
+    border-top: 1px dotted #ddd;
 }
 
 img.avatar {
@@ -136,13 +136,9 @@
         templates : {
             message: "<div class='msg avmsg'%receiptid%><img class='avatar' src='%avatarurl%' title='%sender%'/><div class='ntcont'>" + (
                 shared.isMuc? "<span style='color:%nickcolor%'>%sender%</span>" : "<span class='%sentrec%'>%sender%</span>") +
-                "<span class='msgtime'>%time%</span></div>%message%</div>%next%",
-            messageGroupping: "<div class='msg grmsg'%receiptid%><span class='msgtime'>%time%</span> %message%</div>%next%",
-
+                "<span class='msgtime'>%time%</span></div>%alertedmessage%</div>%next%",
+            messageGroupping: "<div class='msg grmsg'%receiptid%><span class='msgtime'>%time%</span>%alertedmessage%</div>%next%",
             messageNC: "<div class='msg %sentrec%'%receiptid%><span class='msgtime'>%time%</span>%icon% %sender% %message%</div>",
-
-            //spooledMessage: "<div class='msg infmsg'><span class='msgtime'>%time%</span>%icon% %sender% %message%</div>",
-
             sys: "<div class='msg infmsg'>%icon%%message%</div>",
             sysMessage: "<div class='msg infmsg'><span class='msgtime'>%time%</span><div id='info'>%icon% %message%</div></div>",
             sysMessageUT: "<div class='msg infmsg'><span class='msgtime'>%time%</span><div id='info'>%icon% %message%:</div> <div class='usertext'>%usertext%</div></div>",
@@ -155,8 +151,8 @@
         dateFormat : "HH:mm",
         proxy : function() { //optional
             if (shared.cdata.mtype == "message") {
-                return shared.cdata.emote && shared.templates.messageNC ||
-                    (shared.cdata.spooled && shared.templates.message || null);
+                return shared.cdata.emote && shared.templates.messageNC || null;
+                    //(shared.cdata.spooled && shared.templates.message || null);
             }
             if (shared.cdata.type == "settings") {
                 applyPsiSettings();
diff --git a/themes/chatview/util.js b/themes/chatview/util.js
index c99ab3919..c3af7d8ca 100644
--- a/themes/chatview/util.js
+++ b/themes/chatview/util.js
@@ -455,7 +455,7 @@ function initPsiTheme() {
 
             nickColor : function(nick) {
                 var u = usersMap[nick];
-                return u && u.nickcolor;
+                return u && u.nickcolor || "#888";
             },
 
             replaceableMessage : function(isMuc, isLocal, nick, msgId, text) {
diff --git a/version b/version
index 972ddabfd..bad115f92 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.1875 (2024-05-12, ecbf5d30)
+1.5.1876 (2024-05-12, fd790c6f)