diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index d1c88f368..8a723bee3 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -290,5 +290,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.19.6"
+current = "2.19.7"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/README.md b/README.md
index ba38eef0b..51e89da8a 100644
--- a/README.md
+++ b/README.md
@@ -141,24 +141,24 @@ RainLoop 1.17 vs SnappyMail
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
 |admin.js        	|2.170.153	|   81.545	|
-|app.js          	|4.207.787	|  405.510	|
+|app.js          	|4.207.787	|  406.005	|
 |boot.js         	|  868.735	|    2.050	|
 |libs.js         	|  658.812	|  192.965	|
 |sieve.js         	|        0	|   86.121	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  768.476	|
+|TOTAL           	|8.240.095	|  768.971	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
 |admin.min.js    	|  256.831	|   40.255	| 73.606	| 13.435	| 60.877  	| 12.047	|
-|app.min.js      	|  515.367	|  187.781	|139.456	| 62.426	|110.485  	| 53.504	|
+|app.min.js      	|  515.367	|  188.025	|139.456	| 62.523	|110.485  	| 53.638	|
 |boot.min.js     	|   84.659	|    1.252	| 26.998	|    778	| 23.643  	|    628	|
 |libs.min.js     	|  584.772	|   92.055	|180.901	| 34.113	|155.182  	| 30.641	|
 |sieve.min.js     	|        0	|   41.926	|      0	| 10.484	|      0  	|  9.451	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  281.088	|358.761	| 97.317	|299.485  	| 84.773	|
-|TOTAL user+sieve	|1.217.635	|  323.014	|358.761	|107.801	|299.485  	| 94.224	|
+|TOTAL user      	|1.217.635	|  281.332	|358.761	| 97.414	|299.485  	| 84.907	|
+|TOTAL user+sieve	|1.217.635	|  323.258	|358.761	|107.898	|299.485  	| 94.358	|
 |TOTAL admin     	|  959.099	|  133.562	|292.911	| 48.326	|249.877  	| 43.316	|
 
 For a user its around 70% smaller and faster than traditional RainLoop.
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index ebb05c0b7..4fc9c5fc6 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.19.6</upstream>.
+This app packages SnappyMail <upstream>2.19.7</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 80ff1c20d..27eb9b546 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.19.6
+VERSION=2.19.7
 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/app/include.php b/integrations/nextcloud/snappymail/app/include.php
index 56e342f36..aea7ffe6a 100644
--- a/integrations/nextcloud/snappymail/app/include.php
+++ b/integrations/nextcloud/snappymail/app/include.php
@@ -27,7 +27,7 @@
 /**
  * Custom 'data' folder path
  */
-if (!empty($_ENV['SNAPPYMAIL_NEXTCLOUD'])) {
+if (class_exists('OC')) {
 	define('APP_DATA_FOLDER_PATH', \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
 } else {
 	http_response_code(400);
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index ea8c9ca9a..d99193b3c 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.19.6</version>
+	<version>2.19.7</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 4ab717f34..c94811b03 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.19.6" );
+return ( "2.19.7" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 1dee795c1..4293d31cf 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.19.6",
+  "version": "2.19.7",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",