1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatMessageParser.cpp b/Swift/Controllers/Chat/ChatMessageParser.cpp
index fe61724..666ec2f 100644
--- a/Swift/Controllers/Chat/ChatMessageParser.cpp
+++ b/Swift/Controllers/Chat/ChatMessageParser.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Chat/ChatMessageParser.h>
 
@@ -145,12 +145,14 @@ namespace Swift {
 		for (size_t i = 0; i < highlightRules_->getSize(); ++i) {
 			const HighlightRule& rule = highlightRules_->getRule(i);
 			if (rule.getMatchMUC() && !mucMode_) {
 				continue; /* this rule only applies to MUC's, and this is a CHAT */
 			} else if (rule.getMatchChat() && mucMode_) {
 				continue; /* this rule only applies to CHAT's, and this is a MUC */
+			} else if (rule.getAction().getTextBackground().empty() && rule.getAction().getTextColor().empty()) {
+				continue; /* do not try to highlight text, if no highlight color is specified */
 			}
 			const std::vector<boost::regex> keywordRegex = rule.getKeywordRegex(nick);
 			foreach(const boost::regex& regex, keywordRegex) {
 				ChatWindow::ChatMessage newMessage;
 				foreach (boost::shared_ptr<ChatWindow::ChatMessagePart> part, parsedMessage.getParts()) {
 					boost::shared_ptr<ChatWindow::ChatTextMessagePart> textPart;