From 951ba62621d0c351d60ff8b4ee25b3ecee56978b Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 14 Nov 2022 00:16:58 +0100
Subject: [PATCH] v2.21.1

---
 .../files/usr/local/include/application.ini   |  2 +-
 CHANGELOG.md                                  | 33 ++++++++++++++++---
 integrations/cloudron/DESCRIPTION.md          |  2 +-
 integrations/cloudron/Dockerfile              |  2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |  2 +-
 integrations/virtualmin/snappymail.pl         |  2 +-
 package.json                                  |  2 +-
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index 5f32b03d5..3bf3267de 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -289,5 +289,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.21.0"
+current = "2.21.1"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ee38ab90..e52b26952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,31 @@
+## 2.21.1 – 2022-11-13
+
+### Fixed
+- Crypt crashes when Sodium not installed
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+  [#657](https://github.com/the-djmaze/snappymail/pull/657)
+  [#663](https://github.com/the-djmaze/snappymail/pull/663)
+  [#664](https://github.com/the-djmaze/snappymail/pull/664)
+  [#668](https://github.com/the-djmaze/snappymail/pull/668)
+  [#669](https://github.com/the-djmaze/snappymail/pull/669)
+- Personalised favicon not working - default Snappymail favicon showing
+  [#665](https://github.com/the-djmaze/snappymail/pull/665)
+
+### Nextcloud
+- v23 ContentSecurityPolicy versions issue
+  [#666](https://github.com/the-djmaze/snappymail/pull/666)
+
+
 ## 2.21.0 – 2022-11-11
 
 ### Added
 - Put messagelist top bar buttons also in dropdown
-- Allow setting additional Sec-Fetch rules, as discussed by #585
-- Light/Dark favicon.svg #643
-- Allow an account name/label #571
+- Allow setting additional Sec-Fetch rules, as discussed by
+  [#585](https://github.com/the-djmaze/snappymail/pull/585)
+- Light/Dark favicon.svg
+  [#643](https://github.com/the-djmaze/snappymail/pull/643)
+- Allow an account name/label
+  [#571](https://github.com/the-djmaze/snappymail/pull/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -14,12 +35,14 @@
 - New Net/Imap/Smtp/Sieve Settings object system which allows
   setting SSL options per domain and verify_certificate by default
 - Update plugins to use new Net/Imap/Smtp/Sieve Settings object
-- Removed message double-click to full screen #638
+- Removed message double-click to full screen
+  [#638](https://github.com/the-djmaze/snappymail/pull/638)
 
 ### Fixed
 - ldap-identities-plugin by @cm-schl
   [#647](https://github.com/the-djmaze/snappymail/pull/647)
-- OpenSSL v3 ciphers issue #641
+- OpenSSL v3 ciphers issue
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 7bd7656a2..a86230c55 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.21.0</upstream>.
+This app packages SnappyMail <upstream>2.21.1</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 1ba785ff4..29eeb6b3f 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.21.0
+VERSION=2.21.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 3cdfae09a..fc49e08c9 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.21.0</version>
+	<version>2.21.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 2a5c06cc7..dead7cb11 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.21.0" );
+return ( "2.21.1" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 26826a637..9b324fde3 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.21.0",
+  "version": "2.21.1",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",