diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 5ded294e7..9fa455939 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.21.2"
+current = "2.21.3"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60ad0fa61..acdfe53dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.21.3 – 2022-11-16
+
+### Added
+- Click on PGP KEY attachment opens "Import key" dialog
+
+### Changed
+- Increase visible reading area for small screens
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+- Improved message spam score detailed view
+- Improved DAV connection logging
+
+### Fixed
+- Handling attachments MIME type / content-type
+- Message responsive resizing width/height of elements
+  [#678](https://github.com/the-djmaze/snappymail/pull/678)
+- Focus on textarea when creating a new plain text email
+  [#501](https://github.com/the-djmaze/snappymail/pull/501)
+- CardDav remove photos of my contacts when synchronizing
+  [#679](https://github.com/the-djmaze/snappymail/pull/679)
+
+### Removed
+- \MailSo\Mime\Enumerations\MimeType
+
+### Nextcloud
+- Use fontastic in Nextcloud Files selector dialog
+- Firefox < 98 dialogs
+  [#673](https://github.com/the-djmaze/snappymail/pull/673)
+
 ## 2.21.2 – 2022-11-15
 
 ### Added
diff --git a/README.md b/README.md
index 89c9940d4..696b181a6 100644
--- a/README.md
+++ b/README.md
@@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   82.504	|
-|app.js          	|4.207.787	|  406.789	|
+|admin.js        	|2.170.153	|   82.541	|
+|app.js          	|4.207.787	|  406.801	|
 |boot.js         	|  868.735	|    1.989	|
-|libs.js         	|  658.812	|  192.965	|
+|libs.js         	|  658.812	|  193.035	|
 |sieve.js         	|        0	|   86.121	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  770.653	|
+|TOTAL           	|8.240.095	|  770.772	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.844	| 73.606	| 13.561	| 60.877  	| 12.134	|
-|app.min.js      	|  515.367	|  188.622	|139.456	| 62.735	|110.485  	| 53.807	|
+|admin.min.js    	|  256.831	|   40.867	| 73.606	| 13.573	| 60.877  	| 12.146	|
+|app.min.js      	|  515.367	|  188.586	|139.456	| 62.800	|110.485  	| 53.829	|
 |boot.min.js     	|   84.659	|    1.216	| 26.998	|    761	| 23.643  	|    614	|
-|libs.min.js     	|  584.772	|   92.042	|180.901	| 34.110	|155.182  	| 30.627	|
+|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	|  281.880	|358.761	| 97.606	|299.485  	| 85.048	|
-|TOTAL user+sieve	|1.217.635	|  323.806	|358.761	|108.090	|299.485  	| 94.499	|
-|TOTAL admin     	|  959.099	|  134.102	|292.911	| 48.432	|249.877  	| 43.375	|
+|TOTAL user      	|1.217.635	|  281.886	|358.761	| 97.680	|299.485  	| 85.064	|
+|TOTAL user+sieve	|1.217.635	|  323.812	|358.761	|108.164	|299.485  	| 94.515	|
+|TOTAL admin     	|  959.099	|  134.167	|292.911	| 48.453	|249.877  	| 43.381	|
 
 For a user its around 70% smaller and faster than traditional RainLoop.
 
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 34570f1c6..df4292152 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.21.2</upstream>.
+This app packages SnappyMail <upstream>2.21.3</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 4b34c17c4..cf3c28d0d 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.21.2
+VERSION=2.21.3
 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 797556124..2e7f0facb 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.21.2</version>
+	<version>2.21.3</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 bb23b6c0a..90cda95ea 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.21.2" );
+return ( "2.21.3" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 4d18f3807..484afaf8c 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.21.2",
+  "version": "2.21.3",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",