diff --git a/yii/swiftmailer/Mailer.php b/yii/swiftmailer/Mailer.php
index 1d5bc5c..f53001b 100644
--- a/yii/swiftmailer/Mailer.php
+++ b/yii/swiftmailer/Mailer.php
@@ -19,7 +19,7 @@ use yii\mail\BaseMailer;
  * 'components' => array(
  *     ...
  *     'email' => array(
- *         'class' => 'yii\email\swift\Mailer',
+ *         'class' => 'yii\swiftmailer\Mailer',
  *         'transport' => [
  *             'class' => 'Swift_SmtpTransport',
  *             'host' => 'localhost',
@@ -35,12 +35,18 @@ use yii\mail\BaseMailer;
  *
  * @see http://swiftmailer.org
  *
+ * @method Message createMessage(array $config = []) creates new message instance from given configuration.
+ *
  * @author Paul Klimov <klimov.paul@gmail.com>
  * @since 2.0
  */
 class Mailer extends BaseMailer
 {
 	/**
+	 * @var string message default class name.
+	 */
+	public $messageClass = 'yii\swiftmailer\Message';
+	/**
 	 * @var \Swift_Mailer Swift mailer instance.
 	 */
 	private $_swiftMailer;
@@ -131,13 +137,4 @@ class Mailer extends BaseMailer
 		}
 		return $transport;
 	}
-
-	/**
-	 * Creates the Swift email message instance.
-	 * @return \Swift_Message email message instance.
-	 */
-	public function createSwiftMessage()
-	{
-		return new \Swift_Message();
-	}
 }
\ No newline at end of file
diff --git a/yii/swiftmailer/Message.php b/yii/swiftmailer/Message.php
index bfefcde..7fc908b 100644
--- a/yii/swiftmailer/Message.php
+++ b/yii/swiftmailer/Message.php
@@ -34,7 +34,7 @@ class Message extends BaseMessage
 	public function getSwiftMessage()
 	{
 		if (!is_object($this->_swiftMessage)) {
-			$this->_swiftMessage = $this->getMailer()->createSwiftMessage();
+			$this->_swiftMessage = $this->createSwiftMessage();
 		}
 		return $this->_swiftMessage;
 	}
@@ -171,4 +171,13 @@ class Message extends BaseMessage
 	{
 		return $this->getSwiftMessage()->toString();
 	}
+
+	/**
+	 * Creates the Swift email message instance.
+	 * @return \Swift_Message email message instance.
+	 */
+	protected function createSwiftMessage()
+	{
+		return new \Swift_Message();
+	}
 }
\ No newline at end of file