diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 9906cf5515..86d7af8b66 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -316,5 +316,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.26.1"
+current = "2.26.2"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df7ae1124..b85b2b35c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 2.26.2 – 2023-02-17
+
+## Added
+- Remove CSS white-space from messages to prevent annoying side scrolling
+- Show error when trying to send empty message
+  [#974](https://github.com/the-djmaze/snappymail/pull/974)
+- max_sys_loadavg as setting
+  [#971](https://github.com/the-djmaze/snappymail/pull/971)
+
+## Changed
+- Speedup and improved cleanHtml() and cleanCSS() handling
+- Better handling of upload .eml files to a mailbox
+- Rename Folder Hash to ETag as it is the more obvious name
+- Moved AllowDraftAutosave option from Settings -> Security to Settings -> General -> Compose
+- SmtpClient->Connect() use $oSettings->Ehlo
+- Improved handling of `<style>` elements in messages
+- French updated by @hguilbert
+
+## Fixed
+- Remove SVG elements properly from messages
+  [#972](https://github.com/the-djmaze/snappymail/pull/972)
+- Sending large HTML messages slow/fail
+  [#962](https://github.com/the-djmaze/snappymail/pull/962)
+- Nextcloud login failed
+  [#969](https://github.com/the-djmaze/snappymail/pull/969)
+- DoMessageList() hash check was incorrect
+- "Move to folder" button overlays folder sidebar on mobile
+  [#961](https://github.com/the-djmaze/snappymail/pull/961)
+- Spanish translation SPAM and NOT SPAM strings are reversed
+  [#964](https://github.com/the-djmaze/snappymail/pull/964)
+- Can't open Thunderbird PGP keys from decrypted message
+  [#958](https://github.com/the-djmaze/snappymail/pull/958)
+- Can't close Sieve dialog
+  [#960](https://github.com/the-djmaze/snappymail/pull/960)
+
+
 ## 2.26.1 – 2023-02-14
 
 ## Added
diff --git a/README.md b/README.md
index 2dd32ac390..d13339b38d 100644
--- a/README.md
+++ b/README.md
@@ -141,26 +141,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   81.159	|
-|app.js          	|4.207.787	|  414.949	|
+|admin.js        	|2.170.153	|   81.459	|
+|app.js          	|4.207.787	|  415.412	|
 |boot.js         	|  868.735	|    2.711	|
-|libs.js         	|  658.812	|  192.392	|
+|libs.js         	|  658.812	|  191.492	|
 |sieve.js         	|        0	|   85.597	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  777.093	|
+|TOTAL           	|8.240.095	|  776.956	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.198	| 73.606	| 13.281	| 60.877  	| 11.916	|
-|app.min.js      	|  515.367	|  190.317	|139.456	| 63.879	|110.485  	| 54.792	|
+|admin.min.js    	|  256.831	|   40.311	| 73.606	| 13.352	| 60.877  	| 11.996	|
+|app.min.js      	|  515.367	|  190.331	|139.456	| 63.878	|110.485  	| 54.899	|
 |boot.min.js     	|   84.659	|    1.600	| 26.998	|    940	| 23.643  	|    767	|
-|libs.min.js     	|  584.772	|   91.434	|180.901	| 33.893	|155.182  	| 30.383	|
+|libs.min.js     	|  584.772	|   91.386	|180.901	| 33.872	|155.182  	| 30.381	|
 |sieve.min.js     	|        0	|   41.566	|      0	| 10.427	|      0  	|  9.413	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  283.351	|358.761	| 98.712	|299.485  	| 85.942	|
-|TOTAL user+sieve	|1.217.635	|  324.917	|358.761	|109.139	|299.485  	| 95.355	|
-|TOTAL admin     	|  959.099	|  133.232	|292.911	| 48.114	|249.877  	| 43.066	|
+|TOTAL user      	|1.217.635	|  283.317	|358.761	| 98.690	|299.485  	| 86.047	|
+|TOTAL user+sieve	|1.217.635	|  324.883	|358.761	|109.117	|299.485  	| 95.460	|
+|TOTAL admin     	|  959.099	|  133.297	|292.911	| 48.164	|249.877  	| 43.144	|
 
 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.134	| 46.946	| 17.067	| 14.688	|
-|app.min.css 	| 274.947	| 66.337	| 39.647	| 15.095	| 13.285	|
+|app.css     	| 340.331	| 82.200	| 46.946	| 17.073	| 14.684	|
+|app.min.css 	| 274.947	| 66.395	| 39.647	| 15.099	| 13.260	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 30.554	|       	|  6.984	|  6.085	|
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 44d63bbe1b..58a5987dea 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -15,7 +15,7 @@ import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
 import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
 
-import Remote from 'Remote/User/Fetch';
+//import Remote from 'Remote/User/Fetch';
 
 export class UserSettingsSecurity extends AbstractViewSettings {
 	constructor() {
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 7846c92d6b..11708b325e 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.26.1</upstream>.
+This app packages SnappyMail <upstream>2.26.2</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 2df0e56812..241d5653e2 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.26.1
+VERSION=2.26.2
 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 57f7cb0801..26da5e0504 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.26.1</version>
+	<version>2.26.2</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 c718f86ab8..b48a00fa14 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.26.1" );
+return ( "2.26.2" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 4ed9a3b4b0..5f2dd4258e 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.26.1",
+  "version": "2.26.2",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",