diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 2a8958eeaf..3e733cd75e 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -305,5 +305,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.24.5"
+current = "2.24.6"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cd8494e0c..36a1042305 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,47 @@
+## 2.24.6 – 2023-01-18
+
+## Added
+- Preparations for RFC 8689
+- Add admin setting for the contacts suggestions limit
+- A button to clear folder search input field by @codiflow
+  [#847](https://github.com/the-djmaze/snappymail/pull/847)
+- Preparations for custom SMTP credentials handling for
+  [#859](https://github.com/the-djmaze/snappymail/pull/859)
+  [#458](https://github.com/the-djmaze/snappymail/pull/458)
+  [#431](https://github.com/the-djmaze/snappymail/pull/431)
+  [#233](https://github.com/the-djmaze/snappymail/pull/233)
+
+## Changed
+- Display the time of emails, not just the size and date
+  [#843](https://github.com/the-djmaze/snappymail/pull/843)
+- Made thread number a bit wider
+  [#844](https://github.com/the-djmaze/snappymail/pull/844)
+- Improved contacts suggestions limit handling
+  [#849](https://github.com/the-djmaze/snappymail/pull/849)
+- 64-bit PHP was required
+  [#852](https://github.com/the-djmaze/snappymail/pull/852)
+- Update fr-FR translations by @dominiquefournier
+  [#854](https://github.com/the-djmaze/snappymail/pull/854)
+- Move createDomain & createDomainAlias buttons below table
+- Move some Nextcloud SnappyMailHelper code to new InstallStep
+- Cleanup messages cache handling
+- Improved visibility Admin Domain Test errors
+
+## Fixed
+- LiteSpeed does not disable compression although .htaccess says so
+  [#525](https://github.com/the-djmaze/snappymail/pull/525)
+  [#855](https://github.com/the-djmaze/snappymail/pull/855)
+- "Move to folder" functionality displays in desktop view when on mobile
+  [#858](https://github.com/the-djmaze/snappymail/pull/858)
+- matchAnyRule() Return value must be of type bool, none returned
+- Unknown CSP directive 'strict-dynamic' in Safari 13.1.2
+- Wrong timeStyle issue in Safari 13.1.2
+- Language SETTINGS_LABELS got lost
+- Nextcloud failed loading app data when path didn't end with /
+  [#864](https://github.com/the-djmaze/snappymail/pull/864)
+- Workaround Nextcloud session_start issue
+  [#813](https://github.com/the-djmaze/snappymail/pull/813)
+
 ## 2.24.5 – 2023-01-12
 
 ## Added
@@ -22,7 +66,7 @@
   [#846](https://github.com/the-djmaze/snappymail/pull/846)
 
 ## Fixed
-- Searching on Nextcloud search #787
+- Searching on Nextcloud search
   [#787](https://github.com/the-djmaze/snappymail/pull/787)
 - Workaround another Nextcloud disallowed .htaccess
   [#790](https://github.com/the-djmaze/snappymail/pull/790)
diff --git a/README.md b/README.md
index 3420609aca..9fbcae5884 100644
--- a/README.md
+++ b/README.md
@@ -141,26 +141,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   82.218	|
-|app.js          	|4.207.787	|  412.596	|
-|boot.js         	|  868.735	|    2.427	|
-|libs.js         	|  658.812	|  191.301	|
+|admin.js        	|2.170.153	|   81.531	|
+|app.js          	|4.207.787	|  412.740	|
+|boot.js         	|  868.735	|    2.507	|
+|libs.js         	|  658.812	|  191.369	|
 |sieve.js         	|        0	|   85.960	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  774.787	|
+|TOTAL           	|8.240.095	|  774.392	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.756	| 73.606	| 13.419	| 60.877  	| 12.018	|
-|app.min.js      	|  515.367	|  190.149	|139.456	| 63.499	|110.485  	| 54.471	|
-|boot.min.js     	|   84.659	|    1.518	| 26.998	|    919	| 23.643  	|    747	|
-|libs.min.js     	|  584.772	|   90.768	|180.901	| 33.615	|155.182  	| 30.170	|
+|admin.min.js    	|  256.831	|   40.272	| 73.606	| 13.311	| 60.877  	| 11.945	|
+|app.min.js      	|  515.367	|  190.231	|139.456	| 63.507	|110.485  	| 54.454	|
+|boot.min.js     	|   84.659	|    1.568	| 26.998	|    949	| 23.643  	|    775	|
+|libs.min.js     	|  584.772	|   90.782	|180.901	| 33.630	|155.182  	| 30.121	|
 |sieve.min.js     	|        0	|   41.905	|      0	| 10.477	|      0  	|  9.456	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  282.435	|358.761	| 98.033	|299.485  	| 85.388	|
-|TOTAL user+sieve	|1.217.635	|  324.340	|358.761	|108.510	|299.485  	| 94.844	|
-|TOTAL admin     	|  959.099	|  133.042	|292.911	| 47.953	|249.877  	| 42.935	|
+|TOTAL user      	|1.217.635	|  282.581	|358.761	| 98.086	|299.485  	| 85.350	|
+|TOTAL user+sieve	|1.217.635	|  324.486	|358.761	|108.563	|299.485  	| 94.806	|
+|TOTAL admin     	|  959.099	|  132.622	|292.911	| 47.890	|249.877  	| 42.841	|
 
 For a user its around 70% smaller and faster than traditional RainLoop.
 
@@ -189,8 +189,8 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 82.794	| 46.946	| 17.185	| 14.735	|
-|app.min.css 	| 274.947	| 66.702	| 39.647	| 15.146	| 13.290	|
+|app.css     	| 340.331	| 82.727	| 46.946	| 17.170	| 14.739	|
+|app.min.css 	| 274.947	| 66.648	| 39.647	| 15.131	| 13.273	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 30.281	|       	|  6.906	|  5.999	|
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index fceaddb2c1..8bf68c5f87 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.24.5</upstream>.
+This app packages SnappyMail <upstream>2.24.6</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 6195ceb9ed..55f535fb3f 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.24.5
+VERSION=2.24.6
 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 3b98bac6f2..e683f5b8be 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.24.5</version>
+	<version>2.24.6</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index aec3827e90..6a754e3265 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.24.5" );
+return ( "2.24.6" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 6b5d3bd576..b6402de77a 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.24.5",
+  "version": "2.24.6",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",