diff --git a/CHANGELOG.md b/CHANGELOG.md
index 232ab50cbe..272f09e921 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
+## 2.37.0 – 2024-08-12
+
+### Added
+- JavaScript event `rl-vm-visible`
+- Detailed error message on account switch failure for
+  [#1594](https://github.com/the-djmaze/snappymail/issues/1594)
+- Workarounds for Microsoft OAuth2 (currently requires Apache AcceptPathInfo)
+  [#1645](https://github.com/the-djmaze/snappymail/issues/1645)
+- Support "mark for deletion"
+  [#1657](https://github.com/the-djmaze/snappymail/issues/1657) by @smsoft-ru
+- Invoke "Update Identity" pop up right after login (when not initialized)
+  [#1689](https://github.com/the-djmaze/snappymail/issues/1689)
+- Keyboard shortcut for "Swap default (background) color"
+  [#1690](https://github.com/the-djmaze/snappymail/issues/1690)
+
+### Changed
+- Updated gulp to v5
+- Replaced vulnerable gulp-header with gulp-append-prepend
+- Removed abandoned vulnerable rollup-plugin-html
+- Align save button in admin security settings
+- Made registerProtocolHandler('mailto') optional by activating at Settings -> General
+- Improved InvalidToken handling for
+  [#1653](https://github.com/the-djmaze/snappymail/issues/1653)
+- Cleanup localizations
+- Update French by @hguilbert
+- Update German by @tkasch
+- Update Polish by @tinola
+- Update Portuguese by @ner00
+
+### Fixed
+- prevent multiple afterShow() and afterHide() due to `transitionend` on multiple CSS properties
+- Attempt to read property "smimeSigned" on null
+- Refreshing mail list doesn't update current message
+  [#1654](https://github.com/the-djmaze/snappymail/issues/1654)
+- Deletion of CACHE folder causing error
+  [#1660](https://github.com/the-djmaze/snappymail/issues/1660)
+- Multiple line breaks are not displayed
+  [#1666](https://github.com/the-djmaze/snappymail/issues/1666)
+- RainLoop\Exceptions\ClientException::__construct(): Argument #2 ($oPrevious) must be of type ?Throwable, string given
+  [#1686](https://github.com/the-djmaze/snappymail/issues/1686)
+- SpamAssassin Division by zero
+  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
+- Failed to parse RFC 2822 date '6 Jul 2024 16:42:09 +0200'
+  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
+- Fix capabilities when THREAD is disabled
+  [#1698](https://github.com/the-djmaze/snappymail/pull/1698) by @akhil1508
+
+### Nextcloud
+- Failed loading due to incorrect `app_path`
+- Bugfix language detection
+- Allow multi-account in nc with oauth login
+  [#1699](https://github.com/the-djmaze/snappymail/pull/1699) by @akhil1508
+
+
 ## 2.36.4 – 2024-06-25
 
 ### Added
diff --git a/README.md b/README.md
index 763c8c57fa..1a517101a4 100644
--- a/README.md
+++ b/README.md
@@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   83.739	|
-|app.js          	|4.207.787	|  438.844	|
+|admin.js        	|2.170.153	|   84.054	|
+|app.js          	|4.207.787	|  441.754	|
 |boot.js         	|  868.735	|    4.147	|
 |libs.js         	|  658.812	|  193.716	|
 |sieve.js         	|        0	|   84.598	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  805.329	|
+|TOTAL           	|8.240.095	|  808.554	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   41.057	| 73.606	| 13.841	| 60.877  	| 12.387	|
-|app.min.js      	|  515.367	|  198.688	|139.456	| 67.384	|110.485  	| 57.528	|
+|admin.min.js    	|  256.831	|   41.162	| 73.606	| 13.885	| 60.877  	| 12.434	|
+|app.min.js      	|  515.367	|  199.730	|139.456	| 67.669	|110.485  	| 57.672	|
 |boot.min.js     	|   84.659	|    2.087	| 26.998	|  1.204	| 23.643  	|  1.002	|
 |libs.min.js     	|  584.772	|   92.365	|180.901	| 34.487	|155.182  	| 30.830	|
 |sieve.min.js     	|        0	|   41.093	|      0	| 10.325	|      0  	|  9.327	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  293.140	|358.761	|103.075	|299.485  	| 89.360	|
-|TOTAL user+sieve	|1.217.635	|  334.233	|358.761	|113.400	|299.485  	| 98.687	|
-|TOTAL admin     	|  959.099	|  135.509	|292.911	| 49.532	|249.877  	| 44.219	|
+|TOTAL user      	|1.217.635	|  294.182	|358.761	|103.360	|299.485  	| 89.504	|
+|TOTAL user+sieve	|1.217.635	|  335.275	|358.761	|113.685	|299.485  	| 98.831	|
+|TOTAL admin     	|  959.099	|  135.614	|292.911	| 49.576	|249.877  	| 44.266	|
 
 For a user it is around 68% smaller and faster than traditional RainLoop.
 
@@ -188,12 +188,12 @@ For a user it is around 68% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 84.662	| 46.946	| 17.667	| 15.144	|
-|app.min.css 	| 274.947	| 68.023	| 39.647	| 15.565	| 13.577	|
+|app.css     	| 340.331	| 84.691	| 46.946	| 17.693	| 15.157	|
+|app.min.css 	| 274.947	| 68.052	| 39.647	| 15.589	| 13.610	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 30.528	|       	|  7.001	|  6.088	|
-|admin.min.css	|       	| 24.652	|       	|  6.325	|  5.574	|
+|admin.css    	|       	| 30.602	|       	|  7.023	|  6.112	|
+|admin.min.css	|       	| 24.717	|       	|  6.346	|  5.586	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
@@ -207,7 +207,7 @@ See https://github.com/the-djmaze/openpgpjs for development
 
 |OpenPGP        	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|-------:	|--------:	|--------:	|
-|openpgp.min.js 	|  330.742	|  546.309	|102.388	| 169.249	| 84.241  	|  138.751	|
+|openpgp.min.js 	|  330.742	|  546.165	|102.388	| 169.207	| 84.241  	|  138.688	|
 |openpgp.worker 	|    1.499	|         	|    824	|        	|    695 	|        	|
 
 
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 2187a96909..0cbdd1b6a2 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.36.4</upstream>.
+This app packages SnappyMail <upstream>2.37.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index a18243e590..0e9f5f9878 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.36.4
+VERSION=2.37.0
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 40a7760e67..3200da68d7 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.36.4</version>
+	<version>2.37.0</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Lightweight & fast email client.**
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 021b22a95a..693278b7bc 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ sub script_snappymail_longdesc
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.36.4" );
+return ( "2.37.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 6f54eb6048..34d7ceae1b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.36.4",
+  "version": "2.37.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",