diff --git a/file/lib/data/chat/message/ChatMessageAction.class.php b/file/lib/data/chat/message/ChatMessageAction.class.php
new file mode 100644
index 0000000..2423d31
--- /dev/null
+++ b/file/lib/data/chat/message/ChatMessageAction.class.php
@@ -0,0 +1,18 @@
+<?php
+namespace wcf\data\chat\message;
+
+/**
+ * Executes message related actions.
+ *
+ * @author 	Tim Düsterhus
+ * @copyright	2010-2011 Tim Düsterhus
+ * @license	Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
+ * @package	timwolla.wcf.chat
+ * @subpackage	data.chat.message
+ */
+class ChatMessageAction extends \wcf\data\AbstractDatabaseObjectAction {
+	/**
+	 * @see wcf\data\AbstractDatabaseObjectAction::$className
+	 */
+	protected $className = '\wcf\data\chat\message\ChatMessageEditor';
+}
diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php
index 33eccd3..730d6da 100644
--- a/file/lib/page/ChatPage.class.php
+++ b/file/lib/page/ChatPage.class.php
@@ -19,7 +19,6 @@ class ChatPage extends AbstractPage {
 	public $chatVersion = '';
 	public $neededModules = array('CHAT_ACTIVE');
 	//public $neededPermissions = array('user.chat.canEnter');
-	public $joinMessage = null;
 	public $newestMessages = array();
 	public $room = null;
 	public $roomID = 0;
@@ -35,7 +34,6 @@ public function assignVariables() {
 		
 		WCF::getTPL()->assign(array(
 			'chatVersion' => $this->chatVersion,
-			'joinMessage' => $this->joinMessage,
 			'newestMessages' => $this->newestMessages,
 			'room' => $this->room,
 			'roomID' => $this->roomID,
@@ -70,16 +68,19 @@ public function readData() {
 		$this->readRoom();
 		$this->readUserData();
 		if (CHAT_DISPLAY_JOIN_LEAVE) {
-			$this->joinMessage = chat\message\ChatMessageEditor::create(array(
-				'roomID' => $this->room->roomID,
-				'sender' => WCF::getUser()->userID,
-				'username' => WCF::getUser()->username,
-				'time' => TIME_NOW,
-				'type' => chat\message\ChatMessage::TYPE_JOIN,
-				'message' => '',
-				'color1' => $this->userData['color'][1],
-				'color2' => $this->userData['color'][2]
+			$messageAction = new chat\message\ChatMessageAction(array(), 'create', array(
+				'data' => array(
+					'roomID' => $this->room->roomID,
+					'sender' => WCF::getUser()->userID,
+					'username' => WCF::getUser()->username,
+					'time' => TIME_NOW,
+					'type' => chat\message\ChatMessage::TYPE_JOIN,
+					'message' => '',
+					'color1' => $this->userData['color'][1],
+					'color2' => $this->userData['color'][2]
+				)
 			));
+			$messageAction->executeAction();
 		}
 		
 		$this->readDefaultSmileys();