diff --git a/CHANGELOG.md b/CHANGELOG.md
index 792af7a39..098763946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
 ## 2.20.3 – 2022-11-07
 
 ### Added
@@ -23,6 +35,25 @@
   [#635](https://github.com/the-djmaze/snappymail/issues/635)
 
 
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
 ## 2.20.1 – 2022-11-04
 
 ### Added
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 366252239..53b59635a 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.20.3</version>
+	<version>2.20.4</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/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 57837ec0c..459ba4325 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -27,12 +27,6 @@ class PageController extends Controller
 			}
 		}
 
-		$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
-		if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
-			exit('SnappyMail does not work in this browser due to a <a href="https://github.com/the-djmaze/snappymail/issues/633">bug in Nextcloud</a>.
-				<br/>You must <a href="../../settings/admin/additional">turn on iframe mode</a>');
-		}
-
 		if (!$bAdmin && $config->getAppValue('snappymail', 'snappymail-no-embed')) {
 			\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
 			\OCP\Util::addScript('snappymail', 'snappymail');
@@ -48,6 +42,12 @@ class PageController extends Controller
 			return $response;
 		}
 
+		$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
+		if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
+			exit('SnappyMail does not work in this browser due to a <a href="https://github.com/the-djmaze/snappymail/issues/633">bug in Nextcloud</a>.
+				<br/>You must <a href="../../settings/admin/additional">turn on iframe mode</a>');
+		}
+
 		\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
 
 		\OCP\Util::addStyle('snappymail', 'embed');