diff --git a/file/lib/data/chat/message/ChatMessage.class.php b/file/lib/data/chat/message/ChatMessage.class.php
index 1af64a8..a94bdce 100755
--- a/file/lib/data/chat/message/ChatMessage.class.php
+++ b/file/lib/data/chat/message/ChatMessage.class.php
@@ -57,9 +57,12 @@ public function getFormattedMessage() {
 				$message = WCF::getLanguage()->get('wcf.chat.message.'.$this->type);
 			break;
 			case self::TYPE_NORMAL:
+			case self::TYPE_ME:
+			case self::TYPE_WHISPER:
 				if (!$this->enableHTML) {
 					$message = \wcf\system\bbcode\SimpleMessageParser::getInstance()->parse($message, true, $this->enableSmilies);
 				}
+			break;
 		}
 		return $message;
 	}
@@ -84,7 +87,7 @@ public function getFormattedUsername() {
 	 */
 	public function getUsername() {
 		if ($this->type == self::TYPE_INFORMATION) return WCF::getLanguage()->get('wcf.chat.information');
-		if ($this->type == self::ERROR) return WCF::getLanguage()->get('wcf.chat.error');
+		if ($this->type == self::TYPE_ERROR) return WCF::getLanguage()->get('wcf.chat.error');
 		
 		return $this->username;
 	}