diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php
index b7a6aa836d8..5e2bb9d03ae 100644
--- a/lib/Cake/Controller/Component/EmailComponent.php
+++ b/lib/Cake/Controller/Component/EmailComponent.php
@@ -333,14 +333,16 @@ public function send($content = null, $template = null, $layout = null) {
 		$lib->layout($this->layout, $this->template)->emailFormat($this->sendAs);
 
 		if (!empty($this->attachments)) {
-			$lib->attachment($this->_formatAttachFiles());
+			$lib->attachments($this->_formatAttachFiles());
 		}
 
-		$transport = $lib->transport($this->delivery)->transportClass();
+		$lib->transport($this->delivery);
 		if ($this->delivery === 'mail') {
-			$transport->config(array('eol' => $this->lineFeed, 'additionalParameters' => $this->additionalParams));
+			$lib->config(array('eol' => $this->lineFeed, 'additionalParameters' => $this->additionalParams));
 		} elseif ($this->delivery === 'smtp') {
-			$transport->config($this->smtpOptions);
+			$lib->config($this->smtpOptions);
+		} else {
+			$lib->config(array());
 		}
 
 		$sent = $lib->send($content);