diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 3e733cd75..3c92da1f4 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -305,5 +305,5 @@ dev_email = ""
dev_password = ""
[version]
-current = "2.24.6"
+current = "2.25.0"
saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36a104230..5e880b4c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.25.0 – 2023-01-26
+
+## Changed
+- Right margin to folder search input wrapper by @codiflow
+ [#871](https://github.com/the-djmaze/snappymail/pull/871)
+- Almost all request params now use JavaScript camelCase instead of CamelCase
+- #rl-content to use flex for better layout control
+- Decode some Copernica link tracking
+- Cleanup some CSS and JS code
+- Better Sieve rainloop.user script handling
+- Improve MailSo\Imap\BodyStructure
+- Cleanup MIME part FileName handling
+
+## Fixed
+- CardDAV sync error - Request aborted
+ [#866](https://github.com/the-djmaze/snappymail/pull/866)
+- PDF not possible to be viewed in the browser
+ [#867](https://github.com/the-djmaze/snappymail/pull/867)
+- ZIP Files cannot be uploaded from Desktop to attachments (other files can be uploaded)
+ [#878](https://github.com/the-djmaze/snappymail/pull/878)
+- Mobile view issues with leftside menu
+- Default messageListItem border left color for dark mode
+- Nextcloud layout in ?admin
+- Nextcloud `_htaccess` to `.htaccess` failed
+
+### Removed
+- Some unused PHP functions
+
## 2.24.6 – 2023-01-18
## Added
diff --git a/README.md b/README.md
index 9fbcae588..934b803d6 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.531 |
-|app.js |4.207.787 | 412.740 |
+|admin.js |2.170.153 | 81.232 |
+|app.js |4.207.787 | 412.456 |
|boot.js | 868.735 | 2.507 |
-|libs.js | 658.812 | 191.369 |
-|sieve.js | 0 | 85.960 |
+|libs.js | 658.812 | 191.284 |
+|sieve.js | 0 | 85.597 |
|polyfills.js | 334.608 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.240.095 | 774.392 |
+|TOTAL |8.240.095 | 773.361 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 256.831 | 40.272 | 73.606 | 13.311 | 60.877 | 11.945 |
-|app.min.js | 515.367 | 190.231 |139.456 | 63.507 |110.485 | 54.454 |
+|admin.min.js | 256.831 | 40.117 | 73.606 | 13.273 | 60.877 | 11.907 |
+|app.min.js | 515.367 | 189.936 |139.456 | 63.495 |110.485 | 54.330 |
|boot.min.js | 84.659 | 1.568 | 26.998 | 949 | 23.643 | 775 |
-|libs.min.js | 584.772 | 90.782 |180.901 | 33.630 |155.182 | 30.121 |
-|sieve.min.js | 0 | 41.905 | 0 | 10.477 | 0 | 9.456 |
+|libs.min.js | 584.772 | 90.740 |180.901 | 33.606 |155.182 | 30.207 |
+|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 | 282.581 |358.761 | 98.086 |299.485 | 85.350 |
-|TOTAL user+sieve |1.217.635 | 324.486 |358.761 |108.563 |299.485 | 94.806 |
-|TOTAL admin | 959.099 | 132.622 |292.911 | 47.890 |249.877 | 42.841 |
+|TOTAL user |1.217.635 | 282.244 |358.761 | 98.050 |299.485 | 85.312 |
+|TOTAL user+sieve |1.217.635 | 323.810 |358.761 |108.477 |299.485 | 94.725 |
+|TOTAL admin | 959.099 | 132.425 |292.911 | 47.828 |249.877 | 42.889 |
For a user its around 70% smaller and faster than traditional RainLoop.
@@ -189,12 +189,12 @@ 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.727 | 46.946 | 17.170 | 14.739 |
-|app.min.css | 274.947 | 66.648 | 39.647 | 15.131 | 13.273 |
+|app.css | 340.331 | 82.547 | 46.946 | 17.152 | 14.732 |
+|app.min.css | 274.947 | 66.447 | 39.647 | 15.097 | 13.238 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.281 | | 6.906 | 5.999 |
-|admin.min.css | | 24.493 | | 6.233 | 5.501 |
+|admin.css | | 30.278 | | 6.902 | 6.012 |
+|admin.min.css | | 24.488 | | 6.229 | 5.498 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 8bf68c5f8..8f1ab96fb 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.24.6.
+This app packages SnappyMail 2.25.0.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 55f535fb3..643fa84b3 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.24.6
+VERSION=2.25.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 e683f5b8b..a29453e31 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
snappymail
SnappyMail
SnappyMail Webmail
- 2.24.6
+ 2.25.0
agpl
SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli