diff --git a/CHANGES b/CHANGES
index 7db0eeef6..da75d31d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1786,4 +1786,5 @@
 * Mail eventlog
 * Add permission where a user can just invite other users
 * Setup logrotate configs for collectd since upstream does not set it up
+* mail: Add X-Envelope-To and X-Envelope-From headers for incoming mails
 
diff --git a/src/infra_version.js b/src/infra_version.js
index f2cb1fb2f..ddb63c80d 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.1.0@sha256:6d1bf221cfe6124957e2c58b57c0a47214353496009296acb16adf56df1da9d5' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.1.0@sha256:f2cda21bd15c21bbf44432df412525369ef831a2d53860b5c5b1675e6f384de2' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.6.0@sha256:e32c2ffdbb45d97d2cfab967e9ab8fbcdd8caa5683cbfbf74efbea64433a3b38' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.6.0@sha256:c82316f8d826d074651cc2c09749dd354f2601babdb5336fece4bf07c2d6c5f0' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.2.0@sha256:fc9ca69d16e6ebdbd98ed53143d4a0d2212eef60cb638dc71219234e6f427a2c' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:0.1.0@sha256:e177c5bf5f38c84ce1dea35649c22a1b05f96eec67a54a812c5a35e585670f0f' }
     }