diff --git a/file/lib/data/chat/message/ChatMessage.class.php b/file/lib/data/chat/message/ChatMessage.class.php
index 50f7283..d067b0b 100755
--- a/file/lib/data/chat/message/ChatMessage.class.php
+++ b/file/lib/data/chat/message/ChatMessage.class.php
@@ -54,12 +54,8 @@ public function getFormattedMessage($outputType = 'text/html') {
 			case self::TYPE_JOIN:
 			case self::TYPE_LEAVE:
 			case self::TYPE_BACK:
-				$message = WCF::getLanguage()->get('wcf.chat.message.'.$this->type);
-			break;
 			case self::TYPE_AWAY:
-				WCF::getTPL()->assign(array(
-					'message' => $message
-				));
+				WCF::getTPL()->assign(@unserialize($message));
 				$message = WCF::getLanguage()->getDynamicVariable('wcf.chat.message.'.$this->type);
 			break;
 			case self::TYPE_NORMAL:
diff --git a/file/lib/system/chat/command/commands/Away.class.php b/file/lib/system/chat/command/commands/Away.class.php
index ee31356..229990b 100644
--- a/file/lib/system/chat/command/commands/Away.class.php
+++ b/file/lib/system/chat/command/commands/Away.class.php
@@ -30,7 +30,7 @@ public function getType() {
 	 * @see	\wcf\system\chat\command\ICommand::getMessage()
 	 */
 	public function getMessage() {
-		return $this->commandHandler->getParameters();
+		return serialize(array('message' => $this->commandHandler->getParameters()));
 	}
 	
 	/**