diff --git a/CHANGES b/CHANGES
index 988f3fb28..b4ebc662a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2155,7 +2155,8 @@
 * mail: fix crash because of write after timeout closure
 * scaleway: fix installation issue where THP is not enabled in kernel
 
-[6.0.2]
+[6.1.0]
+* mail: update haraka to 2.8.26. this fixes zero-length queue file crash
 * update: set/unset appStoreId from the update route
 * authProxy: Do not follow redirects
 * appstore: add category translations
diff --git a/src/infra_version.js b/src/infra_version.js
index 3563987e9..d8908ae38 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:3.3.0@sha256:0daf1be5320c095077392bf21d247b93ceaddca46c866c17259a335c80d2f357' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:3.0.0@sha256:59e50b1f55e433ffdf6d678f8c658812b4119f631db8325572a52ee40d3bc562' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.3.0@sha256:0e31ec817e235b1814c04af97b1e7cf0053384aca2569570ce92bef0d95e94d2' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.0.1@sha256:ff24c70966937e8c3477d534bbb192e0364d3e9d6924ee0911278009d802b2b0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.1.0@sha256:a4affd6b92f2ff973dcf529c0c02e0ed2a807702618974829964a0dfcf950a9f' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.3.0@sha256:b7bc1ca4f4d0603a01369a689129aa273a938ce195fe43d00d42f4f2d5212f50' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.0.0@sha256:7e0165f17789192fd4f92efb34aa373450fa859e3b502684b2b121a5582965bf' }
     }