diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 36d814643..317a059a4 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -289,5 +289,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.22.3"
+current = "2.22.4"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2dd2edac..26c8be96a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 2.22.4 – 2022-11-28
+
+### Changed
+- Contacts dialog layout using flex
+- Session token is related to the user agent string
+  [#713](https://github.com/the-djmaze/snappymail/pull/713)
+- Better browser cache handling for avatars plugin
+  [#714](https://github.com/the-djmaze/snappymail/pull/714)
+- Force HTML editor when set as default when replying to message
+  [#355](https://github.com/the-djmaze/snappymail/pull/355)
+
+### Fixed
+- Contact Error - object Object #716
+  [#716](https://github.com/the-djmaze/snappymail/pull/716)
+- Unable to move messages to different folder by drag and drop
+  [#710](https://github.com/the-djmaze/snappymail/pull/710)
+- v2.22.3 unknown error #709
+  [#709https://github.com/the-djmaze/snappymail/pull/709)
+
+
 ## 2.22.3 – 2022-11-25
 
 ### Added
@@ -9,7 +29,7 @@
 - Update to OpenPGP.js v5.5.0
 
 ### Fixed
-- drag & drop folder expansion #707
+- drag & drop folder expansion
   [#707](https://github.com/the-djmaze/snappymail/pull/707)
 - Save selected messages as .eml in Nextcloud failed
   [#704](https://github.com/the-djmaze/snappymail/pull/704)
diff --git a/README.md b/README.md
index ff6b4eaa0..245aff84b 100644
--- a/README.md
+++ b/README.md
@@ -142,25 +142,25 @@ RainLoop 1.17 vs SnappyMail
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
 |admin.js        	|2.170.153	|   82.419	|
-|app.js          	|4.207.787	|  407.335	|
-|boot.js         	|  868.735	|    1.989	|
+|app.js          	|4.207.787	|  407.334	|
+|boot.js         	|  868.735	|    2.351	|
 |libs.js         	|  658.812	|  193.075	|
 |sieve.js         	|        0	|   86.121	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  771.224	|
+|TOTAL           	|8.240.095	|  771.585	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
 |admin.min.js    	|  256.831	|   40.933	| 73.606	| 13.575	| 60.877  	| 12.185	|
-|app.min.js      	|  515.367	|  188.819	|139.456	| 62.830	|110.485  	| 53.925	|
-|boot.min.js     	|   84.659	|    1.216	| 26.998	|    761	| 23.643  	|    614	|
+|app.min.js      	|  515.367	|  188.876	|139.456	| 62.841	|110.485  	| 53.957	|
+|boot.min.js     	|   84.659	|    1.474	| 26.998	|    907	| 23.643  	|    733	|
 |libs.min.js     	|  584.772	|   92.084	|180.901	| 34.119	|155.182  	| 30.621	|
 |sieve.min.js     	|        0	|   41.926	|      0	| 10.484	|      0  	|  9.451	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  282.119	|358.761	| 97.710	|299.485  	| 85.160	|
-|TOTAL user+sieve	|1.217.635	|  324.045	|358.761	|108.194	|299.485  	| 94.611	|
-|TOTAL admin     	|  959.099	|  134.233	|292.911	| 48.455	|249.877  	| 43.420	|
+|TOTAL user      	|1.217.635	|  282.434	|358.761	| 97.867	|299.485  	| 85.311	|
+|TOTAL user+sieve	|1.217.635	|  324.360	|358.761	|108.351	|299.485  	| 94.762	|
+|TOTAL admin     	|  959.099	|  134.491	|292.911	| 48.601	|249.877  	| 43.539	|
 
 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.471	| 46.946	| 17.107	| 14.645	|
-|app.min.css 	| 274.947	| 66.548	| 39.647	| 15.117	| 13.260	|
+|app.css     	| 340.331	| 81.910	| 46.946	| 17.050	| 14.596	|
+|app.min.css 	| 274.947	| 66.076	| 39.647	| 15.042	| 13.205	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 29.853	|       	|  6.812	|  5.933	|
diff --git a/dev/Knoin/AbstractModel.js b/dev/Knoin/AbstractModel.js
index fe5ebab81..675335066 100644
--- a/dev/Knoin/AbstractModel.js
+++ b/dev/Knoin/AbstractModel.js
@@ -102,10 +102,10 @@ export class AbstractModel {
 				case 'string':
 					this[key] = typeCast(this[key], value);
 					break;
-					// fall through
 				case 'undefined':
-				default:
 					this[key] = value;
+					// fall through
+				default:
 //					console.log((typeof this[key])+' '+(model.name)+'.'+key+' not revived');
 				}
 			} catch (e) {
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 4ca3ec11e..6cc08fc1f 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.22.3</upstream>.
+This app packages SnappyMail <upstream>2.22.4</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index da746c635..4a797b0da 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.22.3
+VERSION=2.22.4
 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 dfb335d19..3a058def2 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.22.3</version>
+	<version>2.22.4</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 8e8c4b94c..1a300e26e 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.22.3" );
+return ( "2.22.4" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 39c18101e..21cacea64 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.22.3",
+  "version": "2.22.4",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/README.md b/plugins/README.md
index 4201d6449..06bdecc0a 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -307,6 +307,7 @@ $Plugin->addHook('hook.name', 'functionName');
 	Happens before send/save message
 
 ### filter.message-rcpt
+	Called by DoSendMessage and DoSendReadReceiptMessage
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Mime\EmailCollection $oRcpt
@@ -359,6 +360,7 @@ $Plugin->addHook('hook.name', 'functionName');
 		array &$aHiddenRcpt
 
 ### filter.smtp-message-stream
+	Called by DoSendMessage and DoSendReadReceiptMessage
 	params:
 		\RainLoop\Model\Account $oAccount
 		resource &$rMessageStream