diff --git a/src/addons.js b/src/addons.js
index 4ad49a6a4..cab10e836 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -365,7 +365,7 @@ function setupSendMail(app, options, callback) {
         var env = [
             { name: 'MAIL_SMTP_SERVER', value: 'mail' },
             { name: 'MAIL_SMTP_PORT', value: '2525' },
-            { name: 'MAIL_SMTPS_PORT', value: '4650' },
+            { name: 'MAIL_SMTPS_PORT', value: '2465' },
             { name: 'MAIL_SMTP_USERNAME', value: mailbox.name + '@' + app.domain },
             { name: 'MAIL_SMTP_PASSWORD', value: password },
             { name: 'MAIL_FROM', value: mailbox.name + '@' + app.domain },
diff --git a/src/infra_version.js b/src/infra_version.js
index 5a82bfd7c..8c0b24049 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:1.0.0' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:1.0.1' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:1.0.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.40.0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:1.0.0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:1.0.0' }
     }
 };