diff --git a/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs b/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs
index d12e7c1e1..3231bb930 100644
--- a/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs
+++ b/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs
@@ -2485,6 +2485,20 @@ private void _OnChannelMessage(object sender, IrcEventArgs e)
 
             var msg = builder.ToMessage();
             MarkHighlights(msg);
+			
+			//channel highlight: (if "/#channelname/" is among the highlight words, notify all messages in a specific channel)
+			//it doesn't color the messages, just sets all of them as highlighted (so you are notified)
+			if (ContainsHighlight(e.Data.Channel)) { 
+				//set the message as highlight:
+	            foreach (MessagePartModel msgPart in msg.MessageParts) {
+	                if (!(msgPart is TextMessagePartModel)) {
+	                    continue;
+	                }
+	                TextMessagePartModel textMsg = (TextMessagePartModel) msgPart;
+	                textMsg.IsHighlight = true;
+	            }
+			}	
+			
             Session.AddMessageToChat(chat, msg);
         }