diff --git a/src/apps.js b/src/apps.js
index 8b65aadb1..46827523f 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -172,14 +172,14 @@ function validatePortBindings(portBindings, tcpPorts) {
         993, /* imaps */
         2003, /* graphite (lo) */
         2004, /* graphite (lo) */
-        2020, /* install server */
+        2020, /* mail server */
         config.get('port'), /* app server (lo) */
         config.get('sysadminPort'), /* sysadmin app server (lo) */
         config.get('smtpPort'), /* internal smtp port (lo) */
         config.get('ldapPort'), /* ldap server (lo) */
         3306, /* mysql (lo) */
         4190, /* managesieve */
-        8000 /* graphite (lo) */
+        8000, /* graphite (lo) */
     ];
 
     if (!portBindings) return null;
diff --git a/src/mail.js b/src/mail.js
index c3d5ba84a..b22656abb 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -571,6 +571,7 @@ function restartMail(callback) {
                         -v "${paths.MAIL_DATA_DIR}:/app/data" \
                         -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
                         ${ports} \
+                        -p 127.0.0.1:2020:2020 \
                         --read-only -v /run -v /tmp ${tag}`;
 
             shell.execSync('startMail', cmd);