diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 80e90fdbb5..250c19a081 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.4"
+current = "2.27.0"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d37da6608..83b13fa937 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
+## 2.27.0 – 2023-03-14
+
+## Added
+- Unique attachments.zip filename
+  [#992](https://github.com/the-djmaze/snappymail/pull/992)
+- Select next email after (re)move current
+  [#968](https://github.com/the-djmaze/snappymail/pull/968)
+
+## Changed
+- Improved FolderCollection handling
+- MODSEQ requires 64-bit int
+- Update russian language by @Akrobs
+  [#994](https://github.com/the-djmaze/snappymail/pull/994)
+- Don't make font bigger when screen > 1400px
+- Put top menu "accountPlace" inside top-system-dropdown-id
+- Put attachment controls inside attachmentsPlace
+- Show message toolbar on screens > 1400px
+  [#970](https://github.com/the-djmaze/snappymail/pull/970)
+- Chinese updated by @mayswind
+  [#1011](https://github.com/the-djmaze/snappymail/pull/1011)
+- Prevent folder/messages flags conflict by using the right name `attributes` for Folders
+- FolderInformation() use jsonSerialize()
+- Squire space handling on paste use `\u00A0` instead of ` ` for
+  [#1004](https://github.com/the-djmaze/snappymail/pull/1004)
+- Better line-height for QR code
+
+## Fixed
+- Composer src is null
+- Image in Signature disappears in Sent/Draft
+  [#932](https://github.com/the-djmaze/snappymail/pull/932)
+- Mail list is empty
+  [#998](https://github.com/the-djmaze/snappymail/pull/998)
+- Cache handling issues
+  [#1003](https://github.com/the-djmaze/snappymail/pull/1003)
+- No message notification popup when installed in sub-directory
+  [#1007](https://github.com/the-djmaze/snappymail/pull/1007)
+- ERROR: Undefined constant "MailSo\Log\Drivers\STDERR"
+  [#965](https://github.com/the-djmaze/snappymail/pull/965)
+- 'Location:' headers using proper '302 Found' header
+- Can't send email
+  [#1006](https://github.com/the-djmaze/snappymail/pull/1006)
+- Attachment preview
+  [#1005](https://github.com/the-djmaze/snappymail/pull/1005)
+- When decrypt message, subject was replaced empty
+
+### Removed
+- \MailSo\Imap\ImapClient::GetConnectedPort()
+
+### Nextcloud
+- CSS `--panel-bg-clr` was missing
+- SnappyMail Menu under Nextcloud top bar
+  [#1017](https://github.com/the-djmaze/snappymail/pull/1017)
+
+
 ## 2.26.4 – 2023-02-24
 
 ## Added
@@ -62,7 +116,6 @@
 - Unused Squire code
 
 
-
 ## 2.26.2 – 2023-02-17
 
 ## Added
diff --git a/README.md b/README.md
index a5ad4db44a..d2ddae2406 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.971	|
-|app.js          	|4.207.787	|  409.340	|
+|admin.js        	|2.170.153	|   78.985	|
+|app.js          	|4.207.787	|  407.112	|
 |boot.js         	|  868.735	|    4.142	|
-|libs.js         	|  658.812	|  185.881	|
+|libs.js         	|  658.812	|  185.826	|
 |sieve.js         	|        0	|   85.599	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  764.218	|
+|TOTAL           	|8.240.095	|  761.949	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|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	|
+|admin.min.js    	|  256.831	|   38.922	| 73.606	| 13.044	| 60.877  	| 11.689	|
+|app.min.js      	|  515.367	|  185.851	|139.456	| 62.793	|110.485  	| 54.006	|
 |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	|
+|libs.min.js     	|  584.772	|   90.419	|180.901	| 33.579	|155.182  	| 30.112	|
 |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	|  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	|
+|TOTAL user      	|1.217.635	|  278.354	|358.761	| 97.574	|299.485  	| 85.121	|
+|TOTAL user+sieve	|1.217.635	|  319.879	|358.761	|108.009	|299.485  	| 94.522	|
+|TOTAL admin     	|  959.099	|  131.425	|292.911	| 47.825	|249.877  	| 42.804	|
 
 For a user it is around 72% smaller and faster than traditional RainLoop.
 
@@ -189,8 +189,8 @@ 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	| 81.526	| 46.946	| 16.960	| 14.620	|
-|app.min.css 	| 274.947	| 65.398	| 39.647	| 15.032	| 13.119	|
+|app.css     	| 340.331	| 81.459	| 46.946	| 16.976	| 14.618	|
+|app.min.css 	| 274.947	| 65.368	| 39.647	| 15.033	| 13.117	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 30.296	|       	|  6.939	|  6.066	|
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 2734581bf0..609eb073b3 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.26.4</upstream>.
+This app packages SnappyMail <upstream>2.27.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 2ca24fdced..88c0b0bd51 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.4
+VERSION=2.27.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 e3b0394a0e..08ee07b34c 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.4</version>
+	<version>2.27.0</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 92a764869f..16232e20db 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.4" );
+return ( "2.27.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index fb6a2923f8..f4779e2e92 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.4",
+  "version": "2.27.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index 71e08ea4c4..ea0613a845 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.20',
-		RELEASE  = '2023-02-22',
+		VERSION = '2.21',
+		RELEASE  = '2023-03-18',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.25.1';