From fb319c356df83c7307f78b6ae88071f91525e78e Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 30 Dec 2022 20:43:04 +0100
Subject: [PATCH] v2.24.4

---
 .../files/usr/local/include/application.ini   |  2 +-
 CHANGELOG.md                                  | 21 ++++++++++++++++++-
 README.md                                     | 16 +++++++-------
 integrations/cloudron/DESCRIPTION.md          |  2 +-
 integrations/cloudron/Dockerfile              |  2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |  2 +-
 integrations/virtualmin/snappymail.pl         |  2 +-
 package.json                                  |  2 +-
 plugins/kolab/index.php                       |  2 +-
 9 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index f4c7fee31..bce5d0f3e 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -305,5 +305,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.24.3"
+current = "2.24.4"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 227e47d6d..4d0457f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,28 @@
+## 2.24.4 – 2022-12-30
+
+## Added
+- Check PHP_INT_SIZE if SnappyMail runs on 64bit
+
+## Changed
+- A lot of MessageList sorting improvements
+  [#796](https://github.com/the-djmaze/snappymail/pull/796)
+- On upgrade also update plugins in Nextcloud due to many misunderstandings and prevent invalid open issues
+- Moved application.ini labs.use_app_debug_* to debug.*
+
+## Fixed
+- Dutch translation for confusing message (threads vs grouped)
+- Workaround Nextcloud disallowed .htaccess
+  [#790](https://github.com/the-djmaze/snappymail/pull/790)
+- Searching on Nextcloud search failed
+  [#787](https://github.com/the-djmaze/snappymail/pull/787)
+
+
 ## 2.24.3 – 2022-12-28
 
 ## Changed
 - When sorting on FROM also sort on REVERSE DATE
 
-## Bugfixes
+## Fixed
 - F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
   [#800](https://github.com/the-djmaze/snappymail/pull/800)
 - Switching accounts does not work anymore with 2.24.2
diff --git a/README.md b/README.md
index 89902e821..09d9b3059 100644
--- a/README.md
+++ b/README.md
@@ -141,26 +141,26 @@ RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   82.190	|
-|app.js          	|4.207.787	|  412.127	|
+|admin.js        	|2.170.153	|   82.149	|
+|app.js          	|4.207.787	|  412.196	|
 |boot.js         	|  868.735	|    2.427	|
 |libs.js         	|  658.812	|  191.117	|
 |sieve.js         	|        0	|   86.018	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  774.164	|
+|TOTAL           	|8.240.095	|  774.192	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.879	| 73.606	| 13.468	| 60.877  	| 12.077	|
-|app.min.js      	|  515.367	|  189.931	|139.456	| 63.444	|110.485  	| 54.381	|
+|admin.min.js    	|  256.831	|   40.838	| 73.606	| 13.444	| 60.877  	| 12.045	|
+|app.min.js      	|  515.367	|  189.971	|139.456	| 63.463	|110.485  	| 54.430	|
 |boot.min.js     	|   84.659	|    1.518	| 26.998	|    919	| 23.643  	|    747	|
 |libs.min.js     	|  584.772	|   90.689	|180.901	| 33.597	|155.182  	| 30.118	|
 |sieve.min.js     	|        0	|   41.909	|      0	| 10.476	|      0  	|  9.461	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  282.138	|358.761	| 97.960	|299.485  	| 85.246	|
-|TOTAL user+sieve	|1.217.635	|  324.047	|358.761	|108.436	|299.485  	| 94.707	|
-|TOTAL admin     	|  959.099	|  133.086	|292.911	| 47.984	|249.877  	| 42.942	|
+|TOTAL user      	|1.217.635	|  282.178	|358.761	| 97.979	|299.485  	| 85.295	|
+|TOTAL user+sieve	|1.217.635	|  324.087	|358.761	|108.455	|299.485  	| 94.756	|
+|TOTAL admin     	|  959.099	|  133.045	|292.911	| 47.960	|249.877  	| 42.910	|
 
 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 9b5cfcc75..396d1936b 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.24.3</upstream>.
+This app packages SnappyMail <upstream>2.24.4</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 867f65d76..960643234 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.24.3
+VERSION=2.24.4
 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 be5a6ac02..373e30d55 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.24.3</version>
+	<version>2.24.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/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 2b6f94a61..1b5fa901d 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.24.3" );
+return ( "2.24.4" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 9bcc581da..1222c28db 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.24.3",
+  "version": "2.24.4",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/kolab/index.php b/plugins/kolab/index.php
index 6ab546862..fbabcedc8 100644
--- a/plugins/kolab/index.php
+++ b/plugins/kolab/index.php
@@ -8,7 +8,7 @@ class KolabPlugin extends \RainLoop\Plugins\AbstractPlugin
 		RELEASE  = '2022-12-30',
 		CATEGORY = 'Contacts',
 		DESCRIPTION = 'Use an Address Book of Kolab.',
-		REQUIRED = '2.23.0';
+		REQUIRED = '2.24.4';
 
 	public function Init() : void
 	{