diff --git a/file/lib/data/chat/message/ChatMessage.class.php b/file/lib/data/chat/message/ChatMessage.class.php
index 3e9ee04..c4b3899 100755
--- a/file/lib/data/chat/message/ChatMessage.class.php
+++ b/file/lib/data/chat/message/ChatMessage.class.php
@@ -56,6 +56,11 @@ public function getFormattedMessage() {
 			case self::TYPE_LEAVE:
 			case self::TYPE_BACK:
 				$message = WCF::getLanguage()->get('wcf.chat.message.'.$this->type);
+			break;
+			case self::TYPE_NORMAL:
+				if (!$this->enableHTML) {
+					$message = \wcf\system\bbcode\SimpleMessageParser::getInstance()->parse($message, $this->enableSmilies);
+				}
 		}
 		return $message;
 	}