diff --git a/CHANGES b/CHANGES
index b4132d445..e98e38590 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1466,7 +1466,7 @@
 
 [3.4.0]
 * Improve error page
-* Add system view to manage addons
+* Add system view to manage addons and view their status
 * Fix iconset regression for account and Cloudron name edits
 * Add server reboot button and warn if reboot is required for security updates
 * Backup and update tasks are now cancelable
diff --git a/src/infra_version.js b/src/infra_version.js
index 460e123db..208aa30a4 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -19,7 +19,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:2.0.2@sha256:6dcee0731dfb9b013ed94d56205eee219040ee806c7e251db3b3886eaa4947ff' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:2.0.2@sha256:95e006390ddce7db637e1672eb6f3c257d3c2652747424f529b1dee3cbe6728c' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.0.0@sha256:8a88dd334b62b578530a014ca1a2425a54cb9df1e475f5d3a36806e5cfa22121' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.0.0@sha256:3c0fbb2a042ac471940ac3e9f6ffa900c8a294941fb7de509b2e3309b09fbffd' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.0.1@sha256:1fd3f1e76b15f37c1ca9a7e886199703a520ee72b0d7a902c8b2609aea003a43' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.2@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' }
     }
 };
diff --git a/src/mail.js b/src/mail.js
index 7a2edfb99..02c293f33 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -52,6 +52,7 @@ var assert = require('assert'),
     dns = require('./native-dns.js'),
     domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
+    hat = require('./hat.js'),
     infra = require('./infra_version.js'),
     mailboxdb = require('./mailboxdb.js'),
     maildb = require('./maildb.js'),
@@ -554,6 +555,7 @@ function restartMail(callback) {
 
     const tag = infra.images.mail.tag;
     const memoryLimit = 4 * 256;
+    const cloudronToken = hat(8 * 128);
 
     // admin and mail share the same certificate
     reverseProxy.getCertificate({ fqdn: config.adminFqdn(), domain: config.adminDomain() }, function (error, bundle) {
@@ -585,6 +587,7 @@ function restartMail(callback) {
                             --memory-swap ${memoryLimit * 2}m \
                             --dns 172.18.0.1 \
                             --dns-search=. \
+                            -e CLOUDRON_MAIL_TOKEN="${cloudronToken}" \
                             -v "${paths.MAIL_DATA_DIR}:/app/data" \
                             -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
                             ${ports} \