diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 9024a6dca..a0c5dda95 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.28.1"
+current = "2.28.2"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43ebe90bf..96dc9b507 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## 2.28.2 – 2023-06-19
+
+## Added
+- Detailed error for "Cannot access the repository at the moment"
+  [#1164](https://github.com/the-djmaze/snappymail/pull/1164)
+- Bidi in Squire editor
+  [#1158](https://github.com/the-djmaze/snappymail/pull/1158)
+- Translate Squire UI
+- Nextcloud 27 compatibility by @LarsBel
+- JWT class for handling JSON Web Tokens
+
+## Changed
+- Update German by @cm-schl
+- Update French by @hguilbert
+- Update Polish by @tinola
+- Merge handling of local Account Settings. Found while investigating
+  [#1170](https://github.com/the-djmaze/snappymail/pull/1170)
+- Image max-width now 100% instead of 90vw
+
+## Fixed
+- Cannot modify header information
+  [#929](https://github.com/the-djmaze/snappymail/pull/929) (comment)
+- Admin Panel broken when admin_panel_host is set
+  [#1169](https://github.com/the-djmaze/snappymail/pull/1169)
+- Invalid CSP report-uri
+- Prevent MessageList multiple request at the same time
+  [#1071](https://github.com/the-djmaze/snappymail/pull/1071)
+- Error in Addressbook Sync
+  [#1179](https://github.com/the-djmaze/snappymail/pull/1179)
+- base64_decode() second parameter must be true
+
+
 ## 2.28.1 – 2023-06-05
 
 ## Changed
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index f86114e1b..40c72039d 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.28.1</upstream>.
+This app packages SnappyMail <upstream>2.28.2</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 77421b1ce..725466040 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.28.1
+VERSION=2.28.2
 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 16af8418e..4941b0d0e 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.28.1</version>
+	<version>2.28.2</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 8fb0cae9e..28a39260a 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.28.1" );
+return ( "2.28.2" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 52d5d8105..d39e9b69e 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.28.1",
+  "version": "2.28.2",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",