diff --git a/lib/Cake/Network/Email/SmtpTransport.php b/lib/Cake/Network/Email/SmtpTransport.php
index c581c9a2f..6205e443b 100644
--- a/lib/Cake/Network/Email/SmtpTransport.php
+++ b/lib/Cake/Network/Email/SmtpTransport.php
@@ -32,13 +32,6 @@ class SmtpTransport extends AbstractTransport {
  */
 	protected $_socket;
 
-/**
- * CakeEmail
- *
- * @var CakeEmail
- */
-	protected $_cakeEmail;
-
 /**
  * Content of email to return
  *
@@ -90,12 +83,10 @@ class SmtpTransport extends AbstractTransport {
  * @throws SocketException
  */
 	public function send(CakeEmail $email) {
-		$this->_cakeEmail = $email;
-
 		$this->_connect();
 		$this->_auth();
-		$this->_sendRcpt();
-		$this->_sendData();
+		$this->_sendRcpt($email);
+		$this->_sendData($email);
 		$this->_disconnect();
 
 		return $this->_content;
@@ -237,10 +228,10 @@ class SmtpTransport extends AbstractTransport {
  *
  * @return array
  */
-	protected function _prepareFromAddress() {
-		$from = $this->_cakeEmail->returnPath();
+	protected function _prepareFromAddress($email) {
+		$from = $email->returnPath();
 		if (empty($from)) {
-			$from = $this->_cakeEmail->from();
+			$from = $email->from();
 		}
 		return $from;
 	}
@@ -250,10 +241,10 @@ class SmtpTransport extends AbstractTransport {
  *
  * @return array
  */
-	protected function _prepareRecipientAddresses() {
-		$to = $this->_cakeEmail->to();
-		$cc = $this->_cakeEmail->cc();
-		$bcc = $this->_cakeEmail->bcc();
+	protected function _prepareRecipientAddresses($email) {
+		$to = $email->to();
+		$cc = $email->cc();
+		$bcc = $email->bcc();
 		return array_merge(array_keys($to), array_keys($cc), array_keys($bcc));
 	}
 
@@ -262,8 +253,8 @@ class SmtpTransport extends AbstractTransport {
  *
  * @return array
  */
-	protected function _prepareMessageHeaders() {
-		return $this->_cakeEmail->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'to', 'cc', 'subject'));
+	protected function _prepareMessageHeaders($email) {
+		return $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'to', 'cc', 'subject'));
 	}
 
 /**
@@ -271,8 +262,8 @@ class SmtpTransport extends AbstractTransport {
  *
  * @return string
  */
-	protected function _prepareMessage() {
-		$lines = $this->_cakeEmail->message();
+	protected function _prepareMessage($email) {
+		$lines = $email->message();
 		$messages = array();
 		foreach ($lines as $line) {
 			if ((!empty($line)) && ($line[0] === '.')) {
@@ -290,11 +281,11 @@ class SmtpTransport extends AbstractTransport {
  * @return void
  * @throws SocketException
  */
-	protected function _sendRcpt() {
-		$from = $this->_prepareFromAddress();
+	protected function _sendRcpt($email) {
+		$from = $this->_prepareFromAddress($email);
 		$this->_smtpSend($this->_prepareFromCmd(key($from)));
 
-		$emails = $this->_prepareRecipientAddresses();
+		$emails = $this->_prepareRecipientAddresses($email);
 		foreach ($emails as $email) {
 			$this->_smtpSend($this->_prepareRcptCmd($email));
 		}
@@ -306,11 +297,11 @@ class SmtpTransport extends AbstractTransport {
  * @return void
  * @throws SocketException
  */
-	protected function _sendData() {
+	protected function _sendData($email) {
 		$this->_smtpSend('DATA', '354');
 
-		$headers = $this->_headersToString($this->_prepareMessageHeaders());
-		$message = $this->_prepareMessage();
+		$headers = $this->_headersToString($this->_prepareMessageHeaders($email));
+		$message = $this->_prepareMessage($email);
 
 		$this->_smtpSend($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
 		$this->_content = array('headers' => $headers, 'message' => $message);
diff --git a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
index 478de6b98..712ea54ae 100644
--- a/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
+++ b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
@@ -35,16 +35,6 @@ class SmtpTestTransport extends SmtpTransport {
 		$this->_socket = $socket;
 	}
 
-/**
- * Helper to change the CakeEmail
- *
- * @param object $cakeEmail An email object.
- * @return void
- */
-	public function setCakeEmail($cakeEmail) {
-		$this->_cakeEmail = $cakeEmail;
-	}
-
 /**
  * Disabled the socket change
  *
@@ -348,8 +338,7 @@ class SmtpTransportTest extends CakeTestCase {
 		$this->socket->expects($this->at(13))->method('read')->will($this->returnValue(false));
 		$this->socket->expects($this->at(14))->method('read')->will($this->returnValue("250 OK\r\n"));
 
-		$this->SmtpTransport->setCakeEmail($email);
-		$this->SmtpTransport->sendRcpt();
+		$this->SmtpTransport->sendRcpt($email);
 	}
 
 /**
@@ -370,8 +359,7 @@ class SmtpTransportTest extends CakeTestCase {
 		$this->socket->expects($this->at(4))->method('read')->will($this->returnValue(false));
 		$this->socket->expects($this->at(5))->method('read')->will($this->returnValue("250 OK\r\n"));
 
-		$this->SmtpTransport->setCakeEmail($email);
-		$this->SmtpTransport->sendRcpt();
+		$this->SmtpTransport->sendRcpt($email);
 	}
 
 /**
@@ -416,8 +404,7 @@ class SmtpTransportTest extends CakeTestCase {
 		$this->socket->expects($this->at(4))->method('read')->will($this->returnValue(false));
 		$this->socket->expects($this->at(5))->method('read')->will($this->returnValue("250 OK\r\n"));
 
-		$this->SmtpTransport->setCakeEmail($email);
-		$this->SmtpTransport->sendData();
+		$this->SmtpTransport->sendData($email);
 	}
 
 /**
@@ -498,8 +485,7 @@ class SmtpTransportTest extends CakeTestCase {
 		$this->socket->expects($this->at(4))->method('read')->will($this->returnValue(false));
 		$this->socket->expects($this->at(5))->method('read')->will($this->returnValue("250 OK\r\n"));
 
-		$this->SmtpTransport->setCakeEmail($email);
-		$this->SmtpTransport->sendRcpt();
+		$this->SmtpTransport->sendRcpt($email);
 
 		$expected = array(
 			array('code' => '250', 'message' => 'OK'),