diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 989b91714..d33cfe656 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.27.3"
+current = "2.28.0"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f4fcfed2..b0865e5b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,47 @@
+## 2.28.0 – 2023-05-30
+
+## Added
+- Threaded view make number orange when unread sub-messages #1028
+- Handle PHP pctnl messages
+- addEventListener('rl-view-model') missing for Settings #1013
+- CSS `--btn-border-radius`
+
+## Changed
+- Improved RTL languages support #1056
+- Composer text/attachments as tabs #1119
+- Filter dialog doesn't refer to folder names consistently #1111
+- TLS connection for MYSQL contact db #1078
+- Allow empty message body when there are attachments #1052
+- PHP inherit logger as Trait
+- Update Portuguese by @ner00 #1124
+- Update Traditional Chinese (Taiwan) by @chiyi4488 #1107
+- Update Russian by @konkere #1108
+- Update Italian by @cm-schl #1094
+- Update French by @hguilbert #1102
+- Update German by @cm-schl #1087
+
+## Fixed
+- Show messagelist timeout/abort error for #1071
+- DesktopNotifications setting not saved #1137
+- PHP Deprecation warning for $_openPipes #1141
+- Images size wrong #1134
+- Unable to preview body of encrypted mail in mailvelope reply-to #1130
+- Replace `<button>` in HTML message with innerHTML instead of remove #1125
+- Mailvelope failed #1126
+- Tabs labels row height
+- Selecting not yet existing filter throws error message instead of opening edit box #1104
+- JavaScript Squire `node is null` error
+- Config/Application.php: array_rand(): Argument #1 cannot be empty #1123
+- Pressing Enter in Add Filter dialog results in "Leave page?" prompt #1112
+- Issue with certain Amazon emails #1086
+- HTML font 8px and 10px issue #1082
+- Exception when executed on command line on the first-time #1085
+- Folders missing pagination #1070
+- Nextcloud WYSIWYG button style #1138
+- Nextcloud .btn-group > .btn layout
+- Nextcloud Bulleted items do not show the bullets in the preview window. #1117
+- Nextcloud Contacts integration #1083
+
 ## 2.27.3 – 2023-04-04
 
 ## Added
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 51cfb8643..78436f62d 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.27.3</upstream>.
+This app packages SnappyMail <upstream>2.28.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index a5000429a..6884236c6 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.27.3
+VERSION=2.28.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 b44a476c5..96a995eeb 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.27.3</version>
+	<version>2.28.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 bef049f85..2198b4d4a 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.27.3" );
+return ( "2.28.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 39e6e67bf..6c34da3c5 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.27.3",
+  "version": "2.28.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",