diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index c4ca0f462..80e90fdbb 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.3"
+current = "2.26.4"
saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d384c0c..7d37da660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+## 2.26.4 – 2023-02-24
+
+## Added
+- Add CSP frame-ancestors for
+ [#537](https://github.com/the-djmaze/snappymail/pull/537)
+
+## Changed
+- Reduce/simplify CSS footprint
+- Use the System/Browser font by default by @HeySora
+ [#988](https://github.com/the-djmaze/snappymail/pull/988)
+- Make layout fully responsive using matchMedia('(max-width: 799px)')
+- Move brotli and gzip compress option to application.ini
+- After page refreshes in background whilst editing a draft, the space bar stops working
+ [#860](https://github.com/the-djmaze/snappymail/pull/860)
+- Updated Portuguese by @ner00
+ [#984](https://github.com/the-djmaze/snappymail/pull/984)
+- Updated French by @hguilbert
+ [#985](https://github.com/the-djmaze/snappymail/pull/985)
+
+## Fixed
+- unset border-box for message body
+ [#990](https://github.com/the-djmaze/snappymail/pull/990)
+- Unread email count badge shows -1
+ [#989](https://github.com/the-djmaze/snappymail/pull/989)
+- unicode mailto: addresses not decoded
+- Unicode email/url address matching
+ [#955](https://github.com/the-djmaze/snappymail/pull/955)
+- Invalid Token if run in IFrame
+ [#537](https://github.com/the-djmaze/snappymail/pull/537)
+
+### Removed
+- rl.initData
+
+
## 2.26.3 – 2023-02-21
## Added
@@ -9,7 +43,6 @@
- Many AppData properties to JavaScript camelCase
- Cleanup Identity handling
- Merge GnuPG and OpenPGP.js passphrases
-- Removed unused Squire code
## Fixed
- Notification enum conflicts with window.Notification
@@ -25,6 +58,10 @@
- Facebook logo missing from emails sent out by it
[#954](https://github.com/the-djmaze/snappymail/pull/954)
+### Removed
+- Unused Squire code
+
+
## 2.26.2 – 2023-02-17
diff --git a/README.md b/README.md
index 442c36665..a5ad4db44 100644
--- a/README.md
+++ b/README.md
@@ -141,26 +141,26 @@ RainLoop 1.17 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
-|admin.js |2.170.153 | 78.661 |
-|app.js |4.207.787 | 410.730 |
-|boot.js | 868.735 | 4.589 |
-|libs.js | 658.812 | 185.972 |
+|admin.js |2.170.153 | 78.971 |
+|app.js |4.207.787 | 409.340 |
+|boot.js | 868.735 | 4.142 |
+|libs.js | 658.812 | 185.881 |
|sieve.js | 0 | 85.599 |
|polyfills.js | 334.608 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.240.095 | 765.836 |
+|TOTAL |8.240.095 | 764.218 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 256.831 | 38.818 | 73.606 | 12.976 | 60.877 | 11.660 |
-|app.min.js | 515.367 | 187.803 |139.456 | 63.327 |110.485 | 54.427 |
-|boot.min.js | 84.659 | 2.326 | 26.998 | 1.309 | 23.643 | 1.083 |
-|libs.min.js | 584.772 | 90.478 |180.901 | 33.548 |155.182 | 30.100 |
-|sieve.min.js | 0 | 41.566 | 0 | 10.428 | 0 | 9.415 |
+|admin.min.js | 256.831 | 38.936 | 73.606 | 13.036 | 60.877 | 11.694 |
+|app.min.js | 515.367 | 186.883 |139.456 | 63.102 |110.485 | 54.200 |
+|boot.min.js | 84.659 | 2.084 | 26.998 | 1.202 | 23.643 | 1.003 |
+|libs.min.js | 584.772 | 90.445 |180.901 | 33.592 |155.182 | 30.108 |
+|sieve.min.js | 0 | 41.525 | 0 | 10.435 | 0 | 9.401 |
|polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 |
-|TOTAL user |1.217.635 | 280.607 |358.761 | 98.184 |299.485 | 85.610 |
-|TOTAL user+sieve |1.217.635 | 322.173 |358.761 |108.612 |299.485 | 95.025 |
-|TOTAL admin | 959.099 | 131.622 |292.911 | 47.833 |249.877 | 42.843 |
+|TOTAL user |1.217.635 | 279.412 |358.761 | 97.896 |299.485 | 85.311 |
+|TOTAL user+sieve |1.217.635 | 320.937 |358.761 |108.331 |299.485 | 94.712 |
+|TOTAL admin | 959.099 | 131.465 |292.911 | 47.830 |249.877 | 42.805 |
For a user it is around 72% smaller and faster than traditional RainLoop.
@@ -189,12 +189,12 @@ For a user it is around 72% smaller and faster than traditional RainLoop.
|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
-|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 |
+|app.css | 340.331 | 81.526 | 46.946 | 16.960 | 14.620 |
+|app.min.css | 274.947 | 65.398 | 39.647 | 15.032 | 13.119 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.554 | | 6.984 | 6.085 |
-|admin.min.css | | 24.752 | | 6.339 | 5.606 |
+|admin.css | | 30.296 | | 6.939 | 6.066 |
+|admin.min.css | | 24.420 | | 6.272 | 5.531 |
### PGP
RainLoop uses the old OpenPGP.js v2
@@ -208,7 +208,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 | 539.988 |102.388 | 167.371 | 84.241 | 137.413 |
+|openpgp.min.js | 330.742 | 541.176 |102.388 | 168.266 | 84.241 | 138.278 |
|openpgp.worker | 1.499 | | 824 | | 695 | |
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 221e01c96..2734581bf 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.26.3.
+This app packages SnappyMail 2.26.4.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 93c797394..2ca24fdce 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.3
+VERSION=2.26.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 4a63d908a..c59311005 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
snappymail
SnappyMail
SnappyMail Webmail
- 2.26.3
+ 2.26.4
agpl
SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli