diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdb6b5e8a..062680c24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 2.33.0 – 2024-01-22
+
+### Added
+- Feature to use the SQLite AddressBook per login account instead of global (on by default).
+- Return all fetched messages headers in JSON.
+
+### Changed
+- Docker hub use Alpine linux 3.18.5 and PHP 8.2
+- Some InvalidArgumentException to the better suited ValueError
+- Removed some unused KnockoutJS code
+- KnockoutJS drop unused rateLimit method
+- Cleanup some data-bind=""
+- Drop the disabled KnockoutJS twoWayBindings
+- Drop support for KnockoutJS _ko_property_writers and for two-way binding they must be observables
+- Login form use method="POST" to prevent uri exposure when javascript fails
+- Merge code to generate MIME PGP parts and MIME Plain parts
+- SMTP sendRequestWithCheck for future support of RFC's
+- Cleanup mime header handling
+
+### Fixed
+- Sorting not supported since 2.32.0
+  [#1373](https://github.com/the-djmaze/snappymail/issues/1373)
+- FILE_ON_SAVING_ERROR is not defined
+  [#1379](https://github.com/the-djmaze/snappymail/issues/1379)
+- Saving EML files with same subject result in only saving latest email
+  [#1381](https://github.com/the-djmaze/snappymail/issues/1381)
+- Some Sieve parser issues
+- Handling of RainLoop Sieve script
+- Sieve rfc5429 RejectCommand and ErejectCommand
+- KnockoutJS title:value was removed, use attr:{title:value}
+- dataBaseUpgrade() always runs on sqlite and pgsql
+- Message was sent but not saved to sent items folder
+  [#1397](https://github.com/the-djmaze/snappymail/issues/1397)
+- DKIM `pass` detection sometimes failed
+
+
 ## 2.32.0 – 2023-12-26
 
 ### Added
diff --git a/README.md b/README.md
index 8291c7ac9..17668c1f4 100644
--- a/README.md
+++ b/README.md
@@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   80.370	|
-|app.js          	|4.207.787	|  408.429	|
+|admin.js        	|2.170.153	|   80.563	|
+|app.js          	|4.207.787	|  410.974	|
 |boot.js         	|  868.735	|    4.142	|
-|libs.js         	|  658.812	|  193.230	|
-|sieve.js         	|        0	|   85.085	|
+|libs.js         	|  658.812	|  192.606	|
+|sieve.js         	|        0	|   84.707	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  771.541	|
+|TOTAL           	|8.240.095	|  773.277	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   39.285	| 73.606	| 13.183	| 60.877  	| 11.806	|
-|app.min.js      	|  515.367	|  186.270	|139.456	| 63.111	|110.485  	| 54.218	|
+|admin.min.js    	|  256.831	|   39.461	| 73.606	| 13.218	| 60.877  	| 11.841	|
+|app.min.js      	|  515.367	|  187.193	|139.456	| 63.375	|110.485  	| 54.428	|
 |boot.min.js     	|   84.659	|    2.084	| 26.998	|  1.202	| 23.643  	|  1.003	|
-|libs.min.js     	|  584.772	|   93.401	|180.901	| 34.765	|155.182  	| 31.194	|
-|sieve.min.js     	|        0	|   41.316	|      0	| 10.364	|      0  	|  9.352	|
+|libs.min.js     	|  584.772	|   92.780	|180.901	| 34.489	|155.182  	| 30.953	|
+|sieve.min.js     	|        0	|   41.164	|      0	| 10.365	|      0  	|  9.359	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  281.755	|358.761	| 99.078	|299.485  	| 86.415	|
-|TOTAL user+sieve	|1.217.635	|  323.071	|358.761	|109.442	|299.485  	| 95.767	|
-|TOTAL admin     	|  959.099	|  134.770	|292.911	| 49.150	|249.877  	| 44.003	|
+|TOTAL user      	|1.217.635	|  282.057	|358.761	| 99.066	|299.485  	| 86.384	|
+|TOTAL user+sieve	|1.217.635	|  323.221	|358.761	|109.431	|299.485  	| 95.743	|
+|TOTAL admin     	|  959.099	|  134.325	|292.911	| 48.909	|249.877  	| 43.797	|
 
 For a user it is around 69% smaller and faster than traditional RainLoop.
 
@@ -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	|  541.176	|102.388	| 168.266	| 84.241  	|  138.278	|
+|openpgp.min.js 	|  330.742	|  540.792	|102.388	| 167.971	| 84.241  	|  138.010	|
 |openpgp.worker 	|    1.499	|         	|    824	|        	|    695 	|        	|
 
 
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index b45d6664c..7d76a1e2d 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.32.0</upstream>.
+This app packages SnappyMail <upstream>2.33.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index c6b023dab..4304ab0eb 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.32.0
+VERSION=2.33.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 029bee605..4626297e0 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.32.0</version>
+	<version>2.33.0</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 a147891dc..4691665ad 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.32.0" );
+return ( "2.33.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 7e34fabe3..a65d5d670 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.32.0",
+  "version": "2.33.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/demo-account/index.php b/plugins/demo-account/index.php
index 3bef7b22e..cdeddfe44 100644
--- a/plugins/demo-account/index.php
+++ b/plugins/demo-account/index.php
@@ -62,11 +62,11 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$latin = transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $aActionParams['folder']);
 			if (false !== \strpos($latin, 'nigger')) {
 				\error_log("blocked {$sMethodName} {$aActionParams['folder']}");
-				exit;
+				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
 			}
 		}
 		else if ('DoFolderClear' === $sMethodName || 'DoMessageDelete' === $sMethodName) {
-			exit;
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
 		}
 	}