1 files changed, 4 insertions, 1 deletions
diff --git a/core/Mail.php b/core/Mail.php
index c6c8623cfd..a3771f536d 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -111,11 +111,14 @@ class Mail extends Zend_Mail
         if (!empty($mailConfig['encryption'])) {
             $smtpConfig['ssl'] = $mailConfig['encryption'];
         }
+        
+        if (!empty($mailConfig['port'])) {
+            $smtpConfig['port'] = $mailConfig['port'];
+        }
 
         $host = trim($mailConfig['host']);
         $tr = new \Zend_Mail_Transport_Smtp($host, $smtpConfig);
         Mail::setDefaultTransport($tr);
-        @ini_set("smtp_port", $mailConfig['port']);
     }
 
     public function send($transport = null)