diff --git a/packages/zend-mail/composer.json b/packages/zend-mail/composer.json
index d1346dff1..6e9353967 100644
--- a/packages/zend-mail/composer.json
+++ b/packages/zend-mail/composer.json
@@ -7,7 +7,6 @@
     "require": {
         "php": ">=5.3.3",
         "zf1s/zend-exception": "^1.15.3",
-        "zf1s/zend-loader": "^1.15.3",
         "zf1s/zend-mime": "^1.15.3",
         "zf1s/zend-registry": "^1.15.3",
         "zf1s/zend-validate": "^1.15.3"
@@ -18,7 +17,10 @@
         }
     },
     "suggest": {
-        "ext-posix": "Used in special situations or with special adapters"
+        "ext-posix": "Used in special situations or with special adapters",
+        "zf1s/zend-config": "Used in special situations or with special adapters",
+        "zf1s/zend-date": "Used in special situations or with special adapters",
+        "zf1s/zend-loader": "Used in special situations or with special adapters"
     },
     "replace": {
         "zf1/zend-mail": "^1.12"
diff --git a/packages/zend-mail/library/Zend/Mail/Transport/Smtp.php b/packages/zend-mail/library/Zend/Mail/Transport/Smtp.php
index 33b4b9f4b..6a3bc43fe 100644
--- a/packages/zend-mail/library/Zend/Mail/Transport/Smtp.php
+++ b/packages/zend-mail/library/Zend/Mail/Transport/Smtp.php
@@ -223,7 +223,7 @@ public function _sendMail()
      * @access  protected
      * @param   array $headers
      * @return  void
-     * @throws  Zend_Transport_Exception
+     * @throws  Zend_Mail_Transport_Exception
      */
     protected function _prepareHeaders($headers)
     {