diff --git a/CHANGES b/CHANGES
index 23892117f..75b121ba9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2395,4 +2395,5 @@
 * cloudron-support: add option to reset cloudron.io account
 * Fix flicker in login page
 * Fix LE account key re-use issue in DO 1-click image
+* mail: add non-tls ports for recvmail addon
 
diff --git a/src/infra_version.js b/src/infra_version.js
index 690205c2d..0a94fce21 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -20,7 +20,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:4.1.1@sha256:86e4e2f4fd43809efca7c9cb1def4d7608cf36cb9ea27052f9b64da4481db43a' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.2@sha256:9df297ccc3370f38c54f8d614e214e082b363777cd1c6c9522e29663cc8f5362' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.4@sha256:5c60de75d078ae609da5565f32dcd91030f45907e945756cc976ff207b8c6199' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.4.1@sha256:7e3fa6c409b20693acb2472f084516e48b2af6da1341c243148ffc10f74e7d82' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.5.0@sha256:e05d328ea1afa94e31e2eae9b035ff2edde8b90cae902ca49e06053b5bdb5fde' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.0.1@sha256:bed9f6b5d06fe2c5289e895e806cfa5b74ad62993d705be55d4554a67d128029' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.4.2@sha256:810306478c3dac7caa7497e5f6381cc7ce2f68aafda849a4945d39a67cc04bc1' }
     }
diff --git a/src/services.js b/src/services.js
index 4f1b7f31e..f239ec0f5 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1080,8 +1080,10 @@ async function setupRecvMail(app, options) {
 
     const env = [
         { name: `${envPrefix}MAIL_IMAP_SERVER`, value: 'mail' },
-        { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9993' },
-        { name: `${envPrefix}MAIL_POP3_PORT`, value: '9995' },
+        { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9393' },
+        { name: `${envPrefix}MAIL_IMAPS_PORT`, value: '9993' },
+        { name: `${envPrefix}MAIL_POP3_PORT`, value: '9595' },
+        { name: `${envPrefix}MAIL_POP3S_PORT`, value: '9995' },
         { name: `${envPrefix}MAIL_IMAP_USERNAME`, value: app.inboxName + '@' + app.inboxDomain },
         { name: `${envPrefix}MAIL_IMAP_PASSWORD`, value: password },
         { name: `${envPrefix}MAIL_TO`, value: app.inboxName + '@' + app.inboxDomain },