diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 3c92da1f4..0d04a1343 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.25.0"
+current = "2.25.1"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/.gitignore b/.gitignore
index 46428042c..b4e8f72e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 /data
 /MULTIPLY
 /include.php
+/issues
 .idea/
 .env
 /test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e880b4c4..270a4f187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 2.25.1 – 2023-01-30
+
+## Added
+- Support RFC 8689
+- Nextcloud move themes outside of app folder
+  [#875](https://github.com/the-djmaze/snappymail/pull/875)
+- Add check to unregister system addressbook by @akhil1508
+  [#879](https://github.com/the-djmaze/snappymail/pull/879)
+
+## Changed
+- material-design checkbox use hidden input for accessibility
+- Always subscribe to new folder by default
+- Merge NoScript, NoCookie and BadBrowser pages in Index.html
+- Cleanup translations. Also see https://snappymail.eu/translate.php
+
+## Fixed
+- PHP < 8.1 ini_set() only accepts strings when `declare(strict_types=1);` is used
+- Nextcloud also fix settings on upgrade
+- Nextcloud workaround upgrade OPCache issue
+  [#880](https://github.com/the-djmaze/snappymail/pull/880)
+- SMTP error while using PHP mail()
+  [#884](https://github.com/the-djmaze/snappymail/pull/884)
+- Cannot create folder
+  [#885](https://github.com/the-djmaze/snappymail/pull/885)
+- Image stretching when image hasd max-width
+  [#869](https://github.com/the-djmaze/snappymail/pull/869)
+
+
 ## 2.25.0 – 2023-01-26
 
 ## Changed
diff --git a/README.md b/README.md
index 934b803d6..5ab5bc048 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.232	|
-|app.js          	|4.207.787	|  412.456	|
-|boot.js         	|  868.735	|    2.507	|
-|libs.js         	|  658.812	|  191.284	|
+|admin.js        	|2.170.153	|   81.214	|
+|app.js          	|4.207.787	|  412.775	|
+|boot.js         	|  868.735	|    2.559	|
+|libs.js         	|  658.812	|  191.708	|
 |sieve.js         	|        0	|   85.597	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  773.361	|
+|TOTAL           	|8.240.095	|  774.138	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|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.740	|180.901	| 33.606	|155.182  	| 30.207	|
+|admin.min.js    	|  256.831	|   40.104	| 73.606	| 13.270	| 60.877  	| 11.906	|
+|app.min.js      	|  515.367	|  190.149	|139.456	| 63.560	|110.485  	| 54.460	|
+|boot.min.js     	|   84.659	|    1.602	| 26.998	|    941	| 23.643  	|    768	|
+|libs.min.js     	|  584.772	|   91.155	|180.901	| 33.754	|155.182  	| 30.287	|
 |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.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	|
+|TOTAL user      	|1.217.635	|  282.906	|358.761	| 98.255	|299.485  	| 85.515	|
+|TOTAL user+sieve	|1.217.635	|  324.472	|358.761	|108.682	|299.485  	| 94.928	|
+|TOTAL admin     	|  959.099	|  132.861	|292.911	| 47.965	|249.877  	| 42.961	|
 
 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.547	| 46.946	| 17.152	| 14.732	|
-|app.min.css 	| 274.947	| 66.447	| 39.647	| 15.097	| 13.238	|
+|app.css     	| 340.331	| 82.716	| 46.946	| 17.179	| 14.752	|
+|app.min.css 	| 274.947	| 66.591	| 39.647	| 15.129	| 13.259	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 30.278	|       	|  6.902	|  6.012	|
-|admin.min.css	|       	| 24.488	|       	|  6.229	|  5.498	|
+|admin.css    	|       	| 30.388	|       	|  6.929	|  6.020	|
+|admin.min.css	|       	| 24.579	|       	|  6.255	|  5.525	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index d9194d075..2ab180fcb 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -47,6 +47,7 @@ export const
 			let rtf = new Intl.RelativeTimeFormat(doc.documentElement.lang);
 			return rtf.format(seconds, unit);
 		}
+		// Safari < 14
 		abs = Math.abs(seconds);
 		let rtf = rl.relativeTime.long[unit][0 > seconds ? 'past' : 'future'],
 			plural = rl.relativeTime.plural(abs);
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 8f1ab96fb..9d4368467 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.25.0</upstream>.
+This app packages SnappyMail <upstream>2.25.1</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 643fa84b3..be238e58d 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.25.0
+VERSION=2.25.1
 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 3e6d87c8d..f3cbea94c 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.25.0</version>
+	<version>2.25.1</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 c7ee45234..95e6999e8 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.25.0" );
+return ( "2.25.1" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index adc2cbe44..df0ff44ab 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.25.0",
+  "version": "2.25.1",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",