Index: t3lib/mail/class.t3lib_mail_mailer.php
===================================================================
--- t3lib/mail/class.t3lib_mail_mailer.php	(Revision 9677)
+++ t3lib/mail/class.t3lib_mail_mailer.php	(Arbeitskopie)
@@ -41,7 +41,7 @@
  * @package TYPO3
  * @subpackage t3lib
  */
-class t3lib_mail_mailer extends Swift_Mailer {
+class t3lib_mail_Mailer extends Swift_Mailer {
 
 	/**
 	 * @var Swift_Transport
@@ -61,7 +61,7 @@
 			try {
 				$this->initializeTransport();
 			} catch (Exception $e) {
-				throw new t3lib_exception($e->getMessage());
+				throw new t3lib_exception($e->getMessage(), 1291068569);
 			}
 		}
 		parent::__construct($this->transport);
@@ -81,7 +81,7 @@
 	 *
 	 * $TYPO3_CONF_VARS['MAIL']['transport_sendmail_command'] = '/usr/sbin/sendmail -bs'
 	 *
-	 * @throws Exception
+	 * @throws t3lib_exception
 	 */
 	private function initializeTransport() {
 		$mailSettings = $GLOBALS['TYPO3_CONF_VARS']['MAIL'];
@@ -91,7 +91,10 @@
 					// Get settings to be used when constructing the transport object
 				list($host, $port) = split(':', $mailSettings['transport_smtp_server']);
 				if ($host === '') {
-					throw new t3lib_exception('$TYPO3_CONF_VARS[\'MAIL\'][\'transport_smtp_server\'] needs to be set when transport is set to "smtp"');
+					throw new t3lib_exception(
+						'$TYPO3_CONF_VARS[\'MAIL\'][\'transport_smtp_server\'] needs to be set when transport is set to "smtp"',
+						1291068606
+					);
 				}
 				if ($port === '') {
 					$port = '25';
@@ -115,7 +118,10 @@
 			case 'sendmail':
 				$sendmailCommand = $mailSettings['transport_sendmail_command'];
 				if ($sendmailCommand === '') {
-					throw new t3lib_exception('$TYPO3_CONF_VARS[\'MAIL\'][\'transport_sendmail_command\'] needs to be set when transport is set to "sendmail"');
+					throw new t3lib_exception(
+						'$TYPO3_CONF_VARS[\'MAIL\'][\'transport_sendmail_command\'] needs to be set when transport is set to "sendmail"',
+						1291068620
+					);
 				}
 					// Create our transport
 				$this->transport = Swift_SendmailTransport::newInstance($sendmailCommand);
Index: t3lib/mail/class.t3lib_mail_message.php
===================================================================
--- t3lib/mail/class.t3lib_mail_message.php	(Revision 9677)
+++ t3lib/mail/class.t3lib_mail_message.php	(Arbeitskopie)
@@ -37,10 +37,10 @@
  * @package TYPO3
  * @subpackage t3lib
  */
-class t3lib_mail_message extends Swift_Message {
+class t3lib_mail_Message extends Swift_Message {
 
 	/**
-	 * @var t3lib_mail_mailer
+	 * @var t3lib_mail_Mailer
 	 */
 	var $mailer;
 
@@ -61,7 +61,7 @@
 	 * @return void
 	 */
 	private function initializeMailer() {
-		$this->mailer = t3lib_div::makeInstance('t3lib_mail_mailer');
+		$this->mailer = t3lib_div::makeInstance('t3lib_mail_Mailer');
 	}
 
 	/**