From 2094e3965bf26452ec20cad4dd6827b38379437a Mon Sep 17 00:00:00 2001
From: HeySora <contact@heysora.net>
Date: Wed, 16 Jul 2025 12:52:38 +0200
Subject: [PATCH 01/17] Fix docker command syntax

---
 cli/release.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/release.php b/cli/release.php
index aac915b02..847dd14e2 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -244,7 +244,7 @@ else if ($options['docker']) {
 	$zip_filename = "snappymail-{$package->version}.zip";
 	copy($zip_destination, "./.docker/release/{$zip_filename}");
 	if ($docker) {
-		passthru("{$docker} build --pull " . ROOT_DIR . "/.docker/release/ --build-arg FILES_ZIP={$zip_filename} -t snappymail:{$package->version}");
+		passthru("{$docker} build --pull -f " . ROOT_DIR . '/.docker/release/Dockerfile ' . ROOT_DIR . " --build-arg FILES_ZIP={$zip_filename} -t snappymail:{$package->version}");
 	} else {
 		echo "Docker not installed!\n";
 	}

From c95f5fcf9878619da4fcc1afea6a83c9df5747cb Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Wed, 8 Oct 2025 02:50:09 +0200
Subject: [PATCH 02/17] Nextcloud 32+ compatibility

adds NC32+ compatibility workaround
src & credits go to: https://github.com/the-djmaze/snappymail/issues/1994#issuecomment-3366086651
---
 .../snappymail/lib/Controller/PageController.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 7744cb4fc..469d6fb26 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -8,6 +8,12 @@ use OCA\SnappyMail\ContentSecurityPolicy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 
+// SnappyMail Nextcoud 32 compatibility workaound - START
+// src: https://github.com/the-djmaze/snappymail/issues/1994#issuecomment-3366086651
+
+use OCP\INavigationManager;  // <<<<<<<<<<<< add this 
+use OCP\Server; // <<<<<<<<<<<< add this 
+
 class PageController extends Controller
 {
 	/**
@@ -17,7 +23,7 @@ class PageController extends Controller
 	public function index()
 	{
 		$config = \OC::$server->getConfig();
-
+        $nav = Server::get(INavigationManager::class);  // <<<<<<<<<<<< add this 
 		$bAdmin = false;
 		if (!empty($_SERVER['QUERY_STRING'])) {
 			SnappyMailHelper::loadApp();
@@ -28,7 +34,8 @@ class PageController extends Controller
 		}
 
 		if (!$bAdmin && $config->getAppValue('snappymail', 'snappymail-no-embed')) {
-			\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
+            // \OC::$server->getNavigationManager()->setActiveEntry('snappymail'); // <<<<<<<<<<<< Comment this
+            $nav->setActiveEntry('snappymail');  // <<<<<<<<<<<< add this 
 			\OCP\Util::addScript('snappymail', 'snappymail');
 			\OCP\Util::addStyle('snappymail', 'style');
 			SnappyMailHelper::startApp();
@@ -43,7 +50,10 @@ class PageController extends Controller
 			return $response;
 		}
 
-		\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
+		// \OC::$server->getNavigationManager()->setActiveEntry('snappymail'); // <<<<<<<<<<<< Comment this
+        $nav->setActiveEntry('snappymail');  // <<<<<<<<<<<< add this
+
+// SnappyMail Nextcoud 32 compatibility workaound - END
 
 		\OCP\Util::addStyle('snappymail', 'embed');
 

From 2548ed59da7ccc5aa9343e74b045e66974ad40f1 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 15:11:52 +0000
Subject: [PATCH 03/17] Fix PHP 8.4 implicit nullable parameter deprecations in
 Predis library

PHP 8.4 deprecates implicitly nullable parameter types. Parameters with a default value of `null` must now be explicitly marked as nullable (e.g., `?Type $var = null`).

This change updates the vendored `Predis` library in `plugins/cache-redis/` to comply with this requirement. It scans for function signatures like `Type $var = null` and updates them to `?Type $var = null`. This ensures compatibility with PHP 8.4 and PHP 8.5 while maintaining backward compatibility.

Affected files include `Predis` interfaces, connection classes, and command definitions.
Also updated PHPDoc `@method` annotations to reflect nullable types.
---
 .../Predis/ClientContextInterface.php         | 30 +++++++-------
 .../cache-redis/Predis/ClientInterface.php    | 40 +++++++++----------
 .../Predis/Cluster/PredisStrategy.php         |  2 +-
 .../Predis/Cluster/RedisStrategy.php          |  2 +-
 .../Redis/Container/FunctionContainer.php     |  4 +-
 .../Strategy/SubcommandStrategyResolver.php   |  2 +-
 .../Predis/CommunicationException.php         |  2 +-
 .../Predis/Configuration/Options.php          |  2 +-
 .../Connection/Cluster/PredisCluster.php      |  2 +-
 .../Connection/Cluster/RedisCluster.php       |  4 +-
 .../Connection/CompositeStreamConnection.php  |  2 +-
 .../Predis/Connection/RelayMethods.php        |  4 +-
 .../Replication/MasterSlaveReplication.php    |  2 +-
 .../Replication/SentinelReplication.php       |  2 +-
 .../Text/CompositeProtocolProcessor.php       |  4 +-
 15 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/plugins/cache-redis/Predis/ClientContextInterface.php b/plugins/cache-redis/Predis/ClientContextInterface.php
index e443ee5d1..d6cb74512 100644
--- a/plugins/cache-redis/Predis/ClientContextInterface.php
+++ b/plugins/cache-redis/Predis/ClientContextInterface.php
@@ -65,8 +65,8 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this randomkey()
  * @method $this rename($key, $target)
  * @method $this renamenx($key, $target)
- * @method $this scan($cursor, array $options = null)
- * @method $this sort($key, array $options = null)
+ * @method $this scan($cursor, ?array $options = null)
+ * @method $this sort($key, ?array $options = null)
  * @method $this sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
  * @method $this ttl($key)
  * @method $this type($key)
@@ -163,7 +163,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this hmget($key, array $fields)
  * @method $this hmset($key, array $dictionary)
  * @method $this hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method $this hscan($key, $cursor, array $options = null)
+ * @method $this hscan($key, $cursor, ?array $options = null)
  * @method $this hset($key, $field, $value)
  * @method $this hsetnx($key, $field, $value)
  * @method $this hvals($key)
@@ -225,7 +225,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this spop($key, $count = null)
  * @method $this srandmember($key, $count = null)
  * @method $this srem($key, $member)
- * @method $this sscan($key, $cursor, array $options = null)
+ * @method $this sscan($key, $cursor, ?array $options = null)
  * @method $this sunion(array|string $keys)
  * @method $this sunionstore($destination, array|string $keys)
  * @method $this tdigestadd(string $key, float ...$value)
@@ -255,7 +255,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
  * @method $this tsdel(string $key, int $fromTimestamp, int $toTimestamp)
  * @method $this tsdeleterule(string $sourceKey, string $destKey)
- * @method $this tsget(string $key, GetArguments $arguments = null)
+ * @method $this tsget(string $key, ?GetArguments $arguments = null)
  * @method $this tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
  * @method $this tsinfo(string $key, ?InfoArguments $arguments = null)
  * @method $this tsmadd(mixed ...$keyTimestampValue)
@@ -277,22 +277,22 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this zmpop(array $keys, string $modifier = 'min', int $count = 1)
  * @method $this zmscore(string $key, string ...$member)
  * @method $this zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method $this zrange($key, $start, $stop, array $options = null)
- * @method $this zrangebyscore($key, $min, $max, array $options = null)
+ * @method $this zrange($key, $start, $stop, ?array $options = null)
+ * @method $this zrangebyscore($key, $min, $max, ?array $options = null)
  * @method $this zrangestore(string $destination, string $source, int|string $min, string|int $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
  * @method $this zrank($key, $member)
  * @method $this zrem($key, $member)
  * @method $this zremrangebyrank($key, $start, $stop)
  * @method $this zremrangebyscore($key, $min, $max)
- * @method $this zrevrange($key, $start, $stop, array $options = null)
- * @method $this zrevrangebyscore($key, $max, $min, array $options = null)
+ * @method $this zrevrange($key, $start, $stop, ?array $options = null)
+ * @method $this zrevrangebyscore($key, $max, $min, ?array $options = null)
  * @method $this zrevrank($key, $member)
  * @method $this zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
  * @method $this zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
  * @method $this zscore($key, $member)
- * @method $this zscan($key, $cursor, array $options = null)
- * @method $this zrangebylex($key, $start, $stop, array $options = null)
- * @method $this zrevrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zscan($key, $cursor, ?array $options = null)
+ * @method $this zrangebylex($key, $start, $stop, ?array $options = null)
+ * @method $this zrevrangebylex($key, $start, $stop, ?array $options = null)
  * @method $this zremrangebylex($key, $min, $max)
  * @method $this zlexcount($key, $min, $max)
  * @method $this pexpiretime(string $key)
@@ -312,7 +312,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
  * @method $this evalsha_ro(string $sha1, array $keys, ...$argument)
  * @method $this script($subcommand, $argument = null)
- * @method $this shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method $this shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
  * @method $this auth($password)
  * @method $this echo($message)
  * @method $this ping($message = null)
@@ -335,8 +335,8 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this geohash($key, array $members)
  * @method $this geopos($key, array $members)
  * @method $this geodist($key, $member1, $member2, $unit = null)
- * @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
+ * @method $this georadius($key, $longitude, $latitude, $radius, $unit, ?array $options = null)
+ * @method $this georadiusbymember($key, $member, $radius, $unit, ?array $options = null)
  * @method $this geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
  * @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
diff --git a/plugins/cache-redis/Predis/ClientInterface.php b/plugins/cache-redis/Predis/ClientInterface.php
index 2937c5804..e7edb9750 100644
--- a/plugins/cache-redis/Predis/ClientInterface.php
+++ b/plugins/cache-redis/Predis/ClientInterface.php
@@ -74,8 +74,8 @@ use Predis\Response\Status;
  * @method string|null       randomkey()
  * @method mixed             rename(string $key, string $target)
  * @method int               renamenx(string $key, string $target)
- * @method array             scan($cursor, array $options = null)
- * @method array             sort(string $key, array $options = null)
+ * @method array             scan($cursor, ?array $options = null)
+ * @method array             sort(string $key, ?array $options = null)
  * @method array             sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
  * @method int               ttl(string $key)
  * @method mixed             type(string $key)
@@ -172,7 +172,7 @@ use Predis\Response\Status;
  * @method array             hmget(string $key, array $fields)
  * @method mixed             hmset(string $key, array $dictionary)
  * @method array             hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method array             hscan(string $key, $cursor, array $options = null)
+ * @method array             hscan(string $key, $cursor, ?array $options = null)
  * @method int               hset(string $key, string $field, string $value)
  * @method int               hsetnx(string $key, string $field, string $value)
  * @method array             hvals(string $key)
@@ -231,10 +231,10 @@ use Predis\Response\Status;
  * @method string[]          smembers(string $key)
  * @method array             smismember(string $key, string ...$members)
  * @method int               smove(string $source, string $destination, string $member)
- * @method string|array|null spop(string $key, int $count = null)
- * @method string|null       srandmember(string $key, int $count = null)
+ * @method string|array|null spop(string $key, ?int $count = null)
+ * @method string|null       srandmember(string $key, ?int $count = null)
  * @method int               srem(string $key, array|string $member)
- * @method array             sscan(string $key, int $cursor, array $options = null)
+ * @method array             sscan(string $key, int $cursor, ?array $options = null)
  * @method string[]          sunion(array|string $keys)
  * @method int               sunionstore(string $destination, array|string $keys)
  * @method int               touch(string[]|string $keyOrKeys, string ...$keys = null)
@@ -265,7 +265,7 @@ use Predis\Response\Status;
  * @method int               tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
  * @method int               tsdel(string $key, int $fromTimestamp, int $toTimestamp)
  * @method Status            tsdeleterule(string $sourceKey, string $destKey)
- * @method array             tsget(string $key, GetArguments $arguments = null)
+ * @method array             tsget(string $key, ?GetArguments $arguments = null)
  * @method int               tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
  * @method array             tsinfo(string $key, ?InfoArguments $arguments = null)
  * @method array             tsmadd(mixed ...$keyTimestampValue)
@@ -275,12 +275,12 @@ use Predis\Response\Status;
  * @method array             tsqueryindex(string ...$filterExpression)
  * @method array             tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
  * @method array             tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
- * @method string            xadd(string $key, array $dictionary, string $id = '*', array $options = null)
+ * @method string            xadd(string $key, array $dictionary, string $id = '*', ?array $options = null)
  * @method int               xdel(string $key, string ...$id)
  * @method int               xlen(string $key)
  * @method array             xrevrange(string $key, string $end, string $start, ?int $count = null)
  * @method array             xrange(string $key, string $start, string $end, ?int $count = null)
- * @method string            xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
+ * @method string            xtrim(string $key, array|string $strategy, string $threshold, ?array $options = null)
  * @method int               zadd(string $key, array $membersAndScoresDictionary)
  * @method int               zcard(string $key)
  * @method string            zcount(string $key, int|string $min, int|string $max)
@@ -295,22 +295,22 @@ use Predis\Response\Status;
  * @method array             zpopmin(string $key, int $count = 1)
  * @method array             zpopmax(string $key, int $count = 1)
  * @method mixed             zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method array             zrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array             zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
+ * @method array             zrange(string $key, int|string $start, int|string $stop, ?array $options = null)
+ * @method array             zrangebyscore(string $key, int|string $min, int|string $max, ?array $options = null)
  * @method int               zrangestore(string $destination, string $source, int|string $min, int|string $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
  * @method int|null          zrank(string $key, string $member)
  * @method int               zrem(string $key, string ...$member)
  * @method int               zremrangebyrank(string $key, int|string $start, int|string $stop)
  * @method int               zremrangebyscore(string $key, int|string $min, int|string $max)
- * @method array             zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
+ * @method array             zrevrange(string $key, int|string $start, int|string $stop, ?array $options = null)
+ * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, ?array $options = null)
  * @method int|null          zrevrank(string $key, string $member)
  * @method array             zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
  * @method int               zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
  * @method string|null       zscore(string $key, string $member)
- * @method array             zscan(string $key, int $cursor, array $options = null)
- * @method array             zrangebylex(string $key, string $start, string $stop, array $options = null)
- * @method array             zrevrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method array             zscan(string $key, int $cursor, ?array $options = null)
+ * @method array             zrangebylex(string $key, string $start, string $stop, ?array $options = null)
+ * @method array             zrevrangebylex(string $key, string $start, string $stop, ?array $options = null)
  * @method int               zremrangebylex(string $key, string $min, string $max)
  * @method int               zlexcount(string $key, string $min, string $max)
  * @method int               pexpiretime(string $key)
@@ -330,10 +330,10 @@ use Predis\Response\Status;
  * @method mixed             evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
  * @method mixed             evalsha_ro(string $sha1, array $keys, ...$argument)
  * @method mixed             script($subcommand, $argument = null)
- * @method Status            shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method Status            shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
  * @method mixed             auth(string $password)
  * @method string            echo(string $message)
- * @method mixed             ping(string $message = null)
+ * @method mixed             ping(?string $message = null)
  * @method mixed             select(int $database)
  * @method mixed             bgrewriteaof()
  * @method mixed             bgsave()
@@ -353,8 +353,8 @@ use Predis\Response\Status;
  * @method array             geohash(string $key, array $members)
  * @method array             geopos(string $key, array $members)
  * @method string|null       geodist(string $key, $member1, $member2, $unit = null)
- * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method array             georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
+ * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, ?array $options = null)
+ * @method array             georadiusbymember(string $key, $member, $radius, $unit, ?array $options = null)
  * @method array             geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
  * @method int               geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
diff --git a/plugins/cache-redis/Predis/Cluster/PredisStrategy.php b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
index 574b86f9e..04f31b117 100644
--- a/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
@@ -25,7 +25,7 @@ class PredisStrategy extends ClusterStrategy
     /**
      * @param DistributorInterface $distributor Optional distributor instance.
      */
-    public function __construct(DistributorInterface $distributor = null)
+    public function __construct(?DistributorInterface $distributor = null)
     {
         parent::__construct();
 
diff --git a/plugins/cache-redis/Predis/Cluster/RedisStrategy.php b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
index 8ae5c0f5e..dadf782ed 100644
--- a/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
@@ -27,7 +27,7 @@ class RedisStrategy extends ClusterStrategy
     /**
      * @param HashGeneratorInterface $hashGenerator Hash generator instance.
      */
-    public function __construct(HashGeneratorInterface $hashGenerator = null)
+    public function __construct(?HashGeneratorInterface $hashGenerator = null)
     {
         parent::__construct();
 
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
index 8f2a673d1..dfa309eea 100644
--- a/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
@@ -19,9 +19,9 @@ use Predis\Response\Status;
  * @method string dump()
  * @method Status flush(?string $mode = null)
  * @method Status kill()
- * @method array  list(string $libraryNamePattern = null, bool $withCode = false)
+ * @method array  list(?string $libraryNamePattern = null, bool $withCode = false)
  * @method string load(string $functionCode, bool $replace = 'false')
- * @method Status restore(string $value, string $policy = null)
+ * @method Status restore(string $value, ?string $policy = null)
  * @method array  stats()
  */
 class FunctionContainer extends AbstractContainer
diff --git a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
index cda84268e..b714d5276 100644
--- a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
+++ b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
@@ -23,7 +23,7 @@ class SubcommandStrategyResolver implements StrategyResolverInterface
      */
     private $separator;
 
-    public function __construct(string $separator = null)
+    public function __construct(?string $separator = null)
     {
         $this->separator = $separator;
     }
diff --git a/plugins/cache-redis/Predis/CommunicationException.php b/plugins/cache-redis/Predis/CommunicationException.php
index 0fc7c07a6..9fd69a021 100644
--- a/plugins/cache-redis/Predis/CommunicationException.php
+++ b/plugins/cache-redis/Predis/CommunicationException.php
@@ -32,7 +32,7 @@ abstract class CommunicationException extends PredisException
         NodeConnectionInterface $connection,
         $message = '',
         $code = 0,
-        Exception $innerException = null
+        ?Exception $innerException = null
     ) {
         parent::__construct(
             is_null($message) ? '' : $message,
diff --git a/plugins/cache-redis/Predis/Configuration/Options.php b/plugins/cache-redis/Predis/Configuration/Options.php
index 3fff04129..3cad8e951 100644
--- a/plugins/cache-redis/Predis/Configuration/Options.php
+++ b/plugins/cache-redis/Predis/Configuration/Options.php
@@ -43,7 +43,7 @@ class Options implements OptionsInterface
     /**
      * @param array $options Named array of client options
      */
-    public function __construct(array $options = null)
+    public function __construct(?array $options = null)
     {
         $this->input = $options ?? [];
     }
diff --git a/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
index c30fd09d3..a65e665f5 100644
--- a/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
@@ -52,7 +52,7 @@ class PredisCluster implements ClusterInterface, IteratorAggregate, Countable
     /**
      * @param StrategyInterface $strategy Optional cluster strategy.
      */
-    public function __construct(StrategyInterface $strategy = null)
+    public function __construct(?StrategyInterface $strategy = null)
     {
         $this->strategy = $strategy ?: new PredisStrategy();
         $this->distributor = $this->strategy->getDistributor();
diff --git a/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
index 7f3013c17..6e7a90239 100644
--- a/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
@@ -70,7 +70,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
      */
     public function __construct(
         FactoryInterface $connections,
-        StrategyInterface $strategy = null
+        ?StrategyInterface $strategy = null
     ) {
         $this->connections = $connections;
         $this->strategy = $strategy ?: new RedisClusterStrategy();
@@ -273,7 +273,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
      *
      * @param NodeConnectionInterface $connection Optional connection instance.
      */
-    public function askSlotMap(NodeConnectionInterface $connection = null)
+    public function askSlotMap(?NodeConnectionInterface $connection = null)
     {
         if (!$connection && !$connection = $this->getRandomConnection()) {
             return;
diff --git a/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
index ad69cbc12..431663cae 100644
--- a/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
+++ b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
@@ -31,7 +31,7 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
      */
     public function __construct(
         ParametersInterface $parameters,
-        ProtocolProcessorInterface $protocol = null
+        ?ProtocolProcessorInterface $protocol = null
     ) {
         $this->parameters = $this->assertParameters($parameters);
         $this->protocol = $protocol ?: new TextProtocolProcessor();
diff --git a/plugins/cache-redis/Predis/Connection/RelayMethods.php b/plugins/cache-redis/Predis/Connection/RelayMethods.php
index a52c4a035..d59dd41f2 100644
--- a/plugins/cache-redis/Predis/Connection/RelayMethods.php
+++ b/plugins/cache-redis/Predis/Connection/RelayMethods.php
@@ -32,7 +32,7 @@ trait RelayMethods
      * @param  string   $pattern
      * @return bool
      */
-    public function onInvalidated(?callable $callback, string $pattern = null)
+    public function onInvalidated(?callable $callback, ?string $pattern = null)
     {
         return $this->client->onInvalidated($callback, $pattern);
     }
@@ -129,7 +129,7 @@ trait RelayMethods
      * @param  ?int    $db
      * @return bool
      */
-    public function flushMemory(string $endpointId = null, int $db = null)
+    public function flushMemory(?string $endpointId = null, ?int $db = null)
     {
         return $this->client->flushMemory($endpointId, $db);
     }
diff --git a/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
index 9d57a5ac3..31897ed3e 100644
--- a/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
+++ b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
@@ -72,7 +72,7 @@ class MasterSlaveReplication implements ReplicationInterface
     /**
      * {@inheritdoc}
      */
-    public function __construct(ReplicationStrategy $strategy = null)
+    public function __construct(?ReplicationStrategy $strategy = null)
     {
         $this->strategy = $strategy ?: new ReplicationStrategy();
     }
diff --git a/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
index 14dbe2758..146254e88 100644
--- a/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
+++ b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
@@ -123,7 +123,7 @@ class SentinelReplication implements ReplicationInterface
         $service,
         array $sentinels,
         ConnectionFactoryInterface $connectionFactory,
-        ReplicationStrategy $strategy = null
+        ?ReplicationStrategy $strategy = null
     ) {
         $this->sentinels = $sentinels;
         $this->service = $service;
diff --git a/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
index 3f7df02e5..19494c05d 100644
--- a/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
@@ -41,8 +41,8 @@ class CompositeProtocolProcessor implements ProtocolProcessorInterface
      * @param ResponseReaderInterface    $reader     Response reader.
      */
     public function __construct(
-        RequestSerializerInterface $serializer = null,
-        ResponseReaderInterface $reader = null
+        ?RequestSerializerInterface $serializer = null,
+        ?ResponseReaderInterface $reader = null
     ) {
         $this->setRequestSerializer($serializer ?: new RequestSerializer());
         $this->setResponseReader($reader ?: new ResponseReader());

From 11ac1fe1abff0007eaa3130a9d4e387d74397c2a Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Fri, 16 Jan 2026 23:31:35 +0100
Subject: [PATCH 04/17] Update docker.yml

modify repo
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b957e2fc8..4115ffce9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          djmaze/snappymail
+          nextgen-networks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=branch generates tag(s) on branch only. E.g. 'master', 'master-abc0123'
         # type=ref,event=tag generates tag(s) on tags only. E.g. 'v0.0.0', 'v0.0.0-abc0123', and 'latest'

From dbf2a26760778801bd732467460ac78dd9925e5a Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Fri, 16 Jan 2026 23:33:14 +0100
Subject: [PATCH 05/17] Update docker-pr.yml

modify repo
---
 .github/workflows/docker-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index af069cdf6..0ba375b5c 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -21,7 +21,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          djmaze/snappymail
+          nextgen-networks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=pr generates tag(s) on PRs only. E.g. 'pr-123', 'pr-123-abc0123'
         tags: |

From 36ea69ca00a87816ea6819b9694bf028ec8aa41f Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Sat, 17 Jan 2026 02:32:31 +0100
Subject: [PATCH 06/17] Update docker.yml

change permission setting
---
 .github/workflows/docker.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4115ffce9..a233327e1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,9 +6,7 @@ on:
     - 'v2.*'
 
 # This is needed to push to GitHub Container Registry. See https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry
-permissions:
-  contents: read
-  packages: write
+permissions: write-all
 
 jobs:
   build:

From d22f8d521dd242e2d4a96318b8eece1954a8d2d5 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:04:29 +0000
Subject: [PATCH 07/17] Nextcloud 32/33 Compatibility: Remove deprecated API
 usage

This commit updates the SnappyMail integration app for Nextcloud to support version 32 and the upcoming version 33.

Key changes:
- Updated `info.xml` to allow `max-version="33"`.
- Refactored `AdminSettings`, `Application`, `FetchController`, `PageController`, `Settings` (command), and `InstallStep` to use Dependency Injection instead of the deprecated `\OC::$server` service container.
- Replaced deprecated `OC_User`, `OC_Util` (e.g. `addScript`), and `OC_App` calls with their `OCP` (public API) counterparts or modern equivalents.
- Updated `SnappyMailHelper` to use `\OCP\Server::get()` for static context access where DI is not possible.
- Moved script and style registration from Controllers (using deprecated `Util::addScript`) to templates using `script()` and `style()` helpers.
- Updated `Settings` console command to extend `Symfony\Component\Console\Command\Command` instead of deprecated `OC\Core\Command\Base`.
- Addressed PHP 8.4+ compatibility by adding explicit property types and nullable types where necessary in the integration code.

Co-authored-by: nextgen-networks <21206978+nextgen-networks@users.noreply.github.com>
---
 .github/workflows/docker-pr.yml               |   2 +-
 .github/workflows/docker.yml                  |   6 +-
 .../nextcloud/snappymail/appinfo/info.xml     |   2 +-
 .../snappymail/lib/AppInfo/Application.php    |  34 +-
 .../snappymail/lib/Command/Settings.php       |   4 +-
 .../snappymail/lib/ContentSecurityPolicy.php  |   5 +-
 .../lib/Controller/FetchController.php        |  24 +-
 .../lib/Controller/PageController.php         |  46 +-
 .../snappymail/lib/Migration/InstallStep.php  |  23 +-
 .../snappymail/lib/Settings/AdminSettings.php |  38 +-
 .../snappymail/lib/Util/SnappyMailHelper.php  | 484 +++++++++---------
 .../snappymail/templates/admin-local.php      |   1 +
 .../nextcloud/snappymail/templates/index.php  |   6 +-
 .../snappymail/templates/index_embed.php      |   2 +
 .../Predis/ClientContextInterface.php         |  30 +-
 .../cache-redis/Predis/ClientInterface.php    |  40 +-
 .../Predis/Cluster/PredisStrategy.php         |   2 +-
 .../Predis/Cluster/RedisStrategy.php          |   2 +-
 .../Redis/Container/FunctionContainer.php     |   4 +-
 .../Strategy/SubcommandStrategyResolver.php   |   2 +-
 .../Predis/CommunicationException.php         |   2 +-
 .../Predis/Configuration/Options.php          |   2 +-
 .../Connection/Cluster/PredisCluster.php      |   2 +-
 .../Connection/Cluster/RedisCluster.php       |   4 +-
 .../Connection/CompositeStreamConnection.php  |   2 +-
 .../Predis/Connection/RelayMethods.php        |   4 +-
 .../Replication/MasterSlaveReplication.php    |   2 +-
 .../Replication/SentinelReplication.php       |   2 +-
 .../Text/CompositeProtocolProcessor.php       |   4 +-
 29 files changed, 422 insertions(+), 359 deletions(-)

diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index 0ba375b5c..af069cdf6 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -21,7 +21,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          nextgen-networks/snappymail
+          djmaze/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=pr generates tag(s) on PRs only. E.g. 'pr-123', 'pr-123-abc0123'
         tags: |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a233327e1..b957e2fc8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,9 @@ on:
     - 'v2.*'
 
 # This is needed to push to GitHub Container Registry. See https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry
-permissions: write-all
+permissions:
+  contents: read
+  packages: write
 
 jobs:
   build:
@@ -24,7 +26,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          nextgen-networks/snappymail
+          djmaze/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=branch generates tag(s) on branch only. E.g. 'master', 'master-abc0123'
         # type=ref,event=tag generates tag(s) on tags only. E.g. 'v0.0.0', 'v0.0.0-abc0123', and 'latest'
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index d73ef28a0..b1a67e0b1 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -64,7 +64,7 @@ There, click on the link to go to the SnappyMail admin panel.
 		<lib>xxtea</lib>
 		<lib>zip</lib>
 -->
-		<nextcloud min-version="20" max-version="32" />
+		<nextcloud min-version="25" max-version="33" />
 	</dependencies>
 	<settings>
 		<admin>OCA\SnappyMail\Settings\AdminSettings</admin>
diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index d764520ca..d8e6b294b 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -5,7 +5,6 @@ namespace OCA\SnappyMail\AppInfo;
 use OCA\SnappyMail\Util\SnappyMailHelper;
 use OCA\SnappyMail\Controller\FetchController;
 use OCA\SnappyMail\Controller\PageController;
-use OCA\SnappyMail\Dashboard\UnreadMailWidget;
 use OCA\SnappyMail\Search\Provider;
 use OCA\SnappyMail\Listeners\AccessTokenUpdatedListener;
 
@@ -18,6 +17,10 @@ use OCP\IUser;
 use OCP\User\Events\PostLoginEvent;
 use OCP\User\Events\BeforeUserLoggedOutEvent;
 use OCA\OIDCLogin\Events\AccessTokenUpdatedEvent;
+use OCP\IConfig;
+use OCP\ISession;
+use OCP\IUserSession;
+use OCP\INavigationManager;
 
 class Application extends App implements IBootstrap
 {
@@ -37,7 +40,9 @@ class Application extends App implements IBootstrap
 			'PageController', function($c) {
 				return new PageController(
 					$c->query('AppName'),
-					$c->query('Request')
+					$c->query('Request'),
+					$c->query(IConfig::class),
+					$c->query(INavigationManager::class)
 				);
 			}
 		);
@@ -47,9 +52,10 @@ class Application extends App implements IBootstrap
 				return new FetchController(
 					$c->query('AppName'),
 					$c->query('Request'),
-					$c->getServer()->getAppManager(),
+					$c->query('ServerContainer')->getAppManager(),
 					$c->query('ServerContainer')->getConfig(),
-					$c->query(IL10N::class)
+					$c->query(IL10N::class),
+					$c->query(IUserSession::class)
 				);
 			}
 		);
@@ -72,22 +78,24 @@ class Application extends App implements IBootstrap
 
 	public function boot(IBootContext $context): void
 	{
-		if (!\is_dir(\rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/') . '/appdata_snappymail')) {
+		$config = $context->getServerContainer()->getConfig();
+		if (!\is_dir(\rtrim(\trim($config->getSystemValue('datadirectory', '')), '\\/') . '/appdata_snappymail')) {
 			return;
 		}
 
 		$dispatcher = $context->getAppContainer()->query('OCP\EventDispatcher\IEventDispatcher');
-		$dispatcher->addListener(PostLoginEvent::class, function (PostLoginEvent $Event) {
+		$dispatcher->addListener(PostLoginEvent::class, function (PostLoginEvent $Event) use ($context) {
 /*
-			$config = \OC::$server->getConfig();
+			$config = $context->getServerContainer()->getConfig();
 			// Only store the user's password in the current session if they have
 			// enabled auto-login using Nextcloud username or email address.
 			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)
 			 || $config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
 */
 				$sUID = $Event->getUser()->getUID();
-				\OC::$server->getSession()['snappymail-nc-uid'] = $sUID;
-				\OC::$server->getSession()['snappymail-passphrase'] = SnappyMailHelper::encodePassword($Event->getPassword(), $sUID);
+				$session = $context->getServerContainer()->getSession();
+				$session['snappymail-nc-uid'] = $sUID;
+				$session['snappymail-passphrase'] = SnappyMailHelper::encodePassword($Event->getPassword(), $sUID);
 /*
 			}
 */
@@ -105,13 +113,13 @@ class Application extends App implements IBootstrap
 		// https://github.com/nextcloud/impersonate/pull/180
 		$class = 'OCA\Impersonate\Events\BeginImpersonateEvent';
 		if (\class_exists($class)) {
-			$dispatcher->addListener($class, function ($Event) {
-				\OC::$server->getSession()['snappymail-passphrase'] = '';
+			$dispatcher->addListener($class, function ($Event) use ($context) {
+				$context->getServerContainer()->getSession()['snappymail-passphrase'] = '';
 				SnappyMailHelper::loadApp();
 				\RainLoop\Api::Actions()->Logout(true);
 			});
-			$dispatcher->addListener('OCA\Impersonate\Events\EndImpersonateEvent', function ($Event) {
-				\OC::$server->getSession()['snappymail-passphrase'] = '';
+			$dispatcher->addListener('OCA\Impersonate\Events\EndImpersonateEvent', function ($Event) use ($context) {
+				$context->getServerContainer()->getSession()['snappymail-passphrase'] = '';
 				SnappyMailHelper::loadApp();
 				\RainLoop\Api::Actions()->Logout(true);
 			});
diff --git a/integrations/nextcloud/snappymail/lib/Command/Settings.php b/integrations/nextcloud/snappymail/lib/Command/Settings.php
index 1e6cae25d..2843d9f3b 100644
--- a/integrations/nextcloud/snappymail/lib/Command/Settings.php
+++ b/integrations/nextcloud/snappymail/lib/Command/Settings.php
@@ -3,14 +3,14 @@
 namespace OCA\SnappyMail\Command;
 
 use OCA\SnappyMail\Util\SnappyMailHelper;
-use OC\Core\Command\Base;
 use OCP\IConfig;
 use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Settings extends Base
+class Settings extends Command
 {
 	protected IUserManager $userManager;
 	protected IConfig $config;
diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
index 27a9c44d1..fb8bea501 100644
--- a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -2,6 +2,9 @@
 
 namespace OCA\SnappyMail;
 
+use OCP\Server;
+use OCP\Security\IContentSecurityPolicyNonceManager;
+
 class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy {
 
 	/** @var bool Whether inline JS snippets are allowed */
@@ -37,7 +40,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 	public function getSnappyMailNonce() {
 		static $sNonce;
 		if (!$sNonce) {
-			$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
+			$cspManager = Server::get(IContentSecurityPolicyNonceManager::class);
 			$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
 			if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
 				$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
diff --git a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
index 6ba8a7761..2091e6122 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
@@ -10,17 +10,21 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
+use OCP\IUserSession;
+use Exception;
 
 class FetchController extends Controller {
 	private IConfig $config;
 	private IAppManager $appManager;
 	private IL10N $l;
+	private IUserSession $userSession;
 
-	public function __construct(string $appName, IRequest $request, IAppManager $appManager, IConfig $config, IL10N $l) {
+	public function __construct(string $appName, IRequest $request, IAppManager $appManager, IConfig $config, IL10N $l, IUserSession $userSession) {
 		parent::__construct($appName, $request);
 		$this->config = $config;
 		$this->appManager = $appManager;
 		$this->l = $l;
+		$this->userSession = $userSession;
 	}
 
 	public function upgrade(): JSONResponse {
@@ -104,15 +108,18 @@ class FetchController extends Controller {
 		try {
 			$sEmail = '';
 			if (isset($_POST['appname'], $_POST['snappymail-password'], $_POST['snappymail-email']) && 'snappymail' === $_POST['appname']) {
-				$sUser =  \OC::$server->getUserSession()->getUser()->getUID();
+				$user = $this->userSession->getUser();
+				$sUser = $user ? $user->getUID() : '';
 
-				$sEmail = $_POST['snappymail-email'];
-				$this->config->setUserValue($sUser, 'snappymail', 'snappymail-email', $sEmail);
+				if ($sUser) {
+					$sEmail = $_POST['snappymail-email'];
+					$this->config->setUserValue($sUser, 'snappymail', 'snappymail-email', $sEmail);
 
-				$sPass = $_POST['snappymail-password'];
-				if ('******' !== $sPass) {
-					$this->config->setUserValue($sUser, 'snappymail', 'passphrase',
-						$sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : '');
+					$sPass = $_POST['snappymail-password'];
+					if ('******' !== $sPass) {
+						$this->config->setUserValue($sUser, 'snappymail', 'passphrase',
+							$sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : '');
+					}
 				}
 			} else {
 				return new JSONResponse([
@@ -144,4 +151,3 @@ class FetchController extends Controller {
 		}
 	}
 }
-
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 469d6fb26..ee11d74e7 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -7,23 +7,27 @@ use OCA\SnappyMail\ContentSecurityPolicy;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
-
-// SnappyMail Nextcoud 32 compatibility workaound - START
-// src: https://github.com/the-djmaze/snappymail/issues/1994#issuecomment-3366086651
-
-use OCP\INavigationManager;  // <<<<<<<<<<<< add this 
-use OCP\Server; // <<<<<<<<<<<< add this 
+use OCP\INavigationManager;
+use OCP\IConfig;
+use OCP\IRequest;
 
 class PageController extends Controller
 {
+	private IConfig $config;
+	private INavigationManager $navigationManager;
+
+	public function __construct($appName, IRequest $request, IConfig $config, INavigationManager $navigationManager) {
+		parent::__construct($appName, $request);
+		$this->config = $config;
+		$this->navigationManager = $navigationManager;
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
 	public function index()
 	{
-		$config = \OC::$server->getConfig();
-        $nav = Server::get(INavigationManager::class);  // <<<<<<<<<<<< add this 
 		$bAdmin = false;
 		if (!empty($_SERVER['QUERY_STRING'])) {
 			SnappyMailHelper::loadApp();
@@ -33,11 +37,8 @@ class PageController extends Controller
 			}
 		}
 
-		if (!$bAdmin && $config->getAppValue('snappymail', 'snappymail-no-embed')) {
-            // \OC::$server->getNavigationManager()->setActiveEntry('snappymail'); // <<<<<<<<<<<< Comment this
-            $nav->setActiveEntry('snappymail');  // <<<<<<<<<<<< add this 
-			\OCP\Util::addScript('snappymail', 'snappymail');
-			\OCP\Util::addStyle('snappymail', 'style');
+		if (!$bAdmin && $this->config->getAppValue('snappymail', 'snappymail-no-embed')) {
+			$this->navigationManager->setActiveEntry('snappymail');
 			SnappyMailHelper::startApp();
 			$response = new TemplateResponse('snappymail', 'index', [
 				'snappymail-iframe-url' => SnappyMailHelper::normalizeUrl(SnappyMailHelper::getAppUrl())
@@ -50,12 +51,7 @@ class PageController extends Controller
 			return $response;
 		}
 
-		// \OC::$server->getNavigationManager()->setActiveEntry('snappymail'); // <<<<<<<<<<<< Comment this
-        $nav->setActiveEntry('snappymail');  // <<<<<<<<<<<< add this
-
-// SnappyMail Nextcoud 32 compatibility workaound - END
-
-		\OCP\Util::addStyle('snappymail', 'embed');
+		$this->navigationManager->setActiveEntry('snappymail');
 
 		SnappyMailHelper::startApp();
 		$oConfig = \RainLoop\Api::Config();
@@ -69,6 +65,8 @@ class PageController extends Controller
 		$csp = new ContentSecurityPolicy();
 		$sNonce = $csp->getSnappyMailNonce();
 
+		$cssLink = \RainLoop\Utils::WebStaticPath('css/'.($bAdmin?'admin':'app').$sAppCssMin.'.css');
+
 		$params = [
 			'Admin' => $bAdmin ? 1 : 0,
 			'LoadingDescriptionEsc' => \htmlspecialchars($oConfig->Get('webmail', 'loading_description', 'SnappyMail'), ENT_QUOTES|ENT_IGNORE, 'UTF-8'),
@@ -81,16 +79,10 @@ class PageController extends Controller
 				'/\\s*([:;{},]+)\\s*/s',
 				'$1',
 				$oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin)
-			)
+			),
+			'CssLink' => $cssLink
 		];
 
-//		\OCP\Util::addScript('snappymail', '../app/snappymail/v/'.APP_VERSION.'/static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin);
-
-		// Nextcloud html encodes, so addHeader('style') is not possible
-//		\OCP\Util::addHeader('style', ['id'=>'app-boot-css'], \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'));
-		\OCP\Util::addHeader('link', ['type'=>'text/css','rel'=>'stylesheet','href'=>\RainLoop\Utils::WebStaticPath('css/'.($bAdmin?'admin':'app').$sAppCssMin.'.css')], '');
-//		\OCP\Util::addHeader('style', ['id'=>'app-theme-style','data-href'=>$params['BaseAppThemeCssLink']], $params['BaseAppThemeCss']);
-
 		$response = new TemplateResponse('snappymail', 'index_embed', $params);
 
 		$response->setContentSecurityPolicy($csp);
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
index 966ef2352..6f00cedfe 100644
--- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -6,7 +6,8 @@ use OCA\SnappyMail\AppInfo\Application;
 use OCP\IConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
+use OCP\App\IAppManager;
 
 /**
  * Note: this is not run at install, but when:
@@ -15,6 +16,16 @@ use OCP\ILogger;
  */
 class InstallStep implements IRepairStep
 {
+	private IAppManager $appManager;
+	private IConfig $config;
+	private LoggerInterface $logger;
+
+	public function __construct(IAppManager $appManager, IConfig $config, LoggerInterface $logger) {
+		$this->appManager = $appManager;
+		$this->config = $config;
+		$this->logger = $logger;
+	}
+
 	public function getName() {
 		return 'Setup SnappyMail';
 	}
@@ -53,7 +64,7 @@ class InstallStep implements IRepairStep
 
 		if (!$oConfig->Get('webmail', 'app_path')) {
 			$output->info('Set config [webmail]app_path');
-			$oConfig->Set('webmail', 'app_path', \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/');
+			$oConfig->Set('webmail', 'app_path', $this->appManager->getAppWebPath('snappymail') . '/app/');
 			$oConfig->Set('webmail', 'allow_languages_on_settings', false);
 			$oConfig->Set('login', 'allow_languages_on_login', false);
 			$bSave = true;
@@ -116,9 +127,7 @@ class InstallStep implements IRepairStep
 		// ex: php occ config:app:set snappymail custom_config_file --value="/path/to/config.php"
 		// https://github.com/the-djmaze/snappymail/pull/1197
 		try {
-			/** @var IConfig $ncConfig */
-			$ncConfig = \OC::$server->get(IConfig::class);
-			$customConfigFile = $ncConfig->getAppValue(Application::APP_ID, 'custom_config_file');
+			$customConfigFile = $this->config->getAppValue(Application::APP_ID, 'custom_config_file');
 			if ($customConfigFile) {
 				$output->info("Load custom config: {$customConfigFile}");
 				if (!\str_contains($customConfigFile, ':') && \is_readable($customConfigFile)) {
@@ -129,9 +138,7 @@ class InstallStep implements IRepairStep
 			}
 		} catch (\Throwable $e) {
 			$output->warning("custom config error: " . $e->getMessage());
-			/** @var \Psr\Log\LoggerInterface $logger */
-			$logger = \OC::$server->get(\Psr\Log\LoggerInterface::class);
-			$logger->error("custom config error: " . $e->getMessage());
+			$this->logger->error("custom config error: " . $e->getMessage());
 		}
 	}
 }
diff --git a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
index 7a69cb96f..4bf372eae 100644
--- a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
+++ b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
@@ -5,14 +5,32 @@ use OCA\SnappyMail\Util\SnappyMailHelper;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
+use OCP\IUserSession;
+use OCP\IGroupManager;
+use OCP\IURLGenerator;
+use OCP\App\IAppManager;
+use OCP\Util;
 
 class AdminSettings implements ISettings
 {
-	private $config;
+	private IConfig $config;
+	private IUserSession $userSession;
+	private IGroupManager $groupManager;
+	private IURLGenerator $urlGenerator;
+	private IAppManager $appManager;
 
-	public function __construct(IConfig $config)
-	{
+	public function __construct(
+		IConfig $config,
+		IUserSession $userSession,
+		IGroupManager $groupManager,
+		IURLGenerator $urlGenerator,
+		IAppManager $appManager
+	) {
 		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
+		$this->urlGenerator = $urlGenerator;
+		$this->appManager = $appManager;
 	}
 
 	public function getForm()
@@ -30,12 +48,15 @@ class AdminSettings implements ISettings
 			$v = $this->config->getAppValue('snappymail', $k);
 			$parameters[$k] = $v;
 		}
-		$uid = \OC::$server->getUserSession()->getUser()->getUID();
-		if (\OC_User::isAdminUser($uid)) {
+
+		$user = $this->userSession->getUser();
+		$uid = $user ? $user->getUID() : null;
+
+		if ($uid && $this->groupManager->isAdmin($uid)) {
 //			$parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin';
 			SnappyMailHelper::loadApp();
 			$parameters['snappymail-admin-panel-link'] =
-				\OC::$server->getURLGenerator()->linkToRoute('snappymail.page.index')
+				$this->urlGenerator->linkToRoute('snappymail.page.index')
 				. '?' . \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin');
 		}
 
@@ -49,7 +70,7 @@ class AdminSettings implements ISettings
 		$parameters['snappymail-admin-password'] = $sPassword;
 
 		$parameters['can-import-rainloop'] = $sPassword && \is_dir(
-			\rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/')
+			\rtrim(\trim($this->config->getSystemValue('datadirectory', '')), '\\/')
 			. '/rainloop-storage'
 		);
 
@@ -65,7 +86,7 @@ class AdminSettings implements ISettings
 		// Prevent "Failed loading /nextcloud/snappymail/v/2.N.N/static/js/min/libs.min.js"
 		$app_path = $oConfig->Get('webmail', 'app_path');
 		if (!$app_path) {
-			$app_path = \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/';
+			$app_path = $this->appManager->getAppWebPath('snappymail') . '/app/';
 			$oConfig->Set('webmail', 'app_path', $app_path);
 			$oConfig->Set('webmail', 'theme', 'NextcloudV25+');
 			$oConfig->Save();
@@ -73,7 +94,6 @@ class AdminSettings implements ISettings
 		$parameters['snappymail-app_path'] = $oConfig->Get('webmail', 'app_path', false);
 		$parameters['snappymail-nc-lang'] = !$oConfig->Get('webmail', 'allow_languages_on_settings', true);
 
-		\OCP\Util::addScript('snappymail', 'snappymail');
 		return new TemplateResponse('snappymail', 'admin-local', $parameters);
 	}
 
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 80a93d061..528f5917d 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -1,232 +1,252 @@
-<?php
-
-namespace OCA\SnappyMail\Util;
-
-class SnappyMailResponse extends \OCP\AppFramework\Http\Response
-{
-	public function render(): string
-	{
-		$data = '';
-		$i = \ob_get_level();
-		while ($i--) {
-			$data .= \ob_get_clean();
-		}
-		return $data;
-	}
-}
-
-class SnappyMailHelper
-{
-
-	public static function loadApp() : void
-	{
-		if (\class_exists('RainLoop\\Api')) {
-			return;
-		}
-
-		// Nextcloud the default spl_autoload_register() not working
-		\spl_autoload_register(function($sClassName){
-			$file = SNAPPYMAIL_LIBRARIES_PATH . \strtolower(\strtr($sClassName, '\\', DIRECTORY_SEPARATOR)) . '.php';
-			if (\is_file($file)) {
-				include_once $file;
-			}
-		});
-
-		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
-
-//		define('APP_VERSION', '0.0.0');
-//		define('APP_INDEX_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
-//		include APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php';
-//		define('APP_DATA_FOLDER_PATH', \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
-
-		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
-		require_once $app_dir . '/index.php';
-	}
-
-	public static function startApp(bool $handle = false)
-	{
-		static::loadApp();
-
-		$oConfig = \RainLoop\Api::Config();
-
-		if (false !== \stripos(\php_sapi_name(), 'cli')) {
-			return;
-		}
-
-		try {
-			$oActions = \RainLoop\Api::Actions();
-			if (isset($_GET[$oConfig->Get('security', 'admin_panel_key', 'admin')])) {
-				if ($oConfig->Get('security', 'allow_admin_panel', true)
-				&& \OC_User::isAdminUser(\OC::$server->getUserSession()->getUser()->getUID())
-				&& !$oActions->IsAdminLoggined(false)
-				) {
-					$sRand = \MailSo\Base\Utils::Sha1Rand();
-					if ($oActions->Cacher(null, true)->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time())) {
-						$sToken = \RainLoop\Utils::EncodeKeyValuesQ(array('token', $sRand));
-//						$oActions->setAdminAuthToken($sToken);
-						\SnappyMail\Cookies::set('smadmin', $sToken);
-					}
-				}
-			} else {
-				$doLogin = !$oActions->getMainAccountFromToken(false);
-				$aCredentials = static::getLoginCredentials();
-/*
-				// NC25+ workaround for Impersonate plugin
-				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
-				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
-				require \OC::$SERVERROOT . '/version.php';
-//				\OC\SystemConfig
-//				file_get_contents(\OC::$SERVERROOT . 'config/config.php');
-//				$CONFIG['version']
-				if (24 < $OC_Version[0]) {
-					$ocSession = \OC::$server->getSession();
-					$ocSession->reopen();
-					if (!$doLogin && $ocSession['snappymail-uid'] && $ocSession['snappymail-uid'] != $aCredentials[0]) {
-						// UID changed, Impersonate plugin probably active
-						$oActions->Logout(true);
-						$doLogin = true;
-					}
-					$ocSession->set('snappymail-uid', $aCredentials[0]);
-				}
-*/
-				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
-					$isOIDC = \str_starts_with($aCredentials[2], 'oidc_login|');
-					try {
-						$ocSession = \OC::$server->getSession();
-						$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
-						if (!$isOIDC && $oAccount
-						 && $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DefaultOff) === \RainLoop\Enumerations\SignMeType::DefaultOn
-						) {
-							$oActions->SetSignMeToken($oAccount);
-						}
-					} catch (\Throwable $e) {
-						// Login failure, reset password to prevent more attempts
-						if (!$isOIDC) {
-							$sUID = \OC::$server->getUserSession()->getUser()->getUID();
-							\OC::$server->getSession()['snappymail-passphrase'] = '';
-							\OC::$server->getConfig()->setUserValue($sUID, 'snappymail', 'passphrase', '');
-							\SnappyMail\Log::error('Nextcloud', $e->getMessage());
-						}
-					}
-				}
-			}
-
-			if ($handle) {
-				\header_remove('Content-Security-Policy');
-				\RainLoop\Service::Handle();
-				// https://github.com/the-djmaze/snappymail/issues/1069
-				exit;
-//				return new SnappyMailResponse();
-			}
-		} catch (\Throwable $e) {
-			// Ignore login failure
-		}
-	}
-
-	// Check if OpenID Connect (OIDC) is enabled and used for login
-	// https://apps.nextcloud.com/apps/oidc_login
-	public static function isOIDCLogin() : bool
-	{
-		$config = \OC::$server->getConfig();
-		if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
-			// Check if the OIDC Login app is enabled
-			if (\OC::$server->getAppManager()->isEnabledForUser('oidc_login')) {
-				// Check if session is an OIDC Login
-				$ocSession = \OC::$server->getSession();
-				if ($ocSession->get('is_oidc')) {
-					// IToken->getPassword() ???
-					if ($ocSession->get('oidc_access_token')) {
-						return true;
-					}
-					\SnappyMail\Log::debug('Nextcloud', 'OIDC access_token missing');
-				} else {
-					\SnappyMail\Log::debug('Nextcloud', 'No OIDC login');
-				}
-			} else {
-				\SnappyMail\Log::debug('Nextcloud', 'OIDC login disabled');
-			}
-		}
-		return false;
-	}
-
-	private static function getLoginCredentials() : array
-	{
-		$sUID = \OC::$server->getUserSession()->getUser()->getUID();
-		$config = \OC::$server->getConfig();
-		$ocSession = \OC::$server->getSession();
-
-		// If the user has set credentials for SnappyMail in their personal settings,
-		// this has the first priority.
-		$sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
-		$sPassword = $config->getUserValue($sUID, 'snappymail', 'passphrase')
-			?: $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
-		if ($sEmail && $sPassword) {
-			$sPassword = static::decodePassword($sPassword, \md5($sEmail));
-			if ($sPassword) {
-				return [$sUID, $sEmail, $sPassword];
-			} else {
-				\SnappyMail\Log::debug('Nextcloud', 'decodePassword failed for getUserValue');
-			}
-		}
-
-		// If the current user ID is identical to login ID (not valid when using account switching),
-		// this has the second priority.
-		if ($ocSession['snappymail-nc-uid'] == $sUID) {
-
-			// If OpenID Connect (OIDC) is enabled and used for login, use this.
-			if (static::isOIDCLogin()) {
-				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
-				return [$sUID, $sEmail, "oidc_login|{$sUID}"];
-			}
-
-			// Only use the user's password in the current session if they have
-			// enabled auto-login using Nextcloud username or email address.
-			$sEmail = '';
-			$sPassword = '';
-			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
-				$sEmail = $sUID;
-				$sPassword = $ocSession['snappymail-passphrase'];
-			} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
-				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
-				$sPassword = $ocSession['snappymail-passphrase'];
-			} else {
-				\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
-			}
-			if ($sPassword) {
-				return [$sUID, $sEmail, static::decodePassword($sPassword, $sUID)];
-			}
-		} else {
-			\SnappyMail\Log::debug('Nextcloud', "snappymail-nc-uid mismatch '{$ocSession['snappymail-nc-uid']}' != '{$sUID}'");
-		}
-
-		return [$sUID, '', ''];
-	}
-
-	public static function getAppUrl() : string
-	{
-		return \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
-	}
-
-	public static function normalizeUrl(string $sUrl) : string
-	{
-		$sUrl = \rtrim(\trim($sUrl), '/\\');
-		if ('.php' !== \strtolower(\substr($sUrl, -4))) {
-			$sUrl .= '/';
-		}
-
-		return $sUrl;
-	}
-
-	public static function encodePassword(string $sPassword, string $sSalt) : string
-	{
-		static::loadApp();
-		return \SnappyMail\Crypt::EncryptUrlSafe($sPassword, $sSalt);
-	}
-
-	public static function decodePassword(string $sPassword, string $sSalt) : ?\SnappyMail\SensitiveString
-	{
-		static::loadApp();
-		$result = \SnappyMail\Crypt::DecryptUrlSafe($sPassword, $sSalt);
-		return $result ? new \SnappyMail\SensitiveString($result) : null;
-	}
-}
+<?php
+
+namespace OCA\SnappyMail\Util;
+
+use OCP\Server;
+use OCP\IUserSession;
+use OCP\IConfig;
+use OCP\IURLGenerator;
+use OCP\App\IAppManager;
+use OCP\ISession;
+use OCP\IGroupManager;
+
+class SnappyMailResponse extends \OCP\AppFramework\Http\Response
+{
+	public function render(): string
+	{
+		$data = '';
+		$i = \ob_get_level();
+		while ($i--) {
+			$data .= \ob_get_clean();
+		}
+		return $data;
+	}
+}
+
+class SnappyMailHelper
+{
+
+	public static function loadApp() : void
+	{
+		if (\class_exists('RainLoop\\Api')) {
+			return;
+		}
+
+		// Nextcloud the default spl_autoload_register() not working
+		\spl_autoload_register(function($sClassName){
+			$file = SNAPPYMAIL_LIBRARIES_PATH . \strtolower(\strtr($sClassName, '\\', DIRECTORY_SEPARATOR)) . '.php';
+			if (\is_file($file)) {
+				include_once $file;
+			}
+		});
+
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+
+//		define('APP_VERSION', '0.0.0');
+//		define('APP_INDEX_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+//		include APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php';
+//		define('APP_DATA_FOLDER_PATH', \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
+
+		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
+		require_once $app_dir . '/index.php';
+	}
+
+	public static function startApp(bool $handle = false)
+	{
+		static::loadApp();
+
+		$oConfig = \RainLoop\Api::Config();
+
+		if (false !== \stripos(\php_sapi_name(), 'cli')) {
+			return;
+		}
+
+		try {
+			$oActions = \RainLoop\Api::Actions();
+			if (isset($_GET[$oConfig->Get('security', 'admin_panel_key', 'admin')])) {
+				$user = Server::get(IUserSession::class)->getUser();
+				if ($oConfig->Get('security', 'allow_admin_panel', true)
+				&& $user
+				&& Server::get(IGroupManager::class)->isAdmin($user->getUID())
+				&& !$oActions->IsAdminLoggined(false)
+				) {
+					$sRand = \MailSo\Base\Utils::Sha1Rand();
+					if ($oActions->Cacher(null, true)->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time())) {
+						$sToken = \RainLoop\Utils::EncodeKeyValuesQ(array('token', $sRand));
+//						$oActions->setAdminAuthToken($sToken);
+						\SnappyMail\Cookies::set('smadmin', $sToken);
+					}
+				}
+			} else {
+				$doLogin = !$oActions->getMainAccountFromToken(false);
+				$aCredentials = static::getLoginCredentials();
+/*
+				// NC25+ workaround for Impersonate plugin
+				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
+				require \OC::$SERVERROOT . '/version.php';
+//				\OC\SystemConfig
+//				file_get_contents(\OC::$SERVERROOT . 'config/config.php');
+//				$CONFIG['version']
+				if (24 < $OC_Version[0]) {
+					$ocSession = Server::get(ISession::class);
+					$ocSession->reopen();
+					if (!$doLogin && $ocSession['snappymail-uid'] && $ocSession['snappymail-uid'] != $aCredentials[0]) {
+						// UID changed, Impersonate plugin probably active
+						$oActions->Logout(true);
+						$doLogin = true;
+					}
+					$ocSession->set('snappymail-uid', $aCredentials[0]);
+				}
+*/
+				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
+					$isOIDC = \str_starts_with($aCredentials[2], 'oidc_login|');
+					try {
+						$ocSession = Server::get(ISession::class);
+						$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
+						if (!$isOIDC && $oAccount
+						 && $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DefaultOff) === \RainLoop\Enumerations\SignMeType::DefaultOn
+						) {
+							$oActions->SetSignMeToken($oAccount);
+						}
+					} catch (\Throwable $e) {
+						// Login failure, reset password to prevent more attempts
+						if (!$isOIDC) {
+							$user = Server::get(IUserSession::class)->getUser();
+							$sUID = $user ? $user->getUID() : null;
+							if ($sUID) {
+								$session = Server::get(ISession::class);
+								$session['snappymail-passphrase'] = '';
+								Server::get(IConfig::class)->setUserValue($sUID, 'snappymail', 'passphrase', '');
+								\SnappyMail\Log::error('Nextcloud', $e->getMessage());
+							}
+						}
+					}
+				}
+			}
+
+			if ($handle) {
+				\header_remove('Content-Security-Policy');
+				\RainLoop\Service::Handle();
+				// https://github.com/the-djmaze/snappymail/issues/1069
+				exit;
+//				return new SnappyMailResponse();
+			}
+		} catch (\Throwable $e) {
+			// Ignore login failure
+		}
+	}
+
+	// Check if OpenID Connect (OIDC) is enabled and used for login
+	// https://apps.nextcloud.com/apps/oidc_login
+	public static function isOIDCLogin() : bool
+	{
+		$config = Server::get(IConfig::class);
+		if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
+			// Check if the OIDC Login app is enabled
+			if (Server::get(IAppManager::class)->isEnabledForUser('oidc_login')) {
+				// Check if session is an OIDC Login
+				$ocSession = Server::get(ISession::class);
+				if ($ocSession->get('is_oidc')) {
+					// IToken->getPassword() ???
+					if ($ocSession->get('oidc_access_token')) {
+						return true;
+					}
+					\SnappyMail\Log::debug('Nextcloud', 'OIDC access_token missing');
+				} else {
+					\SnappyMail\Log::debug('Nextcloud', 'No OIDC login');
+				}
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'OIDC login disabled');
+			}
+		}
+		return false;
+	}
+
+	private static function getLoginCredentials() : array
+	{
+		$user = Server::get(IUserSession::class)->getUser();
+		$sUID = $user ? $user->getUID() : '';
+		$config = Server::get(IConfig::class);
+		$ocSession = Server::get(ISession::class);
+
+		if (!$sUID) {
+			return ['', '', ''];
+		}
+
+		// If the user has set credentials for SnappyMail in their personal settings,
+		// this has the first priority.
+		$sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
+		$sPassword = $config->getUserValue($sUID, 'snappymail', 'passphrase')
+			?: $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
+		if ($sEmail && $sPassword) {
+			$sPassword = static::decodePassword($sPassword, \md5($sEmail));
+			if ($sPassword) {
+				return [$sUID, $sEmail, $sPassword];
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'decodePassword failed for getUserValue');
+			}
+		}
+
+		// If the current user ID is identical to login ID (not valid when using account switching),
+		// this has the second priority.
+		// Note: $ocSession array access is supported but deprecated? ISession implements ArrayAccess.
+		if ($ocSession['snappymail-nc-uid'] == $sUID) {
+
+			// If OpenID Connect (OIDC) is enabled and used for login, use this.
+			if (static::isOIDCLogin()) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
+				return [$sUID, $sEmail, "oidc_login|{$sUID}"];
+			}
+
+			// Only use the user's password in the current session if they have
+			// enabled auto-login using Nextcloud username or email address.
+			$sEmail = '';
+			$sPassword = '';
+			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
+				$sEmail = $sUID;
+				$sPassword = $ocSession['snappymail-passphrase'];
+			} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
+				$sPassword = $ocSession['snappymail-passphrase'];
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
+			}
+			if ($sPassword) {
+				return [$sUID, $sEmail, static::decodePassword($sPassword, $sUID)];
+			}
+		} else {
+			\SnappyMail\Log::debug('Nextcloud', "snappymail-nc-uid mismatch '{$ocSession['snappymail-nc-uid']}' != '{$sUID}'");
+		}
+
+		return [$sUID, '', ''];
+	}
+
+	public static function getAppUrl() : string
+	{
+		return Server::get(IURLGenerator::class)->linkToRoute('snappymail.page.appGet');
+	}
+
+	public static function normalizeUrl(string $sUrl) : string
+	{
+		$sUrl = \rtrim(\trim($sUrl), '/\\');
+		if ('.php' !== \strtolower(\substr($sUrl, -4))) {
+			$sUrl .= '/';
+		}
+
+		return $sUrl;
+	}
+
+	public static function encodePassword(string $sPassword, string $sSalt) : string
+	{
+		static::loadApp();
+		return \SnappyMail\Crypt::EncryptUrlSafe($sPassword, $sSalt);
+	}
+
+	public static function decodePassword(string $sPassword, string $sSalt) : ?\SnappyMail\SensitiveString
+	{
+		static::loadApp();
+		$result = \SnappyMail\Crypt::DecryptUrlSafe($sPassword, $sSalt);
+		return $result ? new \SnappyMail\SensitiveString($result) : null;
+	}
+}
diff --git a/integrations/nextcloud/snappymail/templates/admin-local.php b/integrations/nextcloud/snappymail/templates/admin-local.php
index 5270f3e50..dd5ddd6ee 100644
--- a/integrations/nextcloud/snappymail/templates/admin-local.php
+++ b/integrations/nextcloud/snappymail/templates/admin-local.php
@@ -1,3 +1,4 @@
+<?php script('snappymail', 'snappymail'); ?>
 <div class="section">
 	<form class="snappymail" action="admin.php" method="post">
 		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
diff --git a/integrations/nextcloud/snappymail/templates/index.php b/integrations/nextcloud/snappymail/templates/index.php
index f304654fb..ba1b7eee0 100644
--- a/integrations/nextcloud/snappymail/templates/index.php
+++ b/integrations/nextcloud/snappymail/templates/index.php
@@ -1,3 +1,5 @@
-<iframe id="rliframe" style="border: none; width: 100%; min-height: 100%; position: relative;" tabindex="-1" frameborder="0" src="<?php echo $_['snappymail-iframe-url']; ?>"></iframe>
 <?php
-// OCP\Util::addScript('snappymail', 'resize');
+script('snappymail', 'snappymail');
+style('snappymail', 'style');
+?>
+<iframe id="rliframe" style="border: none; width: 100%; min-height: 100%; position: relative;" tabindex="-1" frameborder="0" src="<?php echo $_['snappymail-iframe-url']; ?>"></iframe>
diff --git a/integrations/nextcloud/snappymail/templates/index_embed.php b/integrations/nextcloud/snappymail/templates/index_embed.php
index 4384bef5d..f853e9320 100644
--- a/integrations/nextcloud/snappymail/templates/index_embed.php
+++ b/integrations/nextcloud/snappymail/templates/index_embed.php
@@ -1,3 +1,5 @@
+<?php style('snappymail', 'embed'); ?>
+<link type="text/css" rel="stylesheet" href="<?php echo $_['CssLink']; ?>" />
 <style id="app-boot-css"><?php echo $_['BaseAppBootCss']; ?></style>
 <style id="app-theme-style"><?php echo $_['BaseAppThemeCss']; ?></style>
 <div id="rl-app" data-admin="<?php echo $_['Admin']; ?>" spellcheck="false">
diff --git a/plugins/cache-redis/Predis/ClientContextInterface.php b/plugins/cache-redis/Predis/ClientContextInterface.php
index d6cb74512..e443ee5d1 100644
--- a/plugins/cache-redis/Predis/ClientContextInterface.php
+++ b/plugins/cache-redis/Predis/ClientContextInterface.php
@@ -65,8 +65,8 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this randomkey()
  * @method $this rename($key, $target)
  * @method $this renamenx($key, $target)
- * @method $this scan($cursor, ?array $options = null)
- * @method $this sort($key, ?array $options = null)
+ * @method $this scan($cursor, array $options = null)
+ * @method $this sort($key, array $options = null)
  * @method $this sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
  * @method $this ttl($key)
  * @method $this type($key)
@@ -163,7 +163,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this hmget($key, array $fields)
  * @method $this hmset($key, array $dictionary)
  * @method $this hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method $this hscan($key, $cursor, ?array $options = null)
+ * @method $this hscan($key, $cursor, array $options = null)
  * @method $this hset($key, $field, $value)
  * @method $this hsetnx($key, $field, $value)
  * @method $this hvals($key)
@@ -225,7 +225,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this spop($key, $count = null)
  * @method $this srandmember($key, $count = null)
  * @method $this srem($key, $member)
- * @method $this sscan($key, $cursor, ?array $options = null)
+ * @method $this sscan($key, $cursor, array $options = null)
  * @method $this sunion(array|string $keys)
  * @method $this sunionstore($destination, array|string $keys)
  * @method $this tdigestadd(string $key, float ...$value)
@@ -255,7 +255,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
  * @method $this tsdel(string $key, int $fromTimestamp, int $toTimestamp)
  * @method $this tsdeleterule(string $sourceKey, string $destKey)
- * @method $this tsget(string $key, ?GetArguments $arguments = null)
+ * @method $this tsget(string $key, GetArguments $arguments = null)
  * @method $this tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
  * @method $this tsinfo(string $key, ?InfoArguments $arguments = null)
  * @method $this tsmadd(mixed ...$keyTimestampValue)
@@ -277,22 +277,22 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this zmpop(array $keys, string $modifier = 'min', int $count = 1)
  * @method $this zmscore(string $key, string ...$member)
  * @method $this zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method $this zrange($key, $start, $stop, ?array $options = null)
- * @method $this zrangebyscore($key, $min, $max, ?array $options = null)
+ * @method $this zrange($key, $start, $stop, array $options = null)
+ * @method $this zrangebyscore($key, $min, $max, array $options = null)
  * @method $this zrangestore(string $destination, string $source, int|string $min, string|int $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
  * @method $this zrank($key, $member)
  * @method $this zrem($key, $member)
  * @method $this zremrangebyrank($key, $start, $stop)
  * @method $this zremrangebyscore($key, $min, $max)
- * @method $this zrevrange($key, $start, $stop, ?array $options = null)
- * @method $this zrevrangebyscore($key, $max, $min, ?array $options = null)
+ * @method $this zrevrange($key, $start, $stop, array $options = null)
+ * @method $this zrevrangebyscore($key, $max, $min, array $options = null)
  * @method $this zrevrank($key, $member)
  * @method $this zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
  * @method $this zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
  * @method $this zscore($key, $member)
- * @method $this zscan($key, $cursor, ?array $options = null)
- * @method $this zrangebylex($key, $start, $stop, ?array $options = null)
- * @method $this zrevrangebylex($key, $start, $stop, ?array $options = null)
+ * @method $this zscan($key, $cursor, array $options = null)
+ * @method $this zrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zrevrangebylex($key, $start, $stop, array $options = null)
  * @method $this zremrangebylex($key, $min, $max)
  * @method $this zlexcount($key, $min, $max)
  * @method $this pexpiretime(string $key)
@@ -312,7 +312,7 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
  * @method $this evalsha_ro(string $sha1, array $keys, ...$argument)
  * @method $this script($subcommand, $argument = null)
- * @method $this shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method $this shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
  * @method $this auth($password)
  * @method $this echo($message)
  * @method $this ping($message = null)
@@ -335,8 +335,8 @@ use Predis\Command\Redis\Container\Search\FTCURSOR;
  * @method $this geohash($key, array $members)
  * @method $this geopos($key, array $members)
  * @method $this geodist($key, $member1, $member2, $unit = null)
- * @method $this georadius($key, $longitude, $latitude, $radius, $unit, ?array $options = null)
- * @method $this georadiusbymember($key, $member, $radius, $unit, ?array $options = null)
+ * @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
  * @method $this geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
  * @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
diff --git a/plugins/cache-redis/Predis/ClientInterface.php b/plugins/cache-redis/Predis/ClientInterface.php
index e7edb9750..2937c5804 100644
--- a/plugins/cache-redis/Predis/ClientInterface.php
+++ b/plugins/cache-redis/Predis/ClientInterface.php
@@ -74,8 +74,8 @@ use Predis\Response\Status;
  * @method string|null       randomkey()
  * @method mixed             rename(string $key, string $target)
  * @method int               renamenx(string $key, string $target)
- * @method array             scan($cursor, ?array $options = null)
- * @method array             sort(string $key, ?array $options = null)
+ * @method array             scan($cursor, array $options = null)
+ * @method array             sort(string $key, array $options = null)
  * @method array             sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
  * @method int               ttl(string $key)
  * @method mixed             type(string $key)
@@ -172,7 +172,7 @@ use Predis\Response\Status;
  * @method array             hmget(string $key, array $fields)
  * @method mixed             hmset(string $key, array $dictionary)
  * @method array             hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method array             hscan(string $key, $cursor, ?array $options = null)
+ * @method array             hscan(string $key, $cursor, array $options = null)
  * @method int               hset(string $key, string $field, string $value)
  * @method int               hsetnx(string $key, string $field, string $value)
  * @method array             hvals(string $key)
@@ -231,10 +231,10 @@ use Predis\Response\Status;
  * @method string[]          smembers(string $key)
  * @method array             smismember(string $key, string ...$members)
  * @method int               smove(string $source, string $destination, string $member)
- * @method string|array|null spop(string $key, ?int $count = null)
- * @method string|null       srandmember(string $key, ?int $count = null)
+ * @method string|array|null spop(string $key, int $count = null)
+ * @method string|null       srandmember(string $key, int $count = null)
  * @method int               srem(string $key, array|string $member)
- * @method array             sscan(string $key, int $cursor, ?array $options = null)
+ * @method array             sscan(string $key, int $cursor, array $options = null)
  * @method string[]          sunion(array|string $keys)
  * @method int               sunionstore(string $destination, array|string $keys)
  * @method int               touch(string[]|string $keyOrKeys, string ...$keys = null)
@@ -265,7 +265,7 @@ use Predis\Response\Status;
  * @method int               tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
  * @method int               tsdel(string $key, int $fromTimestamp, int $toTimestamp)
  * @method Status            tsdeleterule(string $sourceKey, string $destKey)
- * @method array             tsget(string $key, ?GetArguments $arguments = null)
+ * @method array             tsget(string $key, GetArguments $arguments = null)
  * @method int               tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
  * @method array             tsinfo(string $key, ?InfoArguments $arguments = null)
  * @method array             tsmadd(mixed ...$keyTimestampValue)
@@ -275,12 +275,12 @@ use Predis\Response\Status;
  * @method array             tsqueryindex(string ...$filterExpression)
  * @method array             tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
  * @method array             tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
- * @method string            xadd(string $key, array $dictionary, string $id = '*', ?array $options = null)
+ * @method string            xadd(string $key, array $dictionary, string $id = '*', array $options = null)
  * @method int               xdel(string $key, string ...$id)
  * @method int               xlen(string $key)
  * @method array             xrevrange(string $key, string $end, string $start, ?int $count = null)
  * @method array             xrange(string $key, string $start, string $end, ?int $count = null)
- * @method string            xtrim(string $key, array|string $strategy, string $threshold, ?array $options = null)
+ * @method string            xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
  * @method int               zadd(string $key, array $membersAndScoresDictionary)
  * @method int               zcard(string $key)
  * @method string            zcount(string $key, int|string $min, int|string $max)
@@ -295,22 +295,22 @@ use Predis\Response\Status;
  * @method array             zpopmin(string $key, int $count = 1)
  * @method array             zpopmax(string $key, int $count = 1)
  * @method mixed             zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method array             zrange(string $key, int|string $start, int|string $stop, ?array $options = null)
- * @method array             zrangebyscore(string $key, int|string $min, int|string $max, ?array $options = null)
+ * @method array             zrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
  * @method int               zrangestore(string $destination, string $source, int|string $min, int|string $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
  * @method int|null          zrank(string $key, string $member)
  * @method int               zrem(string $key, string ...$member)
  * @method int               zremrangebyrank(string $key, int|string $start, int|string $stop)
  * @method int               zremrangebyscore(string $key, int|string $min, int|string $max)
- * @method array             zrevrange(string $key, int|string $start, int|string $stop, ?array $options = null)
- * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, ?array $options = null)
+ * @method array             zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
  * @method int|null          zrevrank(string $key, string $member)
  * @method array             zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
  * @method int               zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
  * @method string|null       zscore(string $key, string $member)
- * @method array             zscan(string $key, int $cursor, ?array $options = null)
- * @method array             zrangebylex(string $key, string $start, string $stop, ?array $options = null)
- * @method array             zrevrangebylex(string $key, string $start, string $stop, ?array $options = null)
+ * @method array             zscan(string $key, int $cursor, array $options = null)
+ * @method array             zrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method array             zrevrangebylex(string $key, string $start, string $stop, array $options = null)
  * @method int               zremrangebylex(string $key, string $min, string $max)
  * @method int               zlexcount(string $key, string $min, string $max)
  * @method int               pexpiretime(string $key)
@@ -330,10 +330,10 @@ use Predis\Response\Status;
  * @method mixed             evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
  * @method mixed             evalsha_ro(string $sha1, array $keys, ...$argument)
  * @method mixed             script($subcommand, $argument = null)
- * @method Status            shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method Status            shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
  * @method mixed             auth(string $password)
  * @method string            echo(string $message)
- * @method mixed             ping(?string $message = null)
+ * @method mixed             ping(string $message = null)
  * @method mixed             select(int $database)
  * @method mixed             bgrewriteaof()
  * @method mixed             bgsave()
@@ -353,8 +353,8 @@ use Predis\Response\Status;
  * @method array             geohash(string $key, array $members)
  * @method array             geopos(string $key, array $members)
  * @method string|null       geodist(string $key, $member1, $member2, $unit = null)
- * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, ?array $options = null)
- * @method array             georadiusbymember(string $key, $member, $radius, $unit, ?array $options = null)
+ * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method array             georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
  * @method array             geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
  * @method int               geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
  *
diff --git a/plugins/cache-redis/Predis/Cluster/PredisStrategy.php b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
index 04f31b117..574b86f9e 100644
--- a/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
@@ -25,7 +25,7 @@ class PredisStrategy extends ClusterStrategy
     /**
      * @param DistributorInterface $distributor Optional distributor instance.
      */
-    public function __construct(?DistributorInterface $distributor = null)
+    public function __construct(DistributorInterface $distributor = null)
     {
         parent::__construct();
 
diff --git a/plugins/cache-redis/Predis/Cluster/RedisStrategy.php b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
index dadf782ed..8ae5c0f5e 100644
--- a/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
@@ -27,7 +27,7 @@ class RedisStrategy extends ClusterStrategy
     /**
      * @param HashGeneratorInterface $hashGenerator Hash generator instance.
      */
-    public function __construct(?HashGeneratorInterface $hashGenerator = null)
+    public function __construct(HashGeneratorInterface $hashGenerator = null)
     {
         parent::__construct();
 
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
index dfa309eea..8f2a673d1 100644
--- a/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
@@ -19,9 +19,9 @@ use Predis\Response\Status;
  * @method string dump()
  * @method Status flush(?string $mode = null)
  * @method Status kill()
- * @method array  list(?string $libraryNamePattern = null, bool $withCode = false)
+ * @method array  list(string $libraryNamePattern = null, bool $withCode = false)
  * @method string load(string $functionCode, bool $replace = 'false')
- * @method Status restore(string $value, ?string $policy = null)
+ * @method Status restore(string $value, string $policy = null)
  * @method array  stats()
  */
 class FunctionContainer extends AbstractContainer
diff --git a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
index b714d5276..cda84268e 100644
--- a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
+++ b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
@@ -23,7 +23,7 @@ class SubcommandStrategyResolver implements StrategyResolverInterface
      */
     private $separator;
 
-    public function __construct(?string $separator = null)
+    public function __construct(string $separator = null)
     {
         $this->separator = $separator;
     }
diff --git a/plugins/cache-redis/Predis/CommunicationException.php b/plugins/cache-redis/Predis/CommunicationException.php
index 9fd69a021..0fc7c07a6 100644
--- a/plugins/cache-redis/Predis/CommunicationException.php
+++ b/plugins/cache-redis/Predis/CommunicationException.php
@@ -32,7 +32,7 @@ abstract class CommunicationException extends PredisException
         NodeConnectionInterface $connection,
         $message = '',
         $code = 0,
-        ?Exception $innerException = null
+        Exception $innerException = null
     ) {
         parent::__construct(
             is_null($message) ? '' : $message,
diff --git a/plugins/cache-redis/Predis/Configuration/Options.php b/plugins/cache-redis/Predis/Configuration/Options.php
index 3cad8e951..3fff04129 100644
--- a/plugins/cache-redis/Predis/Configuration/Options.php
+++ b/plugins/cache-redis/Predis/Configuration/Options.php
@@ -43,7 +43,7 @@ class Options implements OptionsInterface
     /**
      * @param array $options Named array of client options
      */
-    public function __construct(?array $options = null)
+    public function __construct(array $options = null)
     {
         $this->input = $options ?? [];
     }
diff --git a/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
index a65e665f5..c30fd09d3 100644
--- a/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
@@ -52,7 +52,7 @@ class PredisCluster implements ClusterInterface, IteratorAggregate, Countable
     /**
      * @param StrategyInterface $strategy Optional cluster strategy.
      */
-    public function __construct(?StrategyInterface $strategy = null)
+    public function __construct(StrategyInterface $strategy = null)
     {
         $this->strategy = $strategy ?: new PredisStrategy();
         $this->distributor = $this->strategy->getDistributor();
diff --git a/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
index 6e7a90239..7f3013c17 100644
--- a/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
@@ -70,7 +70,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
      */
     public function __construct(
         FactoryInterface $connections,
-        ?StrategyInterface $strategy = null
+        StrategyInterface $strategy = null
     ) {
         $this->connections = $connections;
         $this->strategy = $strategy ?: new RedisClusterStrategy();
@@ -273,7 +273,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
      *
      * @param NodeConnectionInterface $connection Optional connection instance.
      */
-    public function askSlotMap(?NodeConnectionInterface $connection = null)
+    public function askSlotMap(NodeConnectionInterface $connection = null)
     {
         if (!$connection && !$connection = $this->getRandomConnection()) {
             return;
diff --git a/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
index 431663cae..ad69cbc12 100644
--- a/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
+++ b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
@@ -31,7 +31,7 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
      */
     public function __construct(
         ParametersInterface $parameters,
-        ?ProtocolProcessorInterface $protocol = null
+        ProtocolProcessorInterface $protocol = null
     ) {
         $this->parameters = $this->assertParameters($parameters);
         $this->protocol = $protocol ?: new TextProtocolProcessor();
diff --git a/plugins/cache-redis/Predis/Connection/RelayMethods.php b/plugins/cache-redis/Predis/Connection/RelayMethods.php
index d59dd41f2..a52c4a035 100644
--- a/plugins/cache-redis/Predis/Connection/RelayMethods.php
+++ b/plugins/cache-redis/Predis/Connection/RelayMethods.php
@@ -32,7 +32,7 @@ trait RelayMethods
      * @param  string   $pattern
      * @return bool
      */
-    public function onInvalidated(?callable $callback, ?string $pattern = null)
+    public function onInvalidated(?callable $callback, string $pattern = null)
     {
         return $this->client->onInvalidated($callback, $pattern);
     }
@@ -129,7 +129,7 @@ trait RelayMethods
      * @param  ?int    $db
      * @return bool
      */
-    public function flushMemory(?string $endpointId = null, ?int $db = null)
+    public function flushMemory(string $endpointId = null, int $db = null)
     {
         return $this->client->flushMemory($endpointId, $db);
     }
diff --git a/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
index 31897ed3e..9d57a5ac3 100644
--- a/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
+++ b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
@@ -72,7 +72,7 @@ class MasterSlaveReplication implements ReplicationInterface
     /**
      * {@inheritdoc}
      */
-    public function __construct(?ReplicationStrategy $strategy = null)
+    public function __construct(ReplicationStrategy $strategy = null)
     {
         $this->strategy = $strategy ?: new ReplicationStrategy();
     }
diff --git a/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
index 146254e88..14dbe2758 100644
--- a/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
+++ b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
@@ -123,7 +123,7 @@ class SentinelReplication implements ReplicationInterface
         $service,
         array $sentinels,
         ConnectionFactoryInterface $connectionFactory,
-        ?ReplicationStrategy $strategy = null
+        ReplicationStrategy $strategy = null
     ) {
         $this->sentinels = $sentinels;
         $this->service = $service;
diff --git a/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
index 19494c05d..3f7df02e5 100644
--- a/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
@@ -41,8 +41,8 @@ class CompositeProtocolProcessor implements ProtocolProcessorInterface
      * @param ResponseReaderInterface    $reader     Response reader.
      */
     public function __construct(
-        ?RequestSerializerInterface $serializer = null,
-        ?ResponseReaderInterface $reader = null
+        RequestSerializerInterface $serializer = null,
+        ResponseReaderInterface $reader = null
     ) {
         $this->setRequestSerializer($serializer ?: new RequestSerializer());
         $this->setResponseReader($reader ?: new ResponseReader());

From 77426d2f37f565f9e5054fd231ec86f442ded87d Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Wed, 4 Feb 2026 11:52:15 +0100
Subject: [PATCH 08/17] use own repo for build ops

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b957e2fc8..4115ffce9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          djmaze/snappymail
+          nextgen-networks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=branch generates tag(s) on branch only. E.g. 'master', 'master-abc0123'
         # type=ref,event=tag generates tag(s) on tags only. E.g. 'v0.0.0', 'v0.0.0-abc0123', and 'latest'

From 80fa2d8c76d23b45f48ccd3e984a582054cb18ea Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Wed, 4 Feb 2026 11:53:17 +0100
Subject: [PATCH 09/17] use own repo for buiild ops

---
 .github/workflows/docker-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index af069cdf6..0ba375b5c 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -21,7 +21,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          djmaze/snappymail
+          nextgen-networks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=pr generates tag(s) on PRs only. E.g. 'pr-123', 'pr-123-abc0123'
         tags: |

From d912321df6e1ae04a2dcf608e692fb6c8f64dcb4 Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Sun, 8 Feb 2026 10:42:36 +0100
Subject: [PATCH 10/17] Update PKGBUILD

possibly fixes build error
---
 build/arch/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/arch/PKGBUILD b/build/arch/PKGBUILD
index 9390608cb..4dd25389c 100644
--- a/build/arch/PKGBUILD
+++ b/build/arch/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="modern PHP webmail client"
 arch=('any')
 license=('AGPL3')
-url="https://github.com/the-djmaze/snappymail"
+url="https://github.com/nextgen-networks/snappymail"
 depends=('php-fpm')
 makedepends=('php', 'nodejs' 'yarn' 'gulp', 'rollup')
 optdepends=('mariadb: storage backend for contacts'

From 4f594515de56ccf5393b7499f33c97589330f6f5 Mon Sep 17 00:00:00 2001
From: Jay Kruse <jaykruse20@gmail.com>
Date: Mon, 9 Feb 2026 09:53:31 +0100
Subject: [PATCH 11/17] Nextcloud addon index.php

I generated this file using AI.  It addresses SnappyMail's use of old API
calls to Nextcloud in attaching and saving files to the Nextcloud webDAV
endpoints.  I have tested some of the basics with this and it seems to be
working as expected.  It now allows saving attachments directly to
Nextcloud, attaching files from Nextcloud to an email, and saving emails as
.eml files.  If you see anything that you think should change or if you see
any problems it causes, shoot me an email. Feel free to use this however
you want.  I hope it can help keep SnappyMail going forward.
---
 plugins/nextcloud/index.php | 528 +++++++++++++++++++++---------------
 1 file changed, 311 insertions(+), 217 deletions(-)

diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index c49524b33..bd9715e6d 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,8 +4,9 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.38.1',
-		RELEASE  = '2024-10-08',
+		// Keep upstream metadata if you prefer; this is not functional.
+		VERSION = '2.38.2',
+		RELEASE  = '2026-02-06',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.38.0';
@@ -36,14 +37,13 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$this->addTemplate('templates/PopupsNextcloudFiles.html');
 			$this->addTemplate('templates/PopupsNextcloudCalendars.html');
 
-//			$this->addHook('login.credentials.step-2', 'loginCredentials2');
-//			$this->addHook('login.credentials', 'loginCredentials');
+			// $this->addHook('login.credentials.step-2', 'loginCredentials2');
+			// $this->addHook('login.credentials', 'loginCredentials');
 			$this->addHook('imap.before-login', 'beforeLogin');
 			$this->addHook('smtp.before-login', 'beforeLogin');
 			$this->addHook('sieve.before-login', 'beforeLogin');
 		} else {
 			\SnappyMail\Log::debug('Nextcloud', 'NOT integrated');
-			// \OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-no-embed');
 			$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
 		}
 	}
@@ -72,13 +72,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function loginCredentials(string &$sEmail, string &$sLogin, ?string &$sPassword = null) : void
 	{
-		/**
-		 * This has an issue.
-		 * When user changes email address, all settings are gone as the new
-		 * _data_/_default_/storage/{domain}/{local-part} is used
-		 */
-//		$ocUser = \OC::$server->getUserSession()->getUser();
-//		$sEmail = $ocUser->getEMailAddress() ?: $ocUser->getPrimaryEMailAddress() ?: $sEmail;
+		// left intentionally as upstream (commented in upstream)
 	}
 
 	public function loginCredentials2(string &$sEmail, ?string &$sPassword = null) : void
@@ -89,83 +83,145 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
 	{
-		// Only login with OIDC access token if
-		// it is enabled in config, the user is currently logged in with OIDC,
-		// the current snappymail account is the OIDC account and no account defined explicitly
 		if ($oAccount instanceof \RainLoop\Model\MainAccount
-		 && \OCA\SnappyMail\Util\SnappyMailHelper::isOIDCLogin()
-//		 && $oClient->supportsAuthType('OAUTHBEARER') // v2.28
-		 && \str_starts_with($oSettings->passphrase, 'oidc_login|')
+			&& \OCA\SnappyMail\Util\SnappyMailHelper::isOIDCLogin()
+			&& \str_starts_with($oSettings->passphrase, 'oidc_login|')
 		) {
-//			$oSettings->passphrase = \OC::$server->getSession()->get('snappymail-passphrase');
-			$oSettings->passphrase = \OC::$server->getSession()->get('oidc_access_token');
+			$oSettings->passphrase = (string) \OC::$server->getSession()->get('oidc_access_token');
 			\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
 		}
 	}
 
-	/*
-	\OC::$server->getCalendarManager();
-	\OC::$server->getLDAPProvider();
-	*/
-
+	/**
+	 * Attach a Nextcloud file into SnappyMail temp storage (for composing).
+	 */
 	public function NextcloudAttachFile() : array
 	{
 		$aResult = [
 			'success' => false,
 			'tempName' => ''
 		];
-		$sFile = $this->jsonParam('file', '');
-		$oFiles = \OCP\Files::getStorage('files');
-		if ($oFiles && $oFiles->is_file($sFile) && $fp = $oFiles->fopen($sFile, 'rb')) {
+
+		$sFile = (string) $this->jsonParam('file', '');
+
+		try {
 			$oActions = \RainLoop\Api::Actions();
 			$oAccount = $oActions->getAccountFromToken();
-			if ($oAccount) {
-				$sSavedName = 'nextcloud-file-' . \sha1($sFile . \microtime());
-				if (!$oActions->FilesProvider()->PutFile($oAccount, $sSavedName, $fp)) {
-					$aResult['error'] = 'failed';
-				} else {
-					$aResult['tempName'] = $sSavedName;
-					$aResult['success'] = true;
-				}
+			if (!$oAccount) {
+				$aResult['error'] = 'no-account';
+				return $this->jsonResponse(__FUNCTION__, $aResult);
 			}
+
+			$user = \OC::$server->getUserSession()->getUser();
+			if (!$user) {
+				$aResult['error'] = 'no-user';
+				return $this->jsonResponse(__FUNCTION__, $aResult);
+			}
+
+			/** @var \OCP\Files\IRootFolder $root */
+			$root = \OC::$server->get(\OCP\Files\IRootFolder::class);
+			$userFolder = $root->getUserFolder($user->getUID());
+
+			// SnappyMail sends "/Documents/app.svg" style paths; userFolder expects relative.
+			$relPath = \ltrim($sFile, '/');
+
+			if ($relPath === '') {
+				$aResult['error'] = 'empty-path';
+				return $this->jsonResponse(__FUNCTION__, $aResult);
+			}
+
+			$node = $userFolder->get($relPath);
+			if (!($node instanceof \OCP\Files\File)) {
+				$aResult['error'] = 'not-a-file';
+				return $this->jsonResponse(__FUNCTION__, $aResult);
+			}
+
+			$fp = $node->fopen('rb');
+			if (!$fp) {
+				$aResult['error'] = 'open-failed';
+				return $this->jsonResponse(__FUNCTION__, $aResult);
+			}
+
+			$sSavedName = 'nextcloud-file-' . \sha1($sFile . \microtime(true));
+			$ok = $oActions->FilesProvider()->PutFile($oAccount, $sSavedName, $fp);
+			@\fclose($fp);
+
+			if (!$ok) {
+				$aResult['error'] = 'failed';
+			} else {
+				$aResult['tempName'] = $sSavedName;
+				$aResult['success'] = true;
+			}
+		} catch (\Throwable $e) {
+			$aResult['error'] = 'exception';
+			$aResult['errorMessage'] = $e->getMessage();
 		}
+
 		return $this->jsonResponse(__FUNCTION__, $aResult);
 	}
 
+	/**
+	 * Save an .eml message from SnappyMail into Nextcloud Files.
+	 */
 	public function NextcloudSaveMsg() : array
 	{
-		$sSaveFolder = \ltrim($this->jsonParam('folder', ''), '/');
-//		$aValues = \RainLoop\Api::Actions()->decodeRawKey($this->jsonParam('msgHash', ''));
-		$msgHash = $this->jsonParam('msgHash', '');
+		$sSaveFolder = \ltrim((string) $this->jsonParam('folder', ''), '/');
+
+		$msgHash = (string) $this->jsonParam('msgHash', '');
 		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($msgHash), true);
+
 		$aResult = [
 			'folder' => '',
 			'filename' => '',
-			'success' => false
+			'success' => false,
 		];
-		if ($sSaveFolder && !empty($aValues['folder']) && !empty($aValues['uid'])) {
+
+		if (!empty($aValues['folder']) && !empty($aValues['uid'])) {
 			$oActions = \RainLoop\Api::Actions();
 			$oMailClient = $oActions->MailClient();
+
 			if (!$oMailClient->IsLoggined()) {
 				$oAccount = $oActions->getAccountFromToken();
 				$oAccount->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oActions->Config());
 			}
 
+			// Default folder
 			$sSaveFolder = $sSaveFolder ?: 'Emails';
-			$oFiles = \OCP\Files::getStorage('files');
-			if ($oFiles) {
-				$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
-			}
-			$aResult['folder'] = $sSaveFolder;
-			$aResult['filename'] = \MailSo\Base\Utils::SecureFileName(
-				\mb_substr($this->jsonParam('filename', '') ?: \date('YmdHis'), 0, 100)
-			) . '.' . \md5($msgHash) . '.eml';
+			$sSaveFolder = \trim($sSaveFolder, '/');
 
+			// Use Nextcloud Files API (per-user)
+			$userFolder = \OC::$server->getUserFolder();
+
+			// Create folder path (supports nested folders)
+			$folderNode = $this->ensureFolderPath($userFolder, $sSaveFolder);
+
+			$filenameBase = (string) ($this->jsonParam('filename', '') ?: \date('YmdHis'));
+			$safeBase = \MailSo\Base\Utils::SecureFileName(\mb_substr($filenameBase, 0, 100));
+			$filename = $safeBase . '.' . \md5($msgHash) . '.eml';
+
+			$aResult['folder'] = $sSaveFolder;
+			$aResult['filename'] = $filename;
 
 			$oMailClient->MessageMimeStream(
-				function ($rResource) use ($oFiles, $aResult) {
-					if (\is_resource($rResource)) {
-						$aResult['success'] = $oFiles->file_put_contents("{$aResult['folder']}/{$aResult['filename']}", $rResource);
+				function ($rResource) use (&$aResult, $folderNode, $filename) {
+					if (!\is_resource($rResource)) {
+						return;
+					}
+
+					// If exists, overwrite by deleting and recreating (keeps behavior deterministic)
+					if ($folderNode->nodeExists($filename)) {
+						$existing = $folderNode->get($filename);
+						if ($existing instanceof \OCP\Files\File) {
+							$existing->delete();
+						}
+					}
+
+					$fileNode = $folderNode->newFile($filename);
+					$out = $fileNode->fopen('w');
+					if (\is_resource($out)) {
+						\stream_copy_to_stream($rResource, $out);
+						\fclose($out);
+						$aResult['success'] = true;
 					}
 				},
 				(string) $aValues['folder'],
@@ -177,118 +233,148 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $this->jsonResponse(__FUNCTION__, $aResult);
 	}
 
+	/**
+	 * Save message attachments from SnappyMail into Nextcloud Files.
+	 * (Used by SnappyMail "save attachments to nextcloud" actions.)
+	 */
 	public function DoAttachmentsActions(\SnappyMail\AttachmentsAction $data)
 	{
-		if (static::isLoggedIn() && 'nextcloud' === $data->action) {
-			$oFiles = \OCP\Files::getStorage('files');
-			if ($oFiles && \method_exists($oFiles, 'file_put_contents')) {
-				$sSaveFolder = \ltrim($this->jsonParam('NcFolder', ''), '/');
-				$sSaveFolder = $sSaveFolder ?: 'Attachments';
-				$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
-				$data->result = true;
-				foreach ($data->items as $aItem) {
-					$sSavedFileName = empty($aItem['fileName']) ? 'file.dat' : $aItem['fileName'];
-					if (!empty($aItem['data'])) {
-						$sSavedFileNameFull = static::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, $oFiles);
-						if (!$oFiles->file_put_contents($sSavedFileNameFull, $aItem['data'])) {
-							$data->result = false;
-						}
-					} else if (!empty($aItem['fileHash'])) {
-						$fFile = $data->filesProvider->GetFile($data->account, $aItem['fileHash'], 'rb');
-						if (\is_resource($fFile)) {
-							$sSavedFileNameFull = static::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, $oFiles);
-							if (!$oFiles->file_put_contents($sSavedFileNameFull, $fFile)) {
-								$data->result = false;
-							}
-							if (\is_resource($fFile)) {
-								\fclose($fFile);
-							}
-						}
+		if (!static::isLoggedIn() || 'nextcloud' !== $data->action) {
+			return;
+		}
+
+		try {
+			// Target folder in Nextcloud
+			$sSaveFolder = \ltrim((string) $this->jsonParam('NcFolder', ''), '/');
+			$sSaveFolder = $sSaveFolder ?: 'Attachments';
+			$sSaveFolder = \trim($sSaveFolder, '/');
+
+			$userFolder = \OC::$server->getUserFolder();
+			$folderNode = $this->ensureFolderPath($userFolder, $sSaveFolder);
+
+			$data->result = true;
+
+			foreach ($data->items as $aItem) {
+				$sSavedFileName = empty($aItem['fileName']) ? 'file.dat' : (string) $aItem['fileName'];
+				$sSavedFileName = \MailSo\Base\Utils::SecureFileName(\mb_substr($sSavedFileName, 0, 180));
+
+				$finalName = $this->uniqueNameInFolder($folderNode, $sSavedFileName);
+
+				// Create file node
+				$fileNode = $folderNode->newFile($finalName);
+
+				$out = $fileNode->fopen('w');
+				if (!\is_resource($out)) {
+					$data->result = false;
+					continue;
+				}
+
+				$wrote = false;
+
+				if (!empty($aItem['data'])) {
+					// Raw data string
+					$bytes = \fwrite($out, (string) $aItem['data']);
+					$wrote = ($bytes !== false);
+				} else if (!empty($aItem['fileHash'])) {
+					// Stream from SnappyMail temp storage
+					$fFile = $data->filesProvider->GetFile($data->account, (string) $aItem['fileHash'], 'rb');
+					if (\is_resource($fFile)) {
+						\stream_copy_to_stream($fFile, $out);
+						\fclose($fFile);
+						$wrote = true;
 					}
 				}
+
+				\fclose($out);
+
+				if (!$wrote) {
+					// Clean up the empty file
+					try { $fileNode->delete(); } catch (\Throwable $e) {}
+					$data->result = false;
+				}
 			}
+		} catch (\Throwable $e) {
+			$data->result = false;
 		}
 	}
 
 	public function FilterAppData($bAdmin, &$aResult) : void
 	{
-		if (!$bAdmin && \is_array($aResult)) {
-			$ocUser = \OC::$server->getUserSession()->getUser();
-			$sUID = $ocUser->getUID();
-			$oUrlGen = \OC::$server->getURLGenerator();
-			$sWebDAV = $oUrlGen->getAbsoluteURL($oUrlGen->linkTo('', 'remote.php') . '/dav');
-//			$sWebDAV = \OCP\Util::linkToRemote('dav');
-			$aResult['Nextcloud'] = [
-				'UID' => $sUID,
-				'WebDAV' => $sWebDAV,
-				'CalDAV' => $this->Config()->Get('plugin', 'calendar', false)
-//				'WebDAV_files' => $sWebDAV . '/files/' . $sUID
-			];
-			if (empty($aResult['Auth'])) {
-				$config = \OC::$server->getConfig();
-				$sEmail = '';
-				// Only store the user's password in the current session if they have
-				// enabled auto-login using Nextcloud username or email address.
-				if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
-					$sEmail = $sUID;
-				} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
-					$sEmail = $config->getUserValue($sUID, 'settings', 'email', '');
-				} else {
-					\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
-				}
-				// If the user has set credentials for SnappyMail in their personal
-				// settings, override everything before and use those instead.
-				$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', '');
-				if ($sCustomEmail) {
-					$sEmail = $sCustomEmail;
-				}
-				if (!$sEmail) {
-					$sEmail = $ocUser->getEMailAddress();
-//						?: $ocUser->getPrimaryEMailAddress();
-				}
-/*
-				if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
-					if (\OC::$server->getSession()->get('is_oidc')) {
-						$sEmail = "{$sUID}@nextcloud";
-						$aResult['DevPassword'] = \OC::$server->getSession()->get('oidc_access_token');
-					} else {
-						\SnappyMail\Log::debug('Nextcloud', 'Not an OIDC login');
-					}
-				} else {
-					\SnappyMail\Log::debug('Nextcloud', 'OIDC is off');
-				}
-*/
-				$aResult['DevEmail'] = $sEmail ?: '';
-			} else if (!empty($aResult['ContactsSync'])) {
-				$bSave = false;
-				if (empty($aResult['ContactsSync']['Url'])) {
-					$aResult['ContactsSync']['Url'] = "{$sWebDAV}/addressbooks/users/{$sUID}/contacts/";
+		if ($bAdmin || !\is_array($aResult)) {
+			return;
+		}
+
+		$ocUser = \OC::$server->getUserSession()->getUser();
+		if (!$ocUser) {
+			return;
+		}
+
+		$sUID = $ocUser->getUID();
+		$oUrlGen = \OC::$server->getURLGenerator();
+		$sWebDAV = $oUrlGen->getAbsoluteURL($oUrlGen->linkTo('', 'remote.php') . '/dav');
+
+		$aResult['Nextcloud'] = [
+			'UID' => $sUID,
+			'WebDAV' => $sWebDAV,
+			'CalDAV' => $this->Config()->Get('plugin', 'calendar', false)
+		];
+
+		if (empty($aResult['Auth'])) {
+			$config = \OC::$server->getConfig();
+			$sEmail = '';
+
+			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
+				$sEmail = $sUID;
+			} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email', '');
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
+			}
+
+			// User-set SnappyMail credentials override
+			$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', '');
+			if ($sCustomEmail) {
+				$sEmail = $sCustomEmail;
+			}
+
+			if (!$sEmail) {
+				$sEmail = $ocUser->getEMailAddress();
+			}
+
+			$aResult['DevEmail'] = $sEmail ?: '';
+		} else if (!empty($aResult['ContactsSync'])) {
+			$bSave = false;
+
+			if (empty($aResult['ContactsSync']['Url'])) {
+				$aResult['ContactsSync']['Url'] = "{$sWebDAV}/addressbooks/users/{$sUID}/contacts/";
+				$bSave = true;
+			}
+			if (empty($aResult['ContactsSync']['User'])) {
+				$aResult['ContactsSync']['User'] = $sUID;
+				$bSave = true;
+			}
+
+			// FIX: do not array-access the session; use ->get()
+			$pass = (string) \OC::$server->getSession()->get('snappymail-passphrase');
+			if ($pass) {
+				$pass = \SnappyMail\Crypt::DecryptUrlSafe($pass, $sUID);
+				if ($pass) {
+					$aResult['ContactsSync']['Password'] = $pass;
 					$bSave = true;
 				}
-				if (empty($aResult['ContactsSync']['User'])) {
-					$aResult['ContactsSync']['User'] = $sUID;
-					$bSave = true;
-				}
-				$pass = \OC::$server->getSession()['snappymail-passphrase'];
-				if ($pass/* && empty($aResult['ContactsSync']['Password'])*/) {
-					$pass = \SnappyMail\Crypt::DecryptUrlSafe($pass, $sUID);
-					if ($pass) {
-						$aResult['ContactsSync']['Password'] = $pass;
-						$bSave = true;
-					}
-				}
-				if ($bSave) {
-					$oActions = \RainLoop\Api::Actions();
-					$oActions->setContactsSyncData(
-						$oActions->getAccountFromToken(),
-						array(
-							'Mode' => $aResult['ContactsSync']['Mode'],
-							'User' => $aResult['ContactsSync']['User'],
-							'Password' => $aResult['ContactsSync']['Password'],
-							'Url' => $aResult['ContactsSync']['Url']
-						)
-					);
-				}
+			}
+
+			if ($bSave) {
+				$oActions = \RainLoop\Api::Actions();
+				$oActions->setContactsSyncData(
+					$oActions->getAccountFromToken(),
+					[
+						'Mode' => $aResult['ContactsSync']['Mode'],
+						'User' => $aResult['ContactsSync']['User'],
+						'Password' => $aResult['ContactsSync']['Password'],
+						'Url' => $aResult['ContactsSync']['Url']
+					]
+				);
 			}
 		}
 	}
@@ -301,116 +387,124 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$userLang = \OC::$server->getConfig()->getUserValue($userId, 'core', 'lang', 'en');
 			$userLang = \strtr($userLang, '_', '-');
 			$sLanguage = $this->determineLocale($userLang, $aResultLang);
-			// Check if $sLanguage is null
 			if (!$sLanguage) {
-				$sLanguage = 'en'; // Assign 'en' if $sLanguage is null
+				$sLanguage = 'en';
 			}
 		}
 	}
 
-	/**
-	 * Determine locale from user language.
-	 *
-	 * @param string $langCode The name of the input.
-	 * @param array  $languagesArray The value of the array.
-	 *
-	 * @return string return locale
-	 */
 	private function determineLocale(string $langCode, array $languagesArray) : ?string
 	{
-		// Direct check for the language code
-		if (\in_array($langCode, $languagesArray)) {
+		if (\in_array($langCode, $languagesArray, true)) {
 			return $langCode;
 		}
 
-		// Check without country code
 		if (\str_contains($langCode, '-')) {
 			$langCode = \explode('-', $langCode)[0];
-			if (\in_array($langCode, $languagesArray)) {
+			if (\in_array($langCode, $languagesArray, true)) {
 				return $langCode;
 			}
 		}
 
-		// Check with uppercase country code
 		$langCodeWithUpperCase = $langCode . '-' . \strtoupper($langCode);
-		if (\in_array($langCodeWithUpperCase, $languagesArray)) {
+		if (\in_array($langCodeWithUpperCase, $languagesArray, true)) {
 			return $langCodeWithUpperCase;
 		}
 
-		// If no match is found
 		return null;
 	}
 
-	/**
-	 * @param mixed $mResult
-	 */
 	public function MainFabrica(string $sName, &$mResult)
 	{
-		if (static::isLoggedIn()) {
-			if ('suggestions' === $sName && $this->Config()->Get('plugin', 'suggestions', true)) {
-				if (!\is_array($mResult)) {
-					$mResult = array();
-				}
-				include_once __DIR__ . '/NextcloudContactsSuggestions.php';
-				$mResult[] = new NextcloudContactsSuggestions(
-					$this->Config()->Get('plugin', 'ignoreSystemAddressbook', true)
-				);
-			}
-/*
-			if ($this->Config()->Get('plugin', 'storage', false) && ('storage' === $sName || 'storage-local' === $sName)) {
-				require_once __DIR__ . '/storage.php';
-				$oDriver = new \NextcloudStorage(APP_PRIVATE_DATA.'storage', $sName === 'storage-local');
-			}
-*/
+		if (!static::isLoggedIn()) {
+			return;
 		}
+
+		if ('suggestions' === $sName && $this->Config()->Get('plugin', 'suggestions', true)) {
+			if (!\is_array($mResult)) {
+				$mResult = [];
+			}
+			include_once __DIR__ . '/NextcloudContactsSuggestions.php';
+			$mResult[] = new NextcloudContactsSuggestions(
+				$this->Config()->Get('plugin', 'ignoreSystemAddressbook', true)
+			);
+		}
+
+		// storage hook left as upstream (commented)
 	}
 
 	protected function configMapping() : array
 	{
-		return array(
+		return [
 			\RainLoop\Plugins\Property::NewInstance('suggestions')->SetLabel('Suggestions')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(true),
+
 			\RainLoop\Plugins\Property::NewInstance('ignoreSystemAddressbook')->SetLabel('Ignore system addressbook')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(true),
-/*
-			\RainLoop\Plugins\Property::NewInstance('storage')->SetLabel('Use Nextcloud user ID in config storage path')
-				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
-				->SetDefaultValue(false)
-*/
+
 			\RainLoop\Plugins\Property::NewInstance('calendar')->SetLabel('Enable "Put ICS in calendar"')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(false)
-		);
+		];
 	}
 
-	private static function SmartFileExists(string $sFilePath, $oFiles) : string
+	/**
+	 * Ensure a (possibly nested) folder path exists under the given base folder.
+	 */
+	private function ensureFolderPath(\OCP\Files\Folder $baseFolder, string $path) : \OCP\Files\Folder
 	{
-		$sFilePath = \str_replace('\\', '/', \trim($sFilePath));
-
-		if (!$oFiles->file_exists($sFilePath)) {
-			return $sFilePath;
+		$path = \trim($path, '/');
+		if ($path === '') {
+			return $baseFolder;
 		}
 
-		$aFileInfo = \pathinfo($sFilePath);
-
-		$iIndex = 0;
-
-		while (true) {
-			++$iIndex;
-			$sFilePathNew = $aFileInfo['dirname'].'/'.
-				\preg_replace('/\(\d{1,2}\)$/', '', $aFileInfo['filename']).
-				' ('.$iIndex.')'.
-				(empty($aFileInfo['extension']) ? '' : '.'.$aFileInfo['extension'])
-			;
-			if (!$oFiles->file_exists($sFilePathNew)) {
-				return $sFilePathNew;
-			}
-			if (10 < $iIndex) {
-				break;
+		$folderNode = $baseFolder;
+		foreach (\array_filter(\explode('/', $path), 'strlen') as $part) {
+			$part = (string) $part;
+			if ($folderNode->nodeExists($part)) {
+				$node = $folderNode->get($part);
+				if ($node instanceof \OCP\Files\Folder) {
+					$folderNode = $node;
+				} else {
+					// name collision: file exists where folder needed; create a suffixed folder
+					$folderNode = $folderNode->newFolder($part . '-folder');
+				}
+			} else {
+				$folderNode = $folderNode->newFolder($part);
 			}
 		}
-		return $sFilePath;
+
+		return $folderNode;
+	}
+
+	/**
+	 * Return a unique filename inside a Nextcloud folder (keeps original extension).
+	 */
+	private function uniqueNameInFolder(\OCP\Files\Folder $folderNode, string $fileName) : string
+	{
+		$fileName = \trim($fileName);
+		if ($fileName === '') {
+			$fileName = 'file.dat';
+		}
+
+		if (!$folderNode->nodeExists($fileName)) {
+			return $fileName;
+		}
+
+		$info = \pathinfo($fileName);
+		$base = $info['filename'] ?? 'file';
+		$ext  = isset($info['extension']) && $info['extension'] !== '' ? ('.' . $info['extension']) : '';
+
+		for ($i = 1; $i <= 50; $i++) {
+			$try = $base . ' (' . $i . ')' . $ext;
+			if (!$folderNode->nodeExists($try)) {
+				return $try;
+			}
+		}
+
+		// fallback
+		return $fileName;
 	}
 }

From 901d0efd6f9ff85f94168e64a10f84725138d1e4 Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Thu, 19 Feb 2026 17:43:35 +0100
Subject: [PATCH 12/17] Update docker-pr.yml

correct repo name for uploads
---
 .github/workflows/docker-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index 0ba375b5c..55a777acd 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -21,7 +21,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          nextgen-networks/snappymail
+          nextgennetworks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=pr generates tag(s) on PRs only. E.g. 'pr-123', 'pr-123-abc0123'
         tags: |

From f748a686c95c2aed3566c50ba92817215f4db692 Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Thu, 19 Feb 2026 19:06:14 +0100
Subject: [PATCH 13/17] Update docker.yml

fix wrong docker hub repo name
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4115ffce9..28fb6f31e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
         DOCKER_METADATA_PR_HEAD_SHA: 'true'
       with:
         images: |
-          nextgen-networks/snappymail
+          nextgennetworks/snappymail
           ghcr.io/${{ github.repository }}
         # type=ref,event=branch generates tag(s) on branch only. E.g. 'master', 'master-abc0123'
         # type=ref,event=tag generates tag(s) on tags only. E.g. 'v0.0.0', 'v0.0.0-abc0123', and 'latest'

From a88d24c38a243471a57530933103a8920acd090e Mon Sep 17 00:00:00 2001
From: Nextgen-Networks <reg-github.com@nextgen-networks.de>
Date: Fri, 20 Feb 2026 11:30:14 +0100
Subject: [PATCH 14/17] Update release.php

change repo
---
 cli/release.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/release.php b/cli/release.php
index 847dd14e2..2e4e12c46 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -207,7 +207,7 @@ if ($options['aur']) {
 	pkgdesc = modern PHP webmail client
 	pkgver = '.$package->version.'
 	pkgrel = 1
-	url = https://github.com/the-djmaze/snappymail
+	url = https://github.com/nextgen-networks/snappymail
 	arch = any
 	license = AGPL3
 	makedepends = php
@@ -218,7 +218,7 @@ if ($options['aur']) {
 	optdepends = mariadb: storage backend for contacts
 	optdepends = php-pgsql: storage backend for contacts
 	optdepends = php-sqlite: storage backend for contacts
-	source = snappymail-'.$package->version.'.tar.gz::https://github.com/the-djmaze/snappymail/archive/v'.$package->version.'.tar.gz
+	source = snappymail-'.$package->version.'.tar.gz::https://github.com/nextgen-networks/snappymail/archive/v'.$package->version.'.tar.gz
 	source = snappymail.sysusers
 	source = snappymail.tmpfiles
 	b2sums = '.implode("\n	b2sums = ", $b2sums).'
@@ -269,7 +269,7 @@ if (isset($options['sign'])) {
 	if (isset($options['debian'])) {
 		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var);
-		// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
+		// https://github.com/nextgen-networks/snappymail/issues/185#issuecomment-1059420588
 		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);

From 0b86edb1679eea0ccedac0ba619fd3a5a05346ff Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 20 Feb 2026 11:18:25 +0000
Subject: [PATCH 15/17] Update SnappyMail repository references to
 nextgen-networks

Replaced references to https://github.com/the-djmaze/snappymail with
https://github.com/nextgen-networks/snappymail/ across the repository,
excluding README files as requested.

The replacement handles trailing slashes carefully to ensure bare URLs
include the slash while sub-paths (like /issues/ or .git) do not result
in double slashes. Files that already used the new domain were also
updated to ensure consistent trailing slash usage.

Co-authored-by: nextgen-networks <21206978+nextgen-networks@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md          |    2 +-
 CHANGELOG.md                                  | 1124 ++++++++---------
 CONTRIBUTING.md                               |    2 +-
 build/arch/PKGBUILD                           |    2 +-
 build/deb.php                                 |    2 +-
 build/deb/DEBIAN/control                      |    4 +-
 cli/release.php                               |    2 +-
 dev/Common/Html.js                            |   16 +-
 dev/Common/UtilsUser.js                       |    4 +-
 dev/Component/EmailAddresses.js               |    2 +-
 dev/External/SquireUI.js                      |    6 +-
 dev/Model/FolderCollection.js                 |    4 +-
 dev/Remote/AbstractFetch.js                   |    2 +-
 dev/Settings/User/Security.js                 |    2 +-
 dev/Stores/Theme.js                           |    2 +-
 dev/Stores/User/Messagelist.js                |    2 +-
 dev/Styles/Main.less                          |    2 +-
 dev/Styles/User/FolderList.less               |    2 +-
 dev/View/Popup/Compose.js                     |    2 +-
 dev/View/Popup/Domain.js                      |    2 +-
 examples/eml/tnef.eml                         |    2 +-
 integrations/cloudron/Dockerfile              |    2 +-
 integrations/nextcloud/snappymail/INSTALL     |    2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |   16 +-
 .../nextcloud/snappymail/css/embed.css        |    4 +-
 .../snappymail/lib/Migration/InstallStep.php  |    4 +-
 .../snappymail/lib/Util/SnappyMailHelper.php  |    4 +-
 integrations/owncloud/snappymail/CHANGELOG.md |  296 ++---
 .../owncloud/snappymail/appinfo/info.xml      |   12 +-
 .../owncloud/snappymail/css/embed.css         |    4 +-
 .../snappymail/lib/Util/SnappyMailHelper.php  |    4 +-
 integrations/virtualmin/snappymail.pl         |    2 +-
 package.json                                  |    4 +-
 plugins/attachments-force-open/index.php      |    2 +-
 plugins/auto-domain-grab/index.php            |    2 +-
 plugins/avatars/index.php                     |    2 +-
 plugins/compact-composer/index.php            |    2 +-
 .../compact-composer/js/CompactComposer.js    |    6 +-
 plugins/demo-account/index.php                |    2 +-
 .../ldap-mail-accounts/LdapMailAccounts.php   |    4 +-
 plugins/ldap-mail-accounts/index.php          |    2 +-
 plugins/login-cpanel/index.php                |    2 +-
 plugins/login-gmail/index.php                 |    2 +-
 plugins/login-o365/index.php                  |    2 +-
 plugins/login-remote/index.php                |    2 +-
 plugins/login-virtuser/index.php              |    2 +-
 plugins/nextcloud/js/composer.js              |    2 +-
 plugins/nextcloud/js/message.js               |    2 +-
 plugins/nextcloud/js/webdav.js                |    4 +-
 plugins/search-filters/index.php              |    2 +-
 .../two-factor-auth/js/TwoFactorAuthLogin.js  |    2 +-
 .../libraries/MailSo/Base/DateTimeHelper.php  |    4 +-
 .../libraries/MailSo/Imap/BodyStructure.php   |    2 +-
 .../MailSo/Imap/Commands/Folders.php          |    2 +-
 .../libraries/MailSo/Imap/SearchCriterias.php |    4 +-
 .../MailSo/Imap/Traits/ResponseParser.php     |    4 +-
 .../libraries/MailSo/Imap/Traits/Status.php   |    4 +-
 .../app/libraries/MailSo/Mail/Message.php     |    2 +-
 .../libraries/MailSo/Net/ConnectSettings.php  |    2 +-
 .../libraries/MailSo/Sieve/SieveClient.php    |    2 +-
 .../app/libraries/MailSo/Smtp/Settings.php    |    2 +-
 .../app/libraries/MailSo/Smtp/SmtpClient.php  |    2 +-
 .../libraries/RainLoop/Actions/Accounts.php   |    2 +-
 .../libraries/RainLoop/Actions/Folders.php    |    4 +-
 .../libraries/RainLoop/Actions/Messages.php   |    6 +-
 .../app/libraries/RainLoop/Actions/Raw.php    |    4 +-
 .../libraries/RainLoop/Actions/UserAuth.php   |    2 +-
 .../0.0.0/app/libraries/RainLoop/Pdo/Base.php |    2 +-
 .../0.0.0/app/libraries/RainLoop/Service.php  |    6 +-
 .../v/0.0.0/app/libraries/RainLoop/Utils.php  |    2 +-
 .../app/libraries/snappymail/cookies.php      |    2 +-
 .../app/libraries/snappymail/gpg/base.php     |    4 +-
 .../app/libraries/snappymail/gpg/pgp.php      |    6 +-
 .../app/libraries/snappymail/gpg/smime.php    |    6 +-
 .../libraries/snappymail/image/imagick.php    |    2 +-
 .../app/libraries/snappymail/integrity.php    |    4 +-
 .../app/libraries/snappymail/sasl/login.php   |    2 +-
 .../app/libraries/snappymail/sasl/scram.php   |    2 +-
 .../Views/Admin/AdminSettingsAbout.html       |    6 +-
 .../Views/Admin/AdminSettingsGeneral.html     |    4 +-
 .../templates/Views/Admin/PopupsDomain.html   |    2 +-
 snappymail/v/0.0.0/cpanel.php                 |    2 +-
 snappymail/v/0.0.0/include.php                |    2 +-
 83 files changed, 844 insertions(+), 844 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 998692964..9c16abc7e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
 - Mode: [e.g. standalone, nextcloud, cyberpanel, docker]
 
 **Debug/logging information**
-[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)
+[Read here how to log](https://github.com/nextgen-networks/snappymail/wiki/FAQ#how-do-i-enable-logging)
 - [ ] I've placed them here (few lines) or as attachments (many lines)
 
 **Additional context**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d31a1b771..6d11b12ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 2.38.2 – 2024-10-09
 ### Fixed
 - error '$index is not defined' in Settings > Accounts
-  [#1797](https://github.com/the-djmaze/snappymail/issues/1797)
+  [#1797](https://github.com/nextgen-networks/snappymail/issues/1797)
 
 
 ## 2.38.1 – 2024-10-08
@@ -9,15 +9,15 @@
 ### Added
 - Admin - Extensions search filter
 - Options to unset current font family and size
-  [#1726](https://github.com/the-djmaze/snappymail/issues/1726)
+  [#1726](https://github.com/nextgen-networks/snappymail/issues/1726)
 - Option to allow insecure cryptkey
-  [#1746](https://github.com/the-djmaze/snappymail/issues/1746)
+  [#1746](https://github.com/nextgen-networks/snappymail/issues/1746)
 - Save vCard FN property
-  [#1761](https://github.com/the-djmaze/snappymail/issues/1761)
+  [#1761](https://github.com/nextgen-networks/snappymail/issues/1761)
 - Docker Nginx should listen on IPv6 addresses in addition to IPv4
-  [#1770](https://github.com/the-djmaze/snappymail/issues/1770)
+  [#1770](https://github.com/nextgen-networks/snappymail/issues/1770)
 - Full-screen Message View on Double-Click
-  [#1787](https://github.com/the-djmaze/snappymail/issues/1787)
+  [#1787](https://github.com/nextgen-networks/snappymail/issues/1787)
 
 ### Changed
 - Use the custom Squire as submodule vendors/squire2
@@ -25,11 +25,11 @@
 - Keep 1 space between HTML elements in compressed templates
 - Squire: sanitizeToDOMFragment now uses cleanHTML()
 - Squire: improved handling of BR elements
-  [#1389](https://github.com/the-djmaze/snappymail/issues/1389)
+  [#1389](https://github.com/nextgen-networks/snappymail/issues/1389)
 - Nextcloud border-radius by @gnilebein
-  [#1790](https://github.com/the-djmaze/snappymail/pull/1790)
+  [#1790](https://github.com/nextgen-networks/snappymail/pull/1790)
 - Compose window sentFolder handling for
-  [#1793](https://github.com/the-djmaze/snappymail/pull/1793)
+  [#1793](https://github.com/nextgen-networks/snappymail/pull/1793)
 - Update Portuguese by @ner00
 - Update Polish by @tinola
 - Update French by @hguilbert
@@ -40,18 +40,18 @@
 - Composer dialog "from" triangle button wrong position due to font changes
 - Admin - Config `search` should be ko.observable() not ko.observableArray()
 - Squire: paste images
-  [#1389](https://github.com/the-djmaze/snappymail/issues/1389)
+  [#1389](https://github.com/nextgen-networks/snappymail/issues/1389)
 - Domain whitelist failures on login
-  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
+  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
 - Sieve parse errors
 - Sieve support `index` was not optional for
-  [#1709](https://github.com/the-djmaze/snappymail/issues/1709)
+  [#1709](https://github.com/nextgen-networks/snappymail/issues/1709)
 - Pagination problem for large mailbox after 2.36.1
-  [#1716](https://github.com/the-djmaze/snappymail/issues/1716)
+  [#1716](https://github.com/nextgen-networks/snappymail/issues/1716)
 - Undefined constant "LOG_ERROR"
-  [#1754](https://github.com/the-djmaze/snappymail/issues/1754)
+  [#1754](https://github.com/nextgen-networks/snappymail/issues/1754)
 - Search Filter Capital "B" not working
-  [#1780](https://github.com/the-djmaze/snappymail/issues/1780)
+  [#1780](https://github.com/nextgen-networks/snappymail/issues/1780)
 - PHP 8.4: Implicitly nullable parameter declarations deprecated
 
 
@@ -59,11 +59,11 @@
 
 ### Added
 - Remove `tel:` links when converting HTML to plain
-  [#1724](https://github.com/the-djmaze/snappymail/issues/1724)
+  [#1724](https://github.com/nextgen-networks/snappymail/issues/1724)
 - Convert HTML to Markdown instead of plain, by using [Turndown](https://github.com/mixmark-io/turndown)
-  [#1604](https://github.com/the-djmaze/snappymail/issues/1604)
+  [#1604](https://github.com/nextgen-networks/snappymail/issues/1604)
 - Check HTMLInputElement.validity() for
-  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
+  [#1733](https://github.com/nextgen-networks/snappymail/issues/1733)
 
 ### Changed
 - Use a modified [Squire 2.3.2](https://github.com/the-djmaze/Squire/commits/snappymail/)
@@ -72,13 +72,13 @@
 
 ### Fixed
 - mXSS exploit found by SonarSource
-  [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
+  [CVE-2024-45800](https://github.com/nextgen-networks/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
 - Call to a member function Email() on null
-  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
+  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
 - IMAP capabilities via IMAP Proxy
-  [#1725](https://github.com/the-djmaze/snappymail/issues/1725)
+  [#1725](https://github.com/nextgen-networks/snappymail/issues/1725)
 - Messages on page setting is not validated against 999 max
-  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
+  [#1733](https://github.com/nextgen-networks/snappymail/issues/1733)
 
 
 ## 2.37.3 – 2024-08-27
@@ -87,38 +87,38 @@
 - Mark images with width=1 as tracking pixel
 - Show warning in Admin -> About when PHP runs in 32bit
 - Edit ACL rules
-  [#157](https://github.com/the-djmaze/snappymail/issues/157)
+  [#157](https://github.com/nextgen-networks/snappymail/issues/157)
 - Show GnuPG version for
-  [#1560](https://github.com/the-djmaze/snappymail/issues/1560)
+  [#1560](https://github.com/nextgen-networks/snappymail/issues/1560)
 - Make sure only scalar values are allowed in $_ENV for
-  [#1560](https://github.com/the-djmaze/snappymail/issues/1560)
+  [#1560](https://github.com/nextgen-networks/snappymail/issues/1560)
 - Change minimum new mail check interval
-  [#1678](https://github.com/the-djmaze/snappymail/issues/1678)
+  [#1678](https://github.com/nextgen-networks/snappymail/issues/1678)
 - Sieve editor does not support "index" extension
-  [#1709](https://github.com/the-djmaze/snappymail/issues/1709)
+  [#1709](https://github.com/nextgen-networks/snappymail/issues/1709)
 
 ### Changed
 - Improved domain autoconfig interaction
 - MS autodiscover priorities DNS over subdomain
 - Simplify sieve scripts list
-  [#1675](https://github.com/the-djmaze/snappymail/issues/1675)
+  [#1675](https://github.com/nextgen-networks/snappymail/issues/1675)
 - Handling of (token) errors due to
-  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
+  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
 - Sabre/Xml to v4.0.5
 - Update Chinese by @Artoria2e5
 - Update French by @hguilbert
 
 ### Fixed
 - Thread sorting visible after disabling the imap capability
-  [#1574](https://github.com/the-djmaze/snappymail/issues/1574)
+  [#1574](https://github.com/nextgen-networks/snappymail/issues/1574)
 - Creating new message impossible as long as a draft exists?
-  [#1710](https://github.com/the-djmaze/snappymail/issues/1710)
+  [#1710](https://github.com/nextgen-networks/snappymail/issues/1710)
 - InvalidToken error at login
-  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
+  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
 
 ### Nextcloud
 - Force Nextcloud personal language by default
-  [#1428](https://github.com/the-djmaze/snappymail/issues/1428)
+  [#1428](https://github.com/nextgen-networks/snappymail/issues/1428)
 
 
 ## 2.37.2 – 2024-08-13
@@ -132,7 +132,7 @@
 
 ### Nextcloud
 - Failed loading due to Office365 OAuth2 attempt
-  [#1703](https://github.com/the-djmaze/snappymail/issues/1703)
+  [#1703](https://github.com/nextgen-networks/snappymail/issues/1703)
 
 
 ## 2.37.1 – 2024-08-12
@@ -149,15 +149,15 @@
 ### Added
 - JavaScript event `rl-vm-visible`
 - Detailed error message on account switch failure for
-  [#1594](https://github.com/the-djmaze/snappymail/issues/1594)
+  [#1594](https://github.com/nextgen-networks/snappymail/issues/1594)
 - Workarounds for Microsoft OAuth2 (currently requires Apache AcceptPathInfo)
-  [#1645](https://github.com/the-djmaze/snappymail/issues/1645)
+  [#1645](https://github.com/nextgen-networks/snappymail/issues/1645)
 - Support "mark for deletion"
-  [#1657](https://github.com/the-djmaze/snappymail/issues/1657) by @smsoft-ru
+  [#1657](https://github.com/nextgen-networks/snappymail/issues/1657) by @smsoft-ru
 - Invoke "Update Identity" pop up right after login (when not initialized)
-  [#1689](https://github.com/the-djmaze/snappymail/issues/1689)
+  [#1689](https://github.com/nextgen-networks/snappymail/issues/1689)
 - Keyboard shortcut for "Swap default (background) color"
-  [#1690](https://github.com/the-djmaze/snappymail/issues/1690)
+  [#1690](https://github.com/nextgen-networks/snappymail/issues/1690)
 
 ### Changed
 - Updated gulp to v5
@@ -166,7 +166,7 @@
 - Align save button in admin security settings
 - Made registerProtocolHandler('mailto') optional by activating at Settings -> General
 - Improved InvalidToken handling for
-  [#1653](https://github.com/the-djmaze/snappymail/issues/1653)
+  [#1653](https://github.com/nextgen-networks/snappymail/issues/1653)
 - Cleanup localizations
 - Update French by @hguilbert
 - Update German by @tkasch
@@ -177,41 +177,41 @@
 - prevent multiple afterShow() and afterHide() due to `transitionend` on multiple CSS properties
 - Attempt to read property "smimeSigned" on null
 - Refreshing mail list doesn't update current message
-  [#1654](https://github.com/the-djmaze/snappymail/issues/1654)
+  [#1654](https://github.com/nextgen-networks/snappymail/issues/1654)
 - Deletion of CACHE folder causing error
-  [#1660](https://github.com/the-djmaze/snappymail/issues/1660)
+  [#1660](https://github.com/nextgen-networks/snappymail/issues/1660)
 - Multiple line breaks are not displayed
-  [#1666](https://github.com/the-djmaze/snappymail/issues/1666)
+  [#1666](https://github.com/nextgen-networks/snappymail/issues/1666)
 - RainLoop\Exceptions\ClientException::__construct(): Argument #2 ($oPrevious) must be of type ?Throwable, string given
-  [#1686](https://github.com/the-djmaze/snappymail/issues/1686)
+  [#1686](https://github.com/nextgen-networks/snappymail/issues/1686)
 - SpamAssassin Division by zero
-  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
+  [#1694](https://github.com/nextgen-networks/snappymail/issues/1694)
 - Failed to parse RFC 2822 date '6 Jul 2024 16:42:09 +0200'
-  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
+  [#1694](https://github.com/nextgen-networks/snappymail/issues/1694)
 - Fix capabilities when THREAD is disabled
-  [#1698](https://github.com/the-djmaze/snappymail/pull/1698) by @akhil1508
+  [#1698](https://github.com/nextgen-networks/snappymail/pull/1698) by @akhil1508
 
 ### Nextcloud
 - Failed loading due to incorrect `app_path`
 - Bugfix language detection
 - Allow multi-account in nc with oauth login
-  [#1699](https://github.com/the-djmaze/snappymail/pull/1699) by @akhil1508
+  [#1699](https://github.com/nextgen-networks/snappymail/pull/1699) by @akhil1508
 
 
 ## 2.36.4 – 2024-06-25
 
 ### Added
 - Customize private key passphrase expiration interval
-  [#1545](https://github.com/the-djmaze/snappymail/discussions/1545)
+  [#1545](https://github.com/nextgen-networks/snappymail/discussions/1545)
 - AdvancedSearch support for filtering mails before a given date
-  [#1606](https://github.com/the-djmaze/snappymail/pull/1606) by @codiflow
+  [#1606](https://github.com/nextgen-networks/snappymail/pull/1606) by @codiflow
 - Control valid spam and virus headers
-  [#1607](https://github.com/the-djmaze/snappymail/issues/1607)
+  [#1607](https://github.com/nextgen-networks/snappymail/issues/1607)
 - Remember S/MIME private Key without function
-  [#1611](https://github.com/the-djmaze/snappymail/issues/1611)
+  [#1611](https://github.com/nextgen-networks/snappymail/issues/1611)
 - Resize compose dialog
 - Magnetic theme
-  [#1637](https://github.com/the-djmaze/snappymail/pull/1637) by @TheCuteFoxxy
+  [#1637](https://github.com/nextgen-networks/snappymail/pull/1637) by @TheCuteFoxxy
 
 ### Changed
 - Improved signing messages by allowing to choose between the options
@@ -226,17 +226,17 @@
 - Default language error
 - Undefined $sEmail in DoAdminDomainMatch
 - Handling Autocrypt header failed on `=`
-  [#1608](https://github.com/the-djmaze/snappymail/issues/1608)
+  [#1608](https://github.com/nextgen-networks/snappymail/issues/1608)
 - Blank lines are inserted when editing draft
-  [#1609](https://github.com/the-djmaze/snappymail/issues/1609)
+  [#1609](https://github.com/nextgen-networks/snappymail/issues/1609)
 - Workaround Cyrus MAILBOXID bug (disable OBJECTID capability by default due to impact)
-  [#1640](https://github.com/the-djmaze/snappymail/issues/1640)
+  [#1640](https://github.com/nextgen-networks/snappymail/issues/1640)
 - Workaround HTML with multiple body elements or MIME with multiple text/html
-  [#1641](https://github.com/the-djmaze/snappymail/issues/1641)
+  [#1641](https://github.com/nextgen-networks/snappymail/issues/1641)
 
 ### Nextcloud
 - OIDC stay logged in
-  [#1620](https://github.com/the-djmaze/snappymail/pull/1620) by @avinash-0007
+  [#1620](https://github.com/nextgen-networks/snappymail/pull/1620) by @avinash-0007
 
 
 ## 2.36.3 – 2024-05-27
@@ -246,16 +246,16 @@
 
 ### Fixed
 - Undefined variable $aTokenData
-  [#1567](https://github.com/the-djmaze/snappymail/issues/1567)
+  [#1567](https://github.com/nextgen-networks/snappymail/issues/1567)
 
 
 ## 2.36.2 – 2024-05-26
 
 ### Added
 - "copy to" action in menu's for
-  [#1559](https://github.com/the-djmaze/snappymail/issues/1559)
+  [#1559](https://github.com/nextgen-networks/snappymail/issues/1559)
 - Log signal info for
-  [#1569](https://github.com/the-djmaze/snappymail/issues/1569)
+  [#1569](https://github.com/nextgen-networks/snappymail/issues/1569)
 - OpenPGP.js automatically import backup keys from server
 
 ### Changed
@@ -265,23 +265,23 @@
 
 ### Fixed
 - "Account already exists"
-  [#1561](https://github.com/the-djmaze/snappymail/issues/1561)
+  [#1561](https://github.com/nextgen-networks/snappymail/issues/1561)
 - Properly escape path separator in tar.php file list regex
-  [#1562](https://github.com/the-djmaze/snappymail/pull/1562) by @sevmonster
+  [#1562](https://github.com/nextgen-networks/snappymail/pull/1562) by @sevmonster
 - Prevent mkdir() error
-  [#1565](https://github.com/the-djmaze/snappymail/issues/1565)
+  [#1565](https://github.com/nextgen-networks/snappymail/issues/1565)
 - SCRAM Exception when trying to log in to SMTP
-  [#1575](https://github.com/the-djmaze/snappymail/issues/1575)
+  [#1575](https://github.com/nextgen-networks/snappymail/issues/1575)
 - Error when redirected back to instance after Gmail OAuth
-  [#1580](https://github.com/the-djmaze/snappymail/issues/1580)
+  [#1580](https://github.com/nextgen-networks/snappymail/issues/1580)
 - Uncaught TypeError: hasPublicKeyForEmails(...).then is not a function
-  [#1589](https://github.com/the-djmaze/snappymail/issues/1589)
+  [#1589](https://github.com/nextgen-networks/snappymail/issues/1589)
 - Undefined variable $sFilename
 - GPG/PGP exec() return false handling
 
 ### Nextcloud
 - OIDC login active again
-  [#1572](https://github.com/the-djmaze/snappymail/pull/1572) by @avinash-0007
+  [#1572](https://github.com/nextgen-networks/snappymail/pull/1572) by @avinash-0007
 
 
 ## 2.36.1 – 2024-04-23
@@ -292,7 +292,7 @@
 - Handle RFC 5987 in Content-Disposition header
 - Ignore text/x-amp-html
 - Show SMTP error to user
-  [#1521](https://github.com/the-djmaze/snappymail/issues/1521)
+  [#1521](https://github.com/nextgen-networks/snappymail/issues/1521)
 - OAuth2 for login using gmail (and others)
 
 ### Changed
@@ -315,19 +315,19 @@
 - Content encoding and type detection in JavaScript could fail due to case-sensitivity.
 - Extensions set logger failed
 - GnuPG check open_basedir and if shell_exec is disabled
-  [#1385](https://github.com/the-djmaze/snappymail/issues/1385)
-  [#1496](https://github.com/the-djmaze/snappymail/issues/1496)
-  [#1555](https://github.com/the-djmaze/snappymail/issues/1555)
+  [#1385](https://github.com/nextgen-networks/snappymail/issues/1385)
+  [#1496](https://github.com/nextgen-networks/snappymail/issues/1496)
+  [#1555](https://github.com/nextgen-networks/snappymail/issues/1555)
 - Hide pagination when search result has no messages
 - Prevent mbstring error before setup.php
 - Prevent MessagesPerPage Infinity
-  [#1540](https://github.com/the-djmaze/snappymail/issues/1540)
+  [#1540](https://github.com/nextgen-networks/snappymail/issues/1540)
 - Reseal CryptKey failed
-  [#1543](https://github.com/the-djmaze/snappymail/issues/1543)
+  [#1543](https://github.com/nextgen-networks/snappymail/issues/1543)
 
 ### Nextcloud
 - Add an occ command to set up the login settings
-  [#1552](https://github.com/the-djmaze/snappymail/issues/1552)
+  [#1552](https://github.com/nextgen-networks/snappymail/issues/1552)
 
 
 ## 2.36.0 – 2024-03-18
@@ -336,24 +336,24 @@
 - Allow setting the supported THREAD algorithm
 - Icon to system folders
 - Remove remembered password after 15 minutes of inactivity
-  [#1142](https://github.com/the-djmaze/snappymail/issues/1142)
+  [#1142](https://github.com/nextgen-networks/snappymail/issues/1142)
 - Swap background and text color for unreadable text on dark background
-  [#1486](https://github.com/the-djmaze/snappymail/issues/1486)
+  [#1486](https://github.com/nextgen-networks/snappymail/issues/1486)
 - Generate TOTP code at ?Admin -> Security
-  [#1501](https://github.com/the-djmaze/snappymail/issues/1501)
+  [#1501](https://github.com/nextgen-networks/snappymail/issues/1501)
 - Button to change S/MIME private key passphrase
-  [#1505](https://github.com/the-djmaze/snappymail/issues/1505)
+  [#1505](https://github.com/nextgen-networks/snappymail/issues/1505)
 - Belarusian
-  [#1512](https://github.com/the-djmaze/snappymail/pull/1512) by @spoooyders
+  [#1512](https://github.com/nextgen-networks/snappymail/pull/1512) by @spoooyders
 - Log some domain idn_to_ascii issues
-  [#1513](https://github.com/the-djmaze/snappymail/issues/1513)
+  [#1513](https://github.com/nextgen-networks/snappymail/issues/1513)
 
 ### Changed
 - On folder/mailbox rename, also rename all children instead of reloading all
 - Seal MainAccount CryptKey and on error ask old login passphrase to reseal key.
 - Moved cache drivers outside core into extensions
 - Sieve always allow fileinto INBOX
-  [#1510](https://github.com/the-djmaze/snappymail/issues/1510)
+  [#1510](https://github.com/nextgen-networks/snappymail/issues/1510)
 - Moved application.ini `sieve_auth_plain_initial` to per domain config
 - Languages use rfc5646, by using the shortest ISO 639 code by default
 - Update French by @hguilbert
@@ -364,15 +364,15 @@
 - On folder/mailbox rename, the checkable option was not renamed
 - Sort accounts drag & drop
 - S/MIME encrypted and opaque signed not visible
-  [#1450](https://github.com/the-djmaze/snappymail/issues/1450)
+  [#1450](https://github.com/nextgen-networks/snappymail/issues/1450)
 - Wrong last UID of thread
-  [#1507](https://github.com/the-djmaze/snappymail/issues/1507)
+  [#1507](https://github.com/nextgen-networks/snappymail/issues/1507)
 - Creation of dynamic property SnappyMail\DAV\Client::$HTTP
-  [#1509](https://github.com/the-djmaze/snappymail/issues/1509)
+  [#1509](https://github.com/nextgen-networks/snappymail/issues/1509)
 - "Download as ZIP" fails for messages
-  [#1514](https://github.com/the-djmaze/snappymail/issues/1514)
+  [#1514](https://github.com/nextgen-networks/snappymail/issues/1514)
 - SMTP "Authentication failed" when IMAP uses `shortLogin` and SMTP not
-  [#1517](https://github.com/the-djmaze/snappymail/issues/1517)
+  [#1517](https://github.com/nextgen-networks/snappymail/issues/1517)
 
 
 ## 2.35.4 – 2024-03-16
@@ -388,19 +388,19 @@
 
 ### Fixed
 - Raise JS TypeEroor "toLowerCase" after update
-  [#1491](https://github.com/the-djmaze/snappymail/issues/1491)
+  [#1491](https://github.com/nextgen-networks/snappymail/issues/1491)
 - Call to undefined function shell_exec
-  [#1496](https://github.com/the-djmaze/snappymail/issues/1496)
+  [#1496](https://github.com/nextgen-networks/snappymail/issues/1496)
 - Download attachments as ZIP doesn't work for PGP encrypted mail
-  [#1499](https://github.com/the-djmaze/snappymail/issues/1499)
+  [#1499](https://github.com/nextgen-networks/snappymail/issues/1499)
 - Importing or downloading a PGP public key attachment from a PGP encrypted message doesn't work
-  [#1500](https://github.com/the-djmaze/snappymail/issues/1500)
+  [#1500](https://github.com/nextgen-networks/snappymail/issues/1500)
 - VCard PHP Notice: Undefined index: ENCODING
 
 ### Nextcloud
 - Changed stored password handling
 - Can't login from nextcloud with 2.35.3 bug Nextcloud
-  [#1490](https://github.com/the-djmaze/snappymail/issues/1490)
+  [#1490](https://github.com/nextgen-networks/snappymail/issues/1490)
 
 
 ## 2.35.3 – 2024-03-12
@@ -408,14 +408,14 @@
 ### Added
 - GnuPG can be disabled
 - Missing strings for localization inside identity popup (Cryptography > S/MIME)
-  [#1458](https://github.com/the-djmaze/snappymail/issues/1458)
+  [#1458](https://github.com/nextgen-networks/snappymail/issues/1458)
 - Automatically verify PGP and S/MIME signed messages
 - TNEFDecoder for
-  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
+  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
 - RTF to HTML converter for
-  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
+  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
 - Polyfill for PHP ctype
-  [#1250](https://github.com/the-djmaze/snappymail/issues/1250)
+  [#1250](https://github.com/nextgen-networks/snappymail/issues/1250)
 
 ### Changed
 - `new Error()` to `Error()`
@@ -438,20 +438,20 @@
 - Handling of Internationalized Domain Names in several areas
 - Decrypt error message
 - Stalwart ManageSieve Error 352 when getting Filters
-  [#1455](https://github.com/the-djmaze/snappymail/issues/1455)
+  [#1455](https://github.com/nextgen-networks/snappymail/issues/1455)
 - Nextcloud V25+ theme slightly broken
-  [#1463](https://github.com/the-djmaze/snappymail/issues/1463)
+  [#1463](https://github.com/nextgen-networks/snappymail/issues/1463)
 - PGP decryption fails with "Not armored text"
-  [#1462](https://github.com/the-djmaze/snappymail/issues/1462)
+  [#1462](https://github.com/nextgen-networks/snappymail/issues/1462)
 - AUTH_BASIC falling through as AUTH_BEARER; change AUTH_BEARER to a different value
-  [#1461](https://github.com/the-djmaze/snappymail/issues/1461)
+  [#1461](https://github.com/nextgen-networks/snappymail/issues/1461)
 - SetPassword expects \SnappyMail\SensitiveString
 - Crash on importing corrupt OpenPGP keys
 - Crash on old browsers instead of showing error
 - Ignore popups on logoutReload()
-  [#1467](https://github.com/the-djmaze/snappymail/issues/1467)
+  [#1467](https://github.com/nextgen-networks/snappymail/issues/1467)
 - Custom SASLMechanisms fail in IMAP when the connection is secure
-  [#1484](https://github.com/the-djmaze/snappymail/pull/1484) by @botsarenthuman
+  [#1484](https://github.com/nextgen-networks/snappymail/pull/1484) by @botsarenthuman
 
 
 ## 2.35.2 – 2024-02-27
@@ -459,7 +459,7 @@
 ### Added
 - GnuPG error handling
 - Missing strings for localization inside identity popup (Cryptography > S/MIME)
-  [#1458](https://github.com/the-djmaze/snappymail/issues/1458)
+  [#1458](https://github.com/nextgen-networks/snappymail/issues/1458)
 
 ### Changed
 - Update Portuguese by @ner00
@@ -467,11 +467,11 @@
 ### Fixed
 - Drop support for gnupg PECL extension as it fails with "no passphrase" issues
 - Error 352 when getting Filters
-  [#1455](https://github.com/the-djmaze/snappymail/issues/1455)
+  [#1455](https://github.com/nextgen-networks/snappymail/issues/1455)
 
 ### Nextcloud
 - SetPassword(): Argument #1 must be of type SensitiveString, string given
-  [#1456](https://github.com/the-djmaze/snappymail/issues/1456)
+  [#1456](https://github.com/nextgen-networks/snappymail/issues/1456)
 
 
 ## 2.35.1 – 2024-02-26
@@ -507,7 +507,7 @@
 
 ### Added
 - S/MIME support
-  [#259](https://github.com/the-djmaze/snappymail/issues/259)
+  [#259](https://github.com/nextgen-networks/snappymail/issues/259)
 
 ### Changed
 - Disable IMAP METADATA by default (hardly used)
@@ -522,49 +522,49 @@
 - Sign messages using PGP
 - Check for CONDSTORE or QRESYNC to get the HIGHESTMODSEQ
 - Unable to login on certain IMAP server since 2.34.2
-  [#1438](https://github.com/the-djmaze/snappymail/issues/1438)
+  [#1438](https://github.com/nextgen-networks/snappymail/issues/1438)
 
 ### Nextcloud
 - Save as .eml
-  [#1425](https://github.com/the-djmaze/snappymail/issues/1425)
+  [#1425](https://github.com/nextgen-networks/snappymail/issues/1425)
 
 
 ## 2.34.2 – 2024-02-14
 
 ### Fixed
 - Message was sent but not saved to sent items folder
-  [#1432](https://github.com/the-djmaze/snappymail/issues/1432)
+  [#1432](https://github.com/nextgen-networks/snappymail/issues/1432)
 - Login with scram failed
-  [#1433](https://github.com/the-djmaze/snappymail/issues/1433)
+  [#1433](https://github.com/nextgen-networks/snappymail/issues/1433)
 
 
 ## 2.34.1 – 2024-02-13
 
 ### Added
 - Autocrypt support
-  [#342](https://github.com/the-djmaze/snappymail/issues/342)
+  [#342](https://github.com/nextgen-networks/snappymail/issues/342)
 - Load the mailboxes/folders of all namespaces (other users, global, shared, etc.)
 - Load keys from server into OpenPGP.js
-  [#973](https://github.com/the-djmaze/snappymail/issues/973)
+  [#973](https://github.com/nextgen-networks/snappymail/issues/973)
 - Import PGP Keys from remote key servers
 - Sort Inbox Folders with Unread Messages First
-  [#1427](https://github.com/the-djmaze/snappymail/issues/1427)
+  [#1427](https://github.com/nextgen-networks/snappymail/issues/1427)
 - Define JMAP FolderModel.myRights
 - Identity Management: add identity display name
-  [#1405](https://github.com/the-djmaze/snappymail/issues/1405)
+  [#1405](https://github.com/nextgen-networks/snappymail/issues/1405)
 - Identity Management: add per-identity "sent" folder
-  [#1404](https://github.com/the-djmaze/snappymail/issues/1404)
+  [#1404](https://github.com/nextgen-networks/snappymail/issues/1404)
 - Some support for JSON-LD / Structured Email
-  [#1422](https://github.com/the-djmaze/snappymail/issues/1422)
+  [#1422](https://github.com/nextgen-networks/snappymail/issues/1422)
 - Domain Autoconfig and Microsoft's autodiscover (and also as extension/plugin)
 - View MMS messages that are received via email
-  [#1294](https://github.com/the-djmaze/snappymail/issues/1294)
+  [#1294](https://github.com/nextgen-networks/snappymail/issues/1294)
 - Draft code for S/MIME
-  [#259](https://github.com/the-djmaze/snappymail/issues/259)
+  [#259](https://github.com/nextgen-networks/snappymail/issues/259)
 
 ### Changed
 - Many OpenPGP improvements
-  [#89](https://github.com/the-djmaze/snappymail/issues/89)
+  [#89](https://github.com/nextgen-networks/snappymail/issues/89)
 - Allow CSP connect-src CORS for keys.openpgp.org to directly fetch PGP keys
 - Improved handling of visible folders
 - KnockoutJS Replace some ko.exportSymbol('*') in favour of ko['*']
@@ -572,10 +572,10 @@
 - Simplify generating folderListVisible
 - Drop the bSearchSecretWords param from logger
 - Transparent background for text
-  [#1412](https://github.com/the-djmaze/snappymail/issues/1412)
+  [#1412](https://github.com/nextgen-networks/snappymail/issues/1412)
 - Enable OpenPGP.js by default at install
 - Added folder edit popup for improved IMAP ACL Support
-  [#157](https://github.com/the-djmaze/snappymail/issues/157)
+  [#157](https://github.com/nextgen-networks/snappymail/issues/157)
 - Process all IMAP namespaces
 - Update Polish by @tinola
 - Update Portuguese by @ner00
@@ -583,20 +583,20 @@
 ### Fixed
 - Make time_zone a select list due to PEBKAC
 - Workaround Outlook generated double spacing
-  [#1415](https://github.com/the-djmaze/snappymail/issues/1415)
+  [#1415](https://github.com/nextgen-networks/snappymail/issues/1415)
 - HTML Parser is not picking up the full Unsubscribe URL in the attached text file
-  [#1225](https://github.com/the-djmaze/snappymail/issues/1225)
+  [#1225](https://github.com/nextgen-networks/snappymail/issues/1225)
 - Contacts - it auto "Select All", after entry delete
-  [#1411](https://github.com/the-djmaze/snappymail/issues/1411)
+  [#1411](https://github.com/nextgen-networks/snappymail/issues/1411)
 - Message header parsing issue
-  [#1403](https://github.com/the-djmaze/snappymail/issues/1403)
+  [#1403](https://github.com/nextgen-networks/snappymail/issues/1403)
 - apple-touch-icon should not be transparent
-  [#1408](https://github.com/the-djmaze/snappymail/issues/1408)
+  [#1408](https://github.com/nextgen-networks/snappymail/issues/1408)
 - Creation of dynamic property is deprecated
-  [#1409](https://github.com/the-djmaze/snappymail/issues/1409)
+  [#1409](https://github.com/nextgen-networks/snappymail/issues/1409)
 - Ask/send readReceipt was broken
 - OpenPGP public key can not be removed anymore after importing private key of subkey
-  [#1384](https://github.com/the-djmaze/snappymail/issues/1384)
+  [#1384](https://github.com/nextgen-networks/snappymail/issues/1384)
 - KnockoutJS failed to output text '0'
 - JavaScript friendlySize() failed on 0
 - Workaround Dovecot `PREAUTH [CAPABILITY (null)]` issue
@@ -604,9 +604,9 @@
 
 ### Nextcloud
 - Save multiple as .eml
-  [#1425](https://github.com/the-djmaze/snappymail/issues/1425)
+  [#1425](https://github.com/nextgen-networks/snappymail/issues/1425)
 - Disabled support for Nextcloud OpenID Connect
-  [#1420](https://github.com/the-djmaze/snappymail/issues/1420)
+  [#1420](https://github.com/nextgen-networks/snappymail/issues/1420)
 
 
 ## 2.33.0 – 2024-01-22
@@ -630,18 +630,18 @@
 
 ### Fixed
 - Sorting not supported since 2.32.0
-  [#1373](https://github.com/the-djmaze/snappymail/issues/1373)
+  [#1373](https://github.com/nextgen-networks/snappymail/issues/1373)
 - FILE_ON_SAVING_ERROR is not defined
-  [#1379](https://github.com/the-djmaze/snappymail/issues/1379)
+  [#1379](https://github.com/nextgen-networks/snappymail/issues/1379)
 - Saving EML files with same subject result in only saving latest email
-  [#1381](https://github.com/the-djmaze/snappymail/issues/1381)
+  [#1381](https://github.com/nextgen-networks/snappymail/issues/1381)
 - Some Sieve parser issues
 - Handling of RainLoop Sieve script
 - Sieve rfc5429 RejectCommand and ErejectCommand
 - KnockoutJS title:value was removed, use attr:{title:value}
 - dataBaseUpgrade() always runs on sqlite and pgsql
 - Message was sent but not saved to sent items folder
-  [#1397](https://github.com/the-djmaze/snappymail/issues/1397)
+  [#1397](https://github.com/nextgen-networks/snappymail/issues/1397)
 - DKIM `pass` detection sometimes failed
 
 
@@ -652,22 +652,22 @@
 - MessageListThreadsMap as background task when message_list_limit is set
 - Properly set CACHEDIR.TAG
 - Sending group email to all contact addresses
-  [#1286](https://github.com/the-djmaze/snappymail/pull/1286) by @rezaei92
+  [#1286](https://github.com/nextgen-networks/snappymail/pull/1286) by @rezaei92
 
 ### Changed
 - Default IMAP message_list_limit to 10000
 - DoMessageCopy() return toFolder hash/etag
 - Improved Squire WYSIWYG
 - Sort real attachments and inline attachments for
-  [#1360](https://github.com/the-djmaze/snappymail/issues/1360)
+  [#1360](https://github.com/nextgen-networks/snappymail/issues/1360)
 - Nextcloud Theme fixes and improvements
-  [#1363](https://github.com/the-djmaze/snappymail/pull/1363) by @hampoelz
+  [#1363](https://github.com/nextgen-networks/snappymail/pull/1363) by @hampoelz
 - Improve display of attachments
-  [#1361](https://github.com/the-djmaze/snappymail/issues/1361)
+  [#1361](https://github.com/nextgen-networks/snappymail/issues/1361)
 - Rename messageVisibility to messageVisible
 - All CSS font-size to % instead of px
 - Flip source code view of .eml attachments
-  [#1332](https://github.com/the-djmaze/snappymail/issues/1332)
+  [#1332](https://github.com/nextgen-networks/snappymail/issues/1332)
 
 ### Fixed
 - Folders array_filter(): Argument 1 must be of type array, null given
@@ -676,7 +676,7 @@
 
 ### Nextcloud
 - Improved language handling
-  [#1362](https://github.com/the-djmaze/snappymail/pull/1362) by @avinash-0007
+  [#1362](https://github.com/nextgen-networks/snappymail/pull/1362) by @avinash-0007
 - FilterLanguage had wrong parameter order
 - Use NextcloudV25+ theme by default
 
@@ -694,18 +694,18 @@
 
 ### Fixed
 - Call to undefined method FolderMyRights()
-  [#1344](https://github.com/the-djmaze/snappymail/issues/1344)
+  [#1344](https://github.com/nextgen-networks/snappymail/issues/1344)
 - NO Mailbox does not exist, or must be subscribed to")
-  [#1354](https://github.com/the-djmaze/snappymail/issues/1354)
+  [#1354](https://github.com/nextgen-networks/snappymail/issues/1354)
 - Flag indicators are added to wrong message
-  [#1347](https://github.com/the-djmaze/snappymail/pull/1347) by @SergeyMosin
+  [#1347](https://github.com/nextgen-networks/snappymail/pull/1347) by @SergeyMosin
 - Squire: issue when using the enter key in a reply window
-  [#1296](https://github.com/the-djmaze/snappymail/issues/1296)
+  [#1296](https://github.com/nextgen-networks/snappymail/issues/1296)
 - Squire: crash on cut/delete range
 
 ### Nextcloud
 - Use language as defined in Nextcloud settings
-  [#1293](https://github.com/the-djmaze/snappymail/issues/1293)
+  [#1293](https://github.com/nextgen-networks/snappymail/issues/1293)
 - Plugin Call to undefined method RainLoop\Model\MainAccount::ImapConnectAndLoginHelper()
 - SnappyMail failed due to Nextcloud Symfony polyfill
 
@@ -716,22 +716,22 @@
 - SnappyMail\SensitiveString class to secure passwords
 - Allow to disable all IMAP features through Admin -> Domain
 - Setting to open mails in a tab or new window
-  [#951](https://github.com/the-djmaze/snappymail/issues/951)
+  [#951](https://github.com/nextgen-networks/snappymail/issues/951)
 - Fully support IMAP PREVIEW
-  [#1338](https://github.com/the-djmaze/snappymail/issues/1338)
+  [#1338](https://github.com/nextgen-networks/snappymail/issues/1338)
 - Disable "Mark message as read after", offer manual toggle
-  [#1289](https://github.com/the-djmaze/snappymail/issues/1289)
+  [#1289](https://github.com/nextgen-networks/snappymail/issues/1289)
 - A "Move to" button inside message view as an icon/button and in the drop down menu.
-  [#1295](https://github.com/the-djmaze/snappymail/issues/1295)
+  [#1295](https://github.com/nextgen-networks/snappymail/issues/1295)
 - Support for IMAP WITHIN
 - Support \noinferiors to disallow creating subfolders
 - A test due to Failed loading libs.min.js
-  [#358](https://github.com/the-djmaze/snappymail/issues/358),
-  [#862](https://github.com/the-djmaze/snappymail/issues/862),
-  [#890](https://github.com/the-djmaze/snappymail/issues/890),
-  [#895](https://github.com/the-djmaze/snappymail/issues/895),
-  [#1238](https://github.com/the-djmaze/snappymail/issues/1238),
-  [#1320](https://github.com/the-djmaze/snappymail/issues/1320)
+  [#358](https://github.com/nextgen-networks/snappymail/issues/358),
+  [#862](https://github.com/nextgen-networks/snappymail/issues/862),
+  [#890](https://github.com/nextgen-networks/snappymail/issues/890),
+  [#895](https://github.com/nextgen-networks/snappymail/issues/895),
+  [#1238](https://github.com/nextgen-networks/snappymail/issues/1238),
+  [#1320](https://github.com/nextgen-networks/snappymail/issues/1320)
 
 ### Changed
 - Split PHP 8 polyfills from include.php
@@ -745,75 +745,75 @@
 
 ### Fixed
 - Move to button does not work
-  [#1328](https://github.com/the-djmaze/snappymail/issues/1328)
+  [#1328](https://github.com/nextgen-networks/snappymail/issues/1328)
 - Mark passwords as sensitive information
-  [#1343](https://github.com/the-djmaze/snappymail/issues/1343)
+  [#1343](https://github.com/nextgen-networks/snappymail/issues/1343)
 - Account sSmtpPassword wrong value
 - SCRAM sign-in failed
-  [#1245](https://github.com/the-djmaze/snappymail/issues/1245)
+  [#1245](https://github.com/nextgen-networks/snappymail/issues/1245)
 - Squire generates to many `<div><br></div>`
-  [#1339](https://github.com/the-djmaze/snappymail/issues/1339)
+  [#1339](https://github.com/nextgen-networks/snappymail/issues/1339)
 - Creation of dynamic property SnappyMail\Stream\ZipEntry::$compression is deprecated
 - `json.after-*` hooks didn't send $aResponse as recursive array
 - Sieve: Move to folder with trailing space does not work
-  [#1329](https://github.com/the-djmaze/snappymail/issues/1329)
+  [#1329](https://github.com/nextgen-networks/snappymail/issues/1329)
 - Squire: cantFocusEmptyTextNodes var is always undefined
-  [#1337](https://github.com/the-djmaze/snappymail/issues/1337)
+  [#1337](https://github.com/nextgen-networks/snappymail/issues/1337)
 - Squire: Remove redundant <span> after replacing styles
 - Squire: Handle empty nodes in moveRangeBoundariesDownTree
 - Theme "Nextcloud V25+" can't be translated
-  [#1331](https://github.com/the-djmaze/snappymail/issues/1331)
+  [#1331](https://github.com/nextgen-networks/snappymail/issues/1331)
 
 
 ## 2.29.4 – 2023-11-21
 
 ### Fixed
 - Contacts not work
-  [#1319](https://github.com/the-djmaze/snappymail/issues/1319)
+  [#1319](https://github.com/nextgen-networks/snappymail/issues/1319)
 
 
 ## 2.29.3 – 2023-11-21
 
 ### Added
 - Docker Hub image
-  [#965](https://github.com/the-djmaze/snappymail/pull/965) by @leojonathanoh
+  [#965](https://github.com/nextgen-networks/snappymail/pull/965) by @leojonathanoh
 
 ### Changed
 - Sabre/VObject 4.5.4 and Sabre/Xml 4.0.4
-  [#1311](https://github.com/the-djmaze/snappymail/issues/1311)
+  [#1311](https://github.com/nextgen-networks/snappymail/issues/1311)
 
 ### Fixed
 - '#/mailbox/folder/mUID/search' uri/route handling
-  [#1301](https://github.com/the-djmaze/snappymail/pull/1301) by @SergeyMosin
+  [#1301](https://github.com/nextgen-networks/snappymail/pull/1301) by @SergeyMosin
 - "Remember me" doesn't work when browser is closed
-  [#1313](https://github.com/the-djmaze/snappymail/issues/1313)
+  [#1313](https://github.com/nextgen-networks/snappymail/issues/1313)
 - Blank email displayed when "Prefer HTML to plain text" is unchecked and the message is html only
-  [#1302](https://github.com/the-djmaze/snappymail/issues/1302)
+  [#1302](https://github.com/nextgen-networks/snappymail/issues/1302)
 - Parent folder of Sub folder not useable.
-  [#1008](https://github.com/the-djmaze/snappymail/issues/1008)
+  [#1008](https://github.com/nextgen-networks/snappymail/issues/1008)
 - Large detailed header don't display body
-  [#1284](https://github.com/the-djmaze/snappymail/issues/1284)
+  [#1284](https://github.com/nextgen-networks/snappymail/issues/1284)
 
 ### Nextcloud
 - Improvements for Install / update issues #929
-  [#929](https://github.com/the-djmaze/snappymail/issues/929)
+  [#929](https://github.com/nextgen-networks/snappymail/issues/929)
 - Should use language as defined in cloud settings #1293
-  [#1293](https://github.com/the-djmaze/snappymail/issues/1293)
+  [#1293](https://github.com/nextgen-networks/snappymail/issues/1293)
 
 
 ## 2.29.2 – 2023-11-14
 
 ### Added
 - Show size of folders in folders list #1303
-  [#1303](https://github.com/the-djmaze/snappymail/issues/1303)
+  [#1303](https://github.com/nextgen-networks/snappymail/issues/1303)
 
 ### Fixed
 - Configuration failed when using special chars in MySQL password #1308
-  [#1308](https://github.com/the-djmaze/snappymail/issues/1308)
+  [#1308](https://github.com/nextgen-networks/snappymail/issues/1308)
 - With email open, "delete" doesn't delete #1274
-  [#1274](https://github.com/the-djmaze/snappymail/issues/1274)
+  [#1274](https://github.com/nextgen-networks/snappymail/issues/1274)
 - Fix threading view in Thunderbird (others?)
-  [#1304](https://github.com/the-djmaze/snappymail/pull/1304) by @tkasch
+  [#1304](https://github.com/nextgen-networks/snappymail/pull/1304) by @tkasch
 
 
 ## 2.29.1 – 2023-10-02
@@ -826,102 +826,102 @@
 
 ### Added
 - Modern UI / Nextcloud Theme
-  [#629](https://github.com/the-djmaze/snappymail/pull/629) by @hampoelz
+  [#629](https://github.com/nextgen-networks/snappymail/pull/629) by @hampoelz
 - "Add/Edit signature" label to PopupsIdentity.html
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - use calendar icon in message list for messages with '.ics' or 'text/calendar' attachments by @SergeyMosin
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248)
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248)
 - Show unseen message count when the message list is threaded
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - in mobile mode hide folders(left) panel when a folder is clicked
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - spellcheck the subject when 'allowSpellcheck' setting is true
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - 'collapse_blockquotes', 'allow_spellcheck' and 'mail_list_grouped' to admin settings ('defaults' section)
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - Browser support for autocompleting TOTP code
-  [#1251](https://github.com/the-djmaze/snappymail/issues/1251)
+  [#1251](https://github.com/nextgen-networks/snappymail/issues/1251)
 
 ### Changed
 - URL strip tracking for
-  [#1225](https://github.com/the-djmaze/snappymail/issues/1225)
+  [#1225](https://github.com/nextgen-networks/snappymail/issues/1225)
 - Color picker use color blind palette "Tableau 10" by Maureen Stone by default
-  [#1199](https://github.com/the-djmaze/snappymail/issues/1199)
+  [#1199](https://github.com/nextgen-networks/snappymail/issues/1199)
 - Draft code to improve mobile breakpoints
-  [#1150](https://github.com/the-djmaze/snappymail/issues/1150)
+  [#1150](https://github.com/nextgen-networks/snappymail/issues/1150)
 - address input: space character can trigger '_parseValue' if the email address looks complete
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - if applicable set '\\answered' or '$forwarded' flag after a message is sent so the proper icon is shown in the message list view
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 
 ### Fixed
 - CHARSET is not valid in UTF8 mode
-  [#1230](https://github.com/the-djmaze/snappymail/issues/1230)
+  [#1230](https://github.com/nextgen-networks/snappymail/issues/1230)
 - Spam score is always "acceptable"
-  [#1228](https://github.com/the-djmaze/snappymail/issues/1228)
+  [#1228](https://github.com/nextgen-networks/snappymail/issues/1228)
 - Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
-  [#1205](https://github.com/the-djmaze/snappymail/issues/1205)
+  [#1205](https://github.com/nextgen-networks/snappymail/issues/1205)
 - Fetch controller.abort(reason) handling
-  [#1220](https://github.com/the-djmaze/snappymail/issues/1220)
+  [#1220](https://github.com/nextgen-networks/snappymail/issues/1220)
 - "Request failed" on message move
-  [#1220](https://github.com/the-djmaze/snappymail/issues/1220)
+  [#1220](https://github.com/nextgen-networks/snappymail/issues/1220)
 - Unwrapped text nodes attached to squire._root
-  [#1234](https://github.com/the-djmaze/snappymail/pull/1234) by @SergeyMosin
+  [#1234](https://github.com/nextgen-networks/snappymail/pull/1234) by @SergeyMosin
 - Extra wrapper div is added in Squire every time a Draft is open (or closed) after save.
-  [#1208](https://github.com/the-djmaze/snappymail/issues/1208)
+  [#1208](https://github.com/nextgen-networks/snappymail/issues/1208)
 - foreach() argument must be of type array|object
-  [#1237](https://github.com/the-djmaze/snappymail/issues/1237)
+  [#1237](https://github.com/nextgen-networks/snappymail/issues/1237)
 - `<font>` tag 'style' is lost in replies
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - unseen indicator is not shown in thread view when 'listGrouped' settings is false
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - TOTP plugin is dependent on ctype
-  [#1250](https://github.com/the-djmaze/snappymail/issues/1250)
+  [#1250](https://github.com/nextgen-networks/snappymail/issues/1250)
 
 ### Nextcloud
 - iFrame mode: click on unified search result opens inner iFrame
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - set 'smremember' cookie if 'sign_me_auto' is set to 'DefaultOn' when using 'snappymail-autologin*', otherwise nextcloud users need to re-login when the browser is re-opened
-  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
 - Improve UX of "Put in Calendar" option in plugin
-  [#1259](https://github.com/the-djmaze/snappymail/pull/1259) by @theronakpatel
+  [#1259](https://github.com/nextgen-networks/snappymail/pull/1259) by @theronakpatel
 
 
 ## 2.28.4 – 2023-07-10
 
 ### Added
 - application.ini msg_default_action
-  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
 - application.ini view_show_next_message
-  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
 - application.ini view_images
-  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
 - nextcloud add ability to include custom php file in InstallStep migration
-  [#1197](https://github.com/the-djmaze/snappymail/pull/1197) by @SergeyMosin
+  [#1197](https://github.com/nextgen-networks/snappymail/pull/1197) by @SergeyMosin
 - Support plugin for Squire editor
-  [#1192](https://github.com/the-djmaze/snappymail/issues/1192)
+  [#1192](https://github.com/nextgen-networks/snappymail/issues/1192)
 
 ### Changed
 - only show 'Add "domain.tld" as an application for mailto links?' message after login (firefox shows the message on every reload otherwise).
-  [#1204](https://github.com/the-djmaze/snappymail/issues/1204)
+  [#1204](https://github.com/nextgen-networks/snappymail/issues/1204)
 - Convert getPdoAccessData() : array to a RainLoop\Pdo\Settings object instance
 - New bidi buttons to Squire editor
-  [#1200](https://github.com/the-djmaze/snappymail/pull/1200) by @rezaei92
+  [#1200](https://github.com/nextgen-networks/snappymail/pull/1200) by @rezaei92
 
 ### Fixed
 - Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
-  [#1205](https://github.com/the-djmaze/snappymail/issues/1205)
+  [#1205](https://github.com/nextgen-networks/snappymail/issues/1205)
 - 'reloadTime' function result is passed into 'setInterval' instead of the function
-  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
 - UNKNOWN-CTE Invalid data in MIME part
-  [#1186](https://github.com/the-djmaze/snappymail/issues/1186)
+  [#1186](https://github.com/nextgen-networks/snappymail/issues/1186)
 
 
 ## 2.28.3 – 2023-06-22
 
 ### Added
 - Attachments in "new window" view
-  [#1166](https://github.com/the-djmaze/snappymail/issues/1166)
+  [#1166](https://github.com/nextgen-networks/snappymail/issues/1166)
 
 ### Changed
 - Update Portuguese by @ner00
@@ -929,22 +929,22 @@
 
 ### Fixed
 - Some emails with inline CSS break the UI
-  [#1187](https://github.com/the-djmaze/snappymail/issues/1187)
+  [#1187](https://github.com/nextgen-networks/snappymail/issues/1187)
 - Remote.get() Promise broken by previous change
-  [#1185](https://github.com/the-djmaze/snappymail/issues/1185)
+  [#1185](https://github.com/nextgen-networks/snappymail/issues/1185)
 - Class "MailSo\Base\Exceptions\InvalidArgumentException" not found
-  [#1182](https://github.com/the-djmaze/snappymail/issues/1182)
+  [#1182](https://github.com/nextgen-networks/snappymail/issues/1182)
 - First account not showed in the right list (dropbox)
-  [#1180](https://github.com/the-djmaze/snappymail/issues/1180)
+  [#1180](https://github.com/nextgen-networks/snappymail/issues/1180)
 
 
 ## 2.28.2 – 2023-06-19
 
 ### Added
 - Detailed error for "Cannot access the repository at the moment"
-  [#1164](https://github.com/the-djmaze/snappymail/issues/1164)
+  [#1164](https://github.com/nextgen-networks/snappymail/issues/1164)
 - Bidi in Squire editor
-  [#1158](https://github.com/the-djmaze/snappymail/issues/1158)
+  [#1158](https://github.com/nextgen-networks/snappymail/issues/1158)
 - Translate Squire UI
 - Nextcloud 27 compatibility by @LarsBel
 - JWT class for handling JSON Web Tokens
@@ -954,19 +954,19 @@
 - Update French by @hguilbert
 - Update Polish by @tinola
 - Merge handling of local Account Settings. Found while investigating
-  [#1170](https://github.com/the-djmaze/snappymail/issues/1170)
+  [#1170](https://github.com/nextgen-networks/snappymail/issues/1170)
 - Image max-width now 100% instead of 90vw
 
 ### Fixed
 - Cannot modify header information
-  [#929](https://github.com/the-djmaze/snappymail/issues/929) (comment)
+  [#929](https://github.com/nextgen-networks/snappymail/issues/929) (comment)
 - Admin Panel broken when admin_panel_host is set
-  [#1169](https://github.com/the-djmaze/snappymail/issues/1169)
+  [#1169](https://github.com/nextgen-networks/snappymail/issues/1169)
 - Invalid CSP report-uri
 - Prevent MessageList multiple request at the same time
-  [#1071](https://github.com/the-djmaze/snappymail/issues/1071)
+  [#1071](https://github.com/nextgen-networks/snappymail/issues/1071)
 - Error in Addressbook Sync
-  [#1179](https://github.com/the-djmaze/snappymail/issues/1179)
+  [#1179](https://github.com/nextgen-networks/snappymail/issues/1179)
 - base64_decode() second parameter must be true
 
 
@@ -974,91 +974,91 @@
 
 ### Changed
 - Optical issue with input fields for mail and folder search
-  [#1149](https://github.com/the-djmaze/snappymail/issues/1149)
+  [#1149](https://github.com/nextgen-networks/snappymail/issues/1149)
 - Update Chinese translation
-  [#1157](https://github.com/the-djmaze/snappymail/pull/1157) by @mayswind
+  [#1157](https://github.com/nextgen-networks/snappymail/pull/1157) by @mayswind
 - Update Polish translation
-  [#1156](https://github.com/the-djmaze/snappymail/pull/1156) by @tinola
+  [#1156](https://github.com/nextgen-networks/snappymail/pull/1156) by @tinola
 
 ### Fixed
 - Undefined SIG constants
-  [#1147](https://github.com/the-djmaze/snappymail/issues/1147)
+  [#1147](https://github.com/nextgen-networks/snappymail/issues/1147)
 
 
 ## 2.28.0 – 2023-05-30
 
 ### Added
 - Threaded view make number orange when unread sub-messages
-  [#1028](https://github.com/the-djmaze/snappymail/issues/1028)
+  [#1028](https://github.com/nextgen-networks/snappymail/issues/1028)
 - Handle PHP pctnl messages
 - addEventListener('rl-view-model') missing for Settings
-  [#1013](https://github.com/the-djmaze/snappymail/issues/1013)
+  [#1013](https://github.com/nextgen-networks/snappymail/issues/1013)
 - CSS `--btn-border-radius`
 
 ### Changed
 - Improved RTL languages support
-  [#1056](https://github.com/the-djmaze/snappymail/issues/1056)
+  [#1056](https://github.com/nextgen-networks/snappymail/issues/1056)
 - Composer text/attachments as tabs
-  [#1119](https://github.com/the-djmaze/snappymail/issues/1119)
+  [#1119](https://github.com/nextgen-networks/snappymail/issues/1119)
 - Filter dialog doesn't refer to folder names consistently
-  [#1111](https://github.com/the-djmaze/snappymail/issues/1111)
+  [#1111](https://github.com/nextgen-networks/snappymail/issues/1111)
 - TLS connection for MYSQL contact db
-  [#1078](https://github.com/the-djmaze/snappymail/issues/1078)
+  [#1078](https://github.com/nextgen-networks/snappymail/issues/1078)
 - Allow empty message body when there are attachments
-  [#1052](https://github.com/the-djmaze/snappymail/issues/1052)
+  [#1052](https://github.com/nextgen-networks/snappymail/issues/1052)
 - PHP inherit logger as Trait
 - Update Portuguese
-  [#1124](https://github.com/the-djmaze/snappymail/pull/1124) by @ner00
+  [#1124](https://github.com/nextgen-networks/snappymail/pull/1124) by @ner00
 - Update Traditional Chinese (Taiwan)
-  [#1107](https://github.com/the-djmaze/snappymail/pull/1107) by @chiyi4488
+  [#1107](https://github.com/nextgen-networks/snappymail/pull/1107) by @chiyi4488
 - Update Russian
-  [#1108](https://github.com/the-djmaze/snappymail/pull/1108) by @konkere
+  [#1108](https://github.com/nextgen-networks/snappymail/pull/1108) by @konkere
 - Update Italian
-  [#1094](https://github.com/the-djmaze/snappymail/pull/1094) by @cm-schl
+  [#1094](https://github.com/nextgen-networks/snappymail/pull/1094) by @cm-schl
 - Update French
-  [#1102](https://github.com/the-djmaze/snappymail/pull/1102) by @hguilbert
+  [#1102](https://github.com/nextgen-networks/snappymail/pull/1102) by @hguilbert
 - Update German
-  [#1087](https://github.com/the-djmaze/snappymail/pull/1087) by @cm-schl
+  [#1087](https://github.com/nextgen-networks/snappymail/pull/1087) by @cm-schl
 
 ### Fixed
 - Show messagelist timeout/abort error for
-  [#1071](https://github.com/the-djmaze/snappymail/issues/1071)
+  [#1071](https://github.com/nextgen-networks/snappymail/issues/1071)
 - DesktopNotifications setting not saved
-  [#1137](https://github.com/the-djmaze/snappymail/issues/1137)
+  [#1137](https://github.com/nextgen-networks/snappymail/issues/1137)
 - PHP Deprecation warning for $_openPipes
-  [#1141](https://github.com/the-djmaze/snappymail/issues/1141)
+  [#1141](https://github.com/nextgen-networks/snappymail/issues/1141)
 - Images size wrong
-  [#1134](https://github.com/the-djmaze/snappymail/issues/1134)
+  [#1134](https://github.com/nextgen-networks/snappymail/issues/1134)
 - Unable to preview body of encrypted mail in mailvelope reply-to
-  [#1130](https://github.com/the-djmaze/snappymail/issues/1130)
+  [#1130](https://github.com/nextgen-networks/snappymail/issues/1130)
 - Replace `<button>` in HTML message with innerHTML instead of remove
-  [#1125](https://github.com/the-djmaze/snappymail/issues/1125)
+  [#1125](https://github.com/nextgen-networks/snappymail/issues/1125)
 - Mailvelope failed
-  [#1126](https://github.com/the-djmaze/snappymail/issues/1126)
+  [#1126](https://github.com/nextgen-networks/snappymail/issues/1126)
 - Tabs labels row height
 - Selecting not yet existing filter throws error message instead of opening edit box
-  [#1104](https://github.com/the-djmaze/snappymail/issues/1104)
+  [#1104](https://github.com/nextgen-networks/snappymail/issues/1104)
 - JavaScript Squire `node is null` error
 - Config/Application.php: array_rand(): Argument
-  [#1](https://github.com/the-djmaze/snappymail/issues/1) cannot be empty
-  [#1123](https://github.com/the-djmaze/snappymail/issues/1123)
+  [#1](https://github.com/nextgen-networks/snappymail/issues/1) cannot be empty
+  [#1123](https://github.com/nextgen-networks/snappymail/issues/1123)
 - Pressing Enter in Add Filter dialog results in "Leave page?" prompt
-  [#1112](https://github.com/the-djmaze/snappymail/issues/1112)
+  [#1112](https://github.com/nextgen-networks/snappymail/issues/1112)
 - Issue with certain Amazon emails
-  [#1086](https://github.com/the-djmaze/snappymail/issues/1086)
+  [#1086](https://github.com/nextgen-networks/snappymail/issues/1086)
 - HTML font 8px and 10px issue
-  [#1082](https://github.com/the-djmaze/snappymail/issues/1082)
+  [#1082](https://github.com/nextgen-networks/snappymail/issues/1082)
 - Exception when executed on command line on the first-time
-  [#1085](https://github.com/the-djmaze/snappymail/issues/1085)
+  [#1085](https://github.com/nextgen-networks/snappymail/issues/1085)
 - Folders missing pagination
-  [#1070](https://github.com/the-djmaze/snappymail/issues/1070)
+  [#1070](https://github.com/nextgen-networks/snappymail/issues/1070)
 - Nextcloud WYSIWYG button style
-  [#1138](https://github.com/the-djmaze/snappymail/issues/1138)
+  [#1138](https://github.com/nextgen-networks/snappymail/issues/1138)
 - Nextcloud .btn-group > .btn layout
 - Nextcloud Bulleted items do not show the bullets in the preview window.
-  [#1117](https://github.com/the-djmaze/snappymail/issues/1117)
+  [#1117](https://github.com/nextgen-networks/snappymail/issues/1117)
 - Nextcloud Contacts integration
-  [#1083](https://github.com/the-djmaze/snappymail/issues/1083)
+  [#1083](https://github.com/nextgen-networks/snappymail/issues/1083)
 
 
 ## 2.27.3 – 2023-04-04
@@ -1066,57 +1066,57 @@
 ### Added
 - Squire visualize some active buttons states
 - Hard coded string "Message body is empty"
-  [#1048](https://github.com/the-djmaze/snappymail/issues/1048)
+  [#1048](https://github.com/nextgen-networks/snappymail/issues/1048)
 - Split SPAM label in user.json for directory and action
-  [#1065](https://github.com/the-djmaze/snappymail/issues/1065)
+  [#1065](https://github.com/nextgen-networks/snappymail/issues/1065)
 - A solution for
-  [#1056](https://github.com/the-djmaze/snappymail/issues/1056) to support dates in different language/calendar
+  [#1056](https://github.com/nextgen-networks/snappymail/issues/1056) to support dates in different language/calendar
 - Log \nonexistent folder for
-  [#1008](https://github.com/the-djmaze/snappymail/issues/1008)
+  [#1008](https://github.com/nextgen-networks/snappymail/issues/1008)
 
 ### Changed
 - Cleanup some enums to consts
 - Workaround Upgrade with Nextcloud stuck in Maintenance mode
-  [#1046](https://github.com/the-djmaze/snappymail/issues/1046)
+  [#1046](https://github.com/nextgen-networks/snappymail/issues/1046)
 - Use Actions()->decodeRawKey()
 - French language updated
-  [#1045](https://github.com/the-djmaze/snappymail/pull/1045) by @hguilbert
+  [#1045](https://github.com/nextgen-networks/snappymail/pull/1045) by @hguilbert
 - Sorting in folders not working
-  [#1022](https://github.com/the-djmaze/snappymail/issues/1022)
+  [#1022](https://github.com/nextgen-networks/snappymail/issues/1022)
 - Allow saving draft with empty body
-  [#1052](https://github.com/the-djmaze/snappymail/issues/1052)
+  [#1052](https://github.com/nextgen-networks/snappymail/issues/1052)
 
 ### Fixed
 - GnuPG decrypt failed
 - Clear folder link should be hidden if "dangerous actions" is not active
-  [#1037](https://github.com/the-djmaze/snappymail/issues/1037)
+  [#1037](https://github.com/nextgen-networks/snappymail/issues/1037)
 - 500 error generating preview with GD2
-  [#1009](https://github.com/the-djmaze/snappymail/issues/1009)
+  [#1009](https://github.com/nextgen-networks/snappymail/issues/1009)
 - Text and Links Jumping While Writing
-  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
+  [#1004](https://github.com/nextgen-networks/snappymail/issues/1004)
 - Odd annoying behaviour when copy/ pasting anything into an email and then attempting to edit it.
-  [#1054](https://github.com/the-djmaze/snappymail/issues/1054)
+  [#1054](https://github.com/nextgen-networks/snappymail/issues/1054)
 - Check if $rImapLiteralStream is open resource and not closed
 - Save as eml to nextcloud not working anymore
-  [#1057](https://github.com/the-djmaze/snappymail/issues/1057)
+  [#1057](https://github.com/nextgen-networks/snappymail/issues/1057)
 - AuthError and Call to a member function ImapConnectAndLogin() on null
-  [#1060](https://github.com/the-djmaze/snappymail/issues/1060)
+  [#1060](https://github.com/nextgen-networks/snappymail/issues/1060)
 - Thread count missing/shown
-  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
+  [#1003](https://github.com/nextgen-networks/snappymail/issues/1003)
 
 
 ## 2.27.2 – 2023-03-22
 
 ### Added
 - authentication with smtp freenet.de
-  [#1038](https://github.com/the-djmaze/snappymail/issues/1038)
+  [#1038](https://github.com/nextgen-networks/snappymail/issues/1038)
 
 ### Changed
 - SASL always base64 by default
 
 ### Fixed
 - Cache issue with index
-  [#1024](https://github.com/the-djmaze/snappymail/issues/1024)
+  [#1024](https://github.com/nextgen-networks/snappymail/issues/1024)
 
 
 ## 2.27.1 – 2023-03-21
@@ -1124,58 +1124,58 @@
 ### Changed
 - Improved attachmentIcon glyph coloring
 - Better design for .accountPlace text
-  [#1025](https://github.com/the-djmaze/snappymail/issues/1025)
+  [#1025](https://github.com/nextgen-networks/snappymail/issues/1025)
 
 ### Fixed
 - Reply is broken
-  [#1027](https://github.com/the-djmaze/snappymail/issues/1027)
+  [#1027](https://github.com/nextgen-networks/snappymail/issues/1027)
 - Endless loop at login - Cannot assign array to property MailSo\Imap\Folder::$MAILBOXID
-  [#1032](https://github.com/the-djmaze/snappymail/issues/1032)
+  [#1032](https://github.com/nextgen-networks/snappymail/issues/1032)
 
 
 ## 2.27.0 – 2023-03-20
 
 ### Added
 - Unique attachments.zip filename
-  [#992](https://github.com/the-djmaze/snappymail/issues/992)
+  [#992](https://github.com/nextgen-networks/snappymail/issues/992)
 - Select next email after (re)move current
-  [#968](https://github.com/the-djmaze/snappymail/issues/968)
+  [#968](https://github.com/nextgen-networks/snappymail/issues/968)
 
 ### Changed
 - Improved FolderCollection handling
 - MODSEQ requires 64-bit int
 - Update russian language
-  [#994](https://github.com/the-djmaze/snappymail/pull/994) by @Akrobs
+  [#994](https://github.com/nextgen-networks/snappymail/pull/994) by @Akrobs
 - Don't make font bigger when screen > 1400px
 - Put top menu "accountPlace" inside top-system-dropdown-id
 - Put attachment controls inside attachmentsPlace
 - Show message toolbar on screens > 1400px
-  [#970](https://github.com/the-djmaze/snappymail/issues/970)
+  [#970](https://github.com/nextgen-networks/snappymail/issues/970)
 - Chinese updated
-  [#1011](https://github.com/the-djmaze/snappymail/pull/1011) by @mayswind
+  [#1011](https://github.com/nextgen-networks/snappymail/pull/1011) by @mayswind
 - Prevent folder/messages flags conflict by using the right name `attributes` for Folders
 - FolderInformation() use jsonSerialize()
 - Squire space handling on paste use `\u00A0` instead of `&nbsp;` for
-  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
+  [#1004](https://github.com/nextgen-networks/snappymail/issues/1004)
 - Better line-height for QR code
 
 ### Fixed
 - Composer src is null
 - Image in Signature disappears in Sent/Draft
-  [#932](https://github.com/the-djmaze/snappymail/issues/932)
+  [#932](https://github.com/nextgen-networks/snappymail/issues/932)
 - Mail list is empty
-  [#998](https://github.com/the-djmaze/snappymail/issues/998)
+  [#998](https://github.com/nextgen-networks/snappymail/issues/998)
 - Cache handling issues
-  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
+  [#1003](https://github.com/nextgen-networks/snappymail/issues/1003)
 - No message notification popup when installed in sub-directory
-  [#1007](https://github.com/the-djmaze/snappymail/issues/1007)
+  [#1007](https://github.com/nextgen-networks/snappymail/issues/1007)
 - ERROR: Undefined constant "MailSo\Log\Drivers\STDERR"
-  [#965](https://github.com/the-djmaze/snappymail/issues/965)
+  [#965](https://github.com/nextgen-networks/snappymail/issues/965)
 - 'Location:' headers using proper '302 Found' header
 - Can't send email
-  [#1006](https://github.com/the-djmaze/snappymail/issues/1006)
+  [#1006](https://github.com/nextgen-networks/snappymail/issues/1006)
 - Attachment preview
-  [#1005](https://github.com/the-djmaze/snappymail/issues/1005)
+  [#1005](https://github.com/nextgen-networks/snappymail/issues/1005)
 - When decrypt message, subject was replaced empty
 
 ### Removed
@@ -1184,38 +1184,38 @@
 ### Nextcloud
 - CSS `--panel-bg-clr` was missing
 - SnappyMail Menu under Nextcloud top bar
-  [#1017](https://github.com/the-djmaze/snappymail/issues/1017)
+  [#1017](https://github.com/nextgen-networks/snappymail/issues/1017)
 
 
 ## 2.26.4 – 2023-02-24
 
 ### Added
 - Add CSP frame-ancestors for
-  [#537](https://github.com/the-djmaze/snappymail/issues/537)
+  [#537](https://github.com/nextgen-networks/snappymail/issues/537)
 
 ### Changed
 - Reduce/simplify CSS footprint
 - Use the System/Browser font by default
-  [#988](https://github.com/the-djmaze/snappymail/pull/988) by @HeySora
+  [#988](https://github.com/nextgen-networks/snappymail/pull/988) by @HeySora
 - Make layout fully responsive using matchMedia('(max-width: 799px)')
 - Move brotli and gzip compress option to application.ini
 - After page refreshes in background whilst editing a draft, the space bar stops working
-  [#860](https://github.com/the-djmaze/snappymail/issues/860)
+  [#860](https://github.com/nextgen-networks/snappymail/issues/860)
 - Updated Portuguese
-  [#984](https://github.com/the-djmaze/snappymail/pull/984) by @ner00
+  [#984](https://github.com/nextgen-networks/snappymail/pull/984) by @ner00
 - Updated French
-  [#985](https://github.com/the-djmaze/snappymail/pull/985) by @hguilbert
+  [#985](https://github.com/nextgen-networks/snappymail/pull/985) by @hguilbert
 
 ### Fixed
 - unset border-box for message body
-  [#990](https://github.com/the-djmaze/snappymail/issues/990)
+  [#990](https://github.com/nextgen-networks/snappymail/issues/990)
 - Unread email count badge shows -1
-  [#989](https://github.com/the-djmaze/snappymail/issues/989)
+  [#989](https://github.com/nextgen-networks/snappymail/issues/989)
 - unicode mailto: addresses not decoded
 - Unicode email/url address matching
-  [#955](https://github.com/the-djmaze/snappymail/issues/955)
+  [#955](https://github.com/nextgen-networks/snappymail/issues/955)
 - Invalid Token if run in IFrame
-  [#537](https://github.com/the-djmaze/snappymail/issues/537)
+  [#537](https://github.com/nextgen-networks/snappymail/issues/537)
 
 ### Removed
 - rl.initData
@@ -1239,13 +1239,13 @@
 - Threads indicator got lost with new message cache handling
 - messagesBodiesDom never cached previous messages
 - Nextcloud File picker doesn't insert multiple links
-  [#981](https://github.com/the-djmaze/snappymail/issues/981)
+  [#981](https://github.com/nextgen-networks/snappymail/issues/981)
 - Call to protected method RainLoop\Enumerations\UploadError::getUserMessage()
-  [#982](https://github.com/the-djmaze/snappymail/issues/982)
+  [#982](https://github.com/nextgen-networks/snappymail/issues/982)
 - Issue with the top logo and text of a certain e-mail
-  [#953](https://github.com/the-djmaze/snappymail/issues/953)
+  [#953](https://github.com/nextgen-networks/snappymail/issues/953)
 - Facebook logo missing from emails sent out by it
-  [#954](https://github.com/the-djmaze/snappymail/issues/954)
+  [#954](https://github.com/nextgen-networks/snappymail/issues/954)
 
 ### Removed
 - Unused Squire code
@@ -1256,9 +1256,9 @@
 ### Added
 - Remove CSS white-space from messages to prevent annoying side scrolling
 - Show error when trying to send empty message
-  [#974](https://github.com/the-djmaze/snappymail/issues/974)
+  [#974](https://github.com/nextgen-networks/snappymail/issues/974)
 - max_sys_loadavg as setting
-  [#971](https://github.com/the-djmaze/snappymail/issues/971)
+  [#971](https://github.com/nextgen-networks/snappymail/issues/971)
 
 ### Changed
 - Speedup and improved cleanHtml() and cleanCSS() handling
@@ -1271,20 +1271,20 @@
 
 ### Fixed
 - Remove SVG elements properly from messages
-  [#972](https://github.com/the-djmaze/snappymail/issues/972)
+  [#972](https://github.com/nextgen-networks/snappymail/issues/972)
 - Sending large HTML messages slow/fail
-  [#962](https://github.com/the-djmaze/snappymail/issues/962)
+  [#962](https://github.com/nextgen-networks/snappymail/issues/962)
 - Nextcloud login failed
-  [#969](https://github.com/the-djmaze/snappymail/issues/969)
+  [#969](https://github.com/nextgen-networks/snappymail/issues/969)
 - DoMessageList() hash check was incorrect
 - "Move to folder" button overlays folder sidebar on mobile
-  [#961](https://github.com/the-djmaze/snappymail/issues/961)
+  [#961](https://github.com/nextgen-networks/snappymail/issues/961)
 - Spanish translation SPAM and NOT SPAM strings are reversed
-  [#964](https://github.com/the-djmaze/snappymail/issues/964)
+  [#964](https://github.com/nextgen-networks/snappymail/issues/964)
 - Can't open Thunderbird PGP keys from decrypted message
-  [#958](https://github.com/the-djmaze/snappymail/issues/958)
+  [#958](https://github.com/nextgen-networks/snappymail/issues/958)
 - Can't close Sieve dialog
-  [#960](https://github.com/the-djmaze/snappymail/issues/960)
+  [#960](https://github.com/nextgen-networks/snappymail/issues/960)
 
 
 ## 2.26.1 – 2023-02-14
@@ -1298,21 +1298,21 @@
 - emailArrayToStringLineHelper() now filters addresses without email address
 - Cleanup EmailModel and better email address parsing and handling
 - Workaround "server connection error"
-  [#936](https://github.com/the-djmaze/snappymail/issues/936)
+  [#936](https://github.com/nextgen-networks/snappymail/issues/936)
 - Cleanup AbstractViewPopup handling
 - Italian translation
-  [#948](https://github.com/the-djmaze/snappymail/pull/948) by @lota
+  [#948](https://github.com/nextgen-networks/snappymail/pull/948) by @lota
 - Replace Element.fromHTML() with createElement()
 
 ### Fixed
 - New subfolder not visible
-  [#937](https://github.com/the-djmaze/snappymail/issues/937)
+  [#937](https://github.com/nextgen-networks/snappymail/issues/937)
 - OpenPGP decrypted attachments `friendlySize` not a function
 - Message @media print was broken due to new `display:flex`
 - addressparser() didn't handle groups properly
 - middleclick in messages list failed when messagesDom not yet initialized
 - Cannot open messages that have an email address without an @ in the From header
-  [#950](https://github.com/the-djmaze/snappymail/issues/950)
+  [#950](https://github.com/nextgen-networks/snappymail/issues/950)
 - CSS don't display:flex when `[hidden]`
 - Default theme handling by @Niveshkrishna
 
@@ -1321,51 +1321,51 @@
 
 ### Added
 - Whitelist advanced SPF/DKIM/DMARC valid feature
-  [#938](https://github.com/the-djmaze/snappymail/issues/938)
+  [#938](https://github.com/nextgen-networks/snappymail/issues/938)
 
 ### Changed
 - \RainLoop\Providers\AddressBook\Utils functions param `Contact` changed to `VCard`
 
 ### Fixed
 - Issue with themes and Chrome cache
-  [#188](https://github.com/the-djmaze/snappymail/issues/188)
+  [#188](https://github.com/nextgen-networks/snappymail/issues/188)
 - Settings panel width due to display:flex
-  [#940](https://github.com/the-djmaze/snappymail/issues/940)
+  [#940](https://github.com/nextgen-networks/snappymail/issues/940)
 - Not respecting default theme setting
-  [#941](https://github.com/the-djmaze/snappymail/issues/941)
+  [#941](https://github.com/nextgen-networks/snappymail/issues/941)
 - Some files had 0755 instead of 0644
 - Some spacing between message "view images" buttons for
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 - Whitelist failed when empty or when using `:`
-  [#938](https://github.com/the-djmaze/snappymail/issues/938)
+  [#938](https://github.com/nextgen-networks/snappymail/issues/938)
 - Cosmetics of the external images whitelist menu
-  [#939](https://github.com/the-djmaze/snappymail/issues/939)
+  [#939](https://github.com/nextgen-networks/snappymail/issues/939)
 - PdoAddressBook ORDER BY deleted DESC to prevent sync and export issues
 - Undefined variable $items in upgrade.php
 - qq.com not supporting literal-string in search
-  [#836](https://github.com/the-djmaze/snappymail/issues/836)
+  [#836](https://github.com/nextgen-networks/snappymail/issues/836)
 
 
 ## 2.25.5 – 2023-02-09
 
 ### Added
 - New dark themes
-  [#925](https://github.com/the-djmaze/snappymail/pull/925) by @TheCuteFoxxy
+  [#925](https://github.com/nextgen-networks/snappymail/pull/925) by @TheCuteFoxxy
 - External images option 'Always when DKIM is valid' for
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 - Image whitelist menu on message for
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 
 ### Changed
 - pt-PT translation by @ner00
-  [#917](https://github.com/the-djmaze/snappymail/issues/917) and
-  [#920](https://github.com/the-djmaze/snappymail/issues/920)
+  [#917](https://github.com/nextgen-networks/snappymail/issues/917) and
+  [#920](https://github.com/nextgen-networks/snappymail/issues/920)
 - fr-FR translation by @hguilbert
-  [#919](https://github.com/the-djmaze/snappymail/issues/919)
+  [#919](https://github.com/nextgen-networks/snappymail/issues/919)
 - Layout section rl-right now is `display: flex` and solves
-  [#928](https://github.com/the-djmaze/snappymail/issues/928)
+  [#928](https://github.com/nextgen-networks/snappymail/issues/928)
 - Some Themes background to `cover`
-  [#918](https://github.com/the-djmaze/snappymail/issues/918)
+  [#918](https://github.com/nextgen-networks/snappymail/issues/918)
 - Speedup cleanHtml() parser
 - Reduce memory usage on addressbook import
 
@@ -1374,24 +1374,24 @@
 - Admin -> Config layout
 - Inline images sometimes failed
 - Undefined index: cid
-  [#921](https://github.com/the-djmaze/snappymail/issues/921)
+  [#921](https://github.com/nextgen-networks/snappymail/issues/921)
 - On upgrade prevent Apache access errors for
-  [#358](https://github.com/the-djmaze/snappymail/issues/358)
+  [#358](https://github.com/nextgen-networks/snappymail/issues/358)
 - Import contacts as CSV is broken
-  [#931](https://github.com/the-djmaze/snappymail/issues/931)
+  [#931](https://github.com/nextgen-networks/snappymail/issues/931)
 
 ### Removed
 - Blockquote height calculator for
-  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
 
 
 ## 2.25.4 – 2023-02-06
 
 ### Added
 - message maximum quoted text level for speed.
-  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
 - LoveDark Theme
-  [#913](https://github.com/the-djmaze/snappymail/pull/913) by @TheCuteFoxxy
+  [#913](https://github.com/nextgen-networks/snappymail/pull/913) by @TheCuteFoxxy
 
 ### Changed
 - Moved pluginEnable() to \SnappyMail\Repository::enablePackage()
@@ -1400,26 +1400,26 @@
 - Some style change for settings panels
 - Some MailMessageView styling
 - Disabled blockquotes height calculation for
-  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
 - Enhance Add domain dialog
-  [#916](https://github.com/the-djmaze/snappymail/issues/916)
+  [#916](https://github.com/nextgen-networks/snappymail/issues/916)
 
 ### Fixed
 - Fixed arrows in thread view while scrolling
-  [#908](https://github.com/the-djmaze/snappymail/issues/908)
+  [#908](https://github.com/nextgen-networks/snappymail/issues/908)
 - CSS btn-thin were too high
 - Whitelist to show images directly
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 - MailSo\Base\Http::GetHost(): Return value must be of type string
-  [#910](https://github.com/the-djmaze/snappymail/issues/910)
+  [#910](https://github.com/nextgen-networks/snappymail/issues/910)
 - Nextcloud undefined variable $sUser
-  [#915](https://github.com/the-djmaze/snappymail/issues/915)
+  [#915](https://github.com/nextgen-networks/snappymail/issues/915)
 - Hopefull improved styling for Firefox mobile fixes
 - Scroll display error
-  [#912](https://github.com/the-djmaze/snappymail/issues/912)
+  [#912](https://github.com/nextgen-networks/snappymail/issues/912)
 - Autofocus was triggered when view resized
 - Better solution for Settings Page is bigger than the Account Page
-  [#897](https://github.com/the-djmaze/snappymail/issues/897)
+  [#897](https://github.com/nextgen-networks/snappymail/issues/897)
 
 ### Removed
 - $bUrlEncode as it was always false
@@ -1429,7 +1429,7 @@
 
 ### Added
 - Make message collapse quotes optional
-  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
 
 ### Changed
 - Improved loginErrorDelay to prevent timing attacks and default to 5 seconds
@@ -1440,56 +1440,56 @@
 
 ### Fixed
 - Prevent plugin property decrypt error
-  [#859](https://github.com/the-djmaze/snappymail/issues/859)
+  [#859](https://github.com/nextgen-networks/snappymail/issues/859)
 - Index.html cache issue
-  [#891](https://github.com/the-djmaze/snappymail/issues/891)
+  [#891](https://github.com/nextgen-networks/snappymail/issues/891)
 - Images whitelist regular expression failed
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 - Undefined index: ShowImages
-  [#901](https://github.com/the-djmaze/snappymail/issues/901)
+  [#901](https://github.com/nextgen-networks/snappymail/issues/901)
 - Chrome shows LSep boxes in certain emails
-  [#900](https://github.com/the-djmaze/snappymail/issues/900)
+  [#900](https://github.com/nextgen-networks/snappymail/issues/900)
 - Don't remember OpenPGP/GnuPGP key passphrase when it fails
-  [#840](https://github.com/the-djmaze/snappymail/issues/840)
+  [#840](https://github.com/nextgen-networks/snappymail/issues/840)
 
 
 ## 2.25.2 – 2023-02-02
 
 ### Added
 - Refresh frequency of the mailboxes
-  [#486](https://github.com/the-djmaze/snappymail/issues/486)
+  [#486](https://github.com/nextgen-networks/snappymail/issues/486)
 - Temporarily save password for private key during session
-  [#840](https://github.com/the-djmaze/snappymail/issues/840)
+  [#840](https://github.com/nextgen-networks/snappymail/issues/840)
 - Upgrade from Rainloop, password not migrated
-  [#898](https://github.com/the-djmaze/snappymail/issues/898)
+  [#898](https://github.com/nextgen-networks/snappymail/issues/898)
 - Whitelist to show images directly
-  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
 - HTML editor paste image makes it max 1024px width/height
-  [#262](https://github.com/the-djmaze/snappymail/issues/262)
+  [#262](https://github.com/nextgen-networks/snappymail/issues/262)
 - SnappyMail\TAR::extractTo support the $files and $overwrite parameters
 
 ### Changed
 - Issue with themes when Chrome crashes
-  [#188](https://github.com/the-djmaze/snappymail/issues/188)
+  [#188](https://github.com/nextgen-networks/snappymail/issues/188)
 - /static/.htaccess as mentioned by @dbiczo in
-  [#895](https://github.com/the-djmaze/snappymail/issues/895)
+  [#895](https://github.com/nextgen-networks/snappymail/issues/895)
 - Update nb-NO language
-  [#896](https://github.com/the-djmaze/snappymail/pull/896) by @master3395
+  [#896](https://github.com/nextgen-networks/snappymail/pull/896) by @master3395
 - \RainLoop\Utils::SetCookie() to \SnappyMail\Cookies::set()
 - Merge \MailSo\Base\Utils::RecRmDir() and \MailSo\Base\Utils::RecTimeDirRemove()
 
 ### Fixed
 - Two issues with images being delivered via ProxyExternal
-  [#887](https://github.com/the-djmaze/snappymail/issues/887)
+  [#887](https://github.com/nextgen-networks/snappymail/issues/887)
 - Multiple accounts conflicts when using multiple tabs
-  [#892](https://github.com/the-djmaze/snappymail/issues/892)
+  [#892](https://github.com/nextgen-networks/snappymail/issues/892)
 - Spaces in attached file names are not preserved
-  [#893](https://github.com/the-djmaze/snappymail/issues/893)
+  [#893](https://github.com/nextgen-networks/snappymail/issues/893)
 - Prevent empty area scroll on body
 
 ### Removed
 - Floating HTML text formatting menu on mobile
-  [#828](https://github.com/the-djmaze/snappymail/issues/828)
+  [#828](https://github.com/nextgen-networks/snappymail/issues/828)
 - Unused AUTH_SPEC_LOGOUT_TOKEN_KEY and AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY
 
 
@@ -1498,9 +1498,9 @@
 ### Added
 - Support RFC 8689
 - Nextcloud move themes outside of app folder
-  [#875](https://github.com/the-djmaze/snappymail/issues/875)
+  [#875](https://github.com/nextgen-networks/snappymail/issues/875)
 - Add check to unregister system addressbook
-  [#879](https://github.com/the-djmaze/snappymail/pull/879) by @akhil1508
+  [#879](https://github.com/nextgen-networks/snappymail/pull/879) by @akhil1508
 
 ### Changed
 - material-design checkbox use hidden input for accessibility
@@ -1512,20 +1512,20 @@
 - PHP < 8.1 ini_set() only accepts strings when `declare(strict_types=1);` is used
 - Nextcloud also fix settings on upgrade
 - Nextcloud workaround upgrade OPCache issue
-  [#880](https://github.com/the-djmaze/snappymail/issues/880)
+  [#880](https://github.com/nextgen-networks/snappymail/issues/880)
 - SMTP error while using PHP mail()
-  [#884](https://github.com/the-djmaze/snappymail/issues/884)
+  [#884](https://github.com/nextgen-networks/snappymail/issues/884)
 - Cannot create folder
-  [#885](https://github.com/the-djmaze/snappymail/issues/885)
+  [#885](https://github.com/nextgen-networks/snappymail/issues/885)
 - Image stretching when image hasd max-width
-  [#869](https://github.com/the-djmaze/snappymail/issues/869)
+  [#869](https://github.com/nextgen-networks/snappymail/issues/869)
 
 
 ## 2.25.0 – 2023-01-26
 
 ### Changed
 - Right margin to folder search input wrapper
-  [#871](https://github.com/the-djmaze/snappymail/pull/871) by @codiflow
+  [#871](https://github.com/nextgen-networks/snappymail/pull/871) by @codiflow
 - Almost all request params now use JavaScript camelCase instead of CamelCase
 - #rl-content to use flex for better layout control
 - Decode some Copernica link tracking
@@ -1536,11 +1536,11 @@
 
 ### Fixed
 - CardDAV sync error - Request aborted
-  [#866](https://github.com/the-djmaze/snappymail/issues/866)
+  [#866](https://github.com/nextgen-networks/snappymail/issues/866)
 - PDF not possible to be viewed in the browser
-  [#867](https://github.com/the-djmaze/snappymail/issues/867)
+  [#867](https://github.com/nextgen-networks/snappymail/issues/867)
 - ZIP Files cannot be uploaded from Desktop to attachments (other files can be uploaded)
-  [#878](https://github.com/the-djmaze/snappymail/issues/878)
+  [#878](https://github.com/nextgen-networks/snappymail/issues/878)
 - Mobile view issues with leftside menu
 - Default messageListItem border left color for dark mode
 - Nextcloud layout in ?admin
@@ -1555,24 +1555,24 @@
 - Preparations for RFC 8689
 - Add admin setting for the contacts suggestions limit
 - A button to clear folder search input field
-  [#847](https://github.com/the-djmaze/snappymail/pull/847) by @codiflow
+  [#847](https://github.com/nextgen-networks/snappymail/pull/847) by @codiflow
 - Preparations for custom SMTP credentials handling for
-  [#859](https://github.com/the-djmaze/snappymail/issues/859)
-  [#458](https://github.com/the-djmaze/snappymail/issues/458)
-  [#431](https://github.com/the-djmaze/snappymail/issues/431)
-  [#233](https://github.com/the-djmaze/snappymail/issues/233)
+  [#859](https://github.com/nextgen-networks/snappymail/issues/859)
+  [#458](https://github.com/nextgen-networks/snappymail/issues/458)
+  [#431](https://github.com/nextgen-networks/snappymail/issues/431)
+  [#233](https://github.com/nextgen-networks/snappymail/issues/233)
 
 ### Changed
 - Display the time of emails, not just the size and date
-  [#843](https://github.com/the-djmaze/snappymail/issues/843)
+  [#843](https://github.com/nextgen-networks/snappymail/issues/843)
 - Made thread number a bit wider
-  [#844](https://github.com/the-djmaze/snappymail/issues/844)
+  [#844](https://github.com/nextgen-networks/snappymail/issues/844)
 - Improved contacts suggestions limit handling
-  [#849](https://github.com/the-djmaze/snappymail/issues/849)
+  [#849](https://github.com/nextgen-networks/snappymail/issues/849)
 - 64-bit PHP was required
-  [#852](https://github.com/the-djmaze/snappymail/issues/852)
+  [#852](https://github.com/nextgen-networks/snappymail/issues/852)
 - Update fr-FR translations
-  [#854](https://github.com/the-djmaze/snappymail/pull/854) by @dominiquefournier
+  [#854](https://github.com/nextgen-networks/snappymail/pull/854) by @dominiquefournier
 - Move createDomain & createDomainAlias buttons below table
 - Move some Nextcloud SnappyMailHelper code to new InstallStep
 - Cleanup messages cache handling
@@ -1580,18 +1580,18 @@
 
 ### Fixed
 - LiteSpeed does not disable compression although .htaccess says so
-  [#525](https://github.com/the-djmaze/snappymail/issues/525)
-  [#855](https://github.com/the-djmaze/snappymail/issues/855)
+  [#525](https://github.com/nextgen-networks/snappymail/issues/525)
+  [#855](https://github.com/nextgen-networks/snappymail/issues/855)
 - "Move to folder" functionality displays in desktop view when on mobile
-  [#858](https://github.com/the-djmaze/snappymail/issues/858)
+  [#858](https://github.com/nextgen-networks/snappymail/issues/858)
 - matchAnyRule() Return value must be of type bool, none returned
 - Unknown CSP directive 'strict-dynamic' in Safari 13.1.2
 - Wrong timeStyle issue in Safari 13.1.2
 - Language SETTINGS_LABELS got lost
 - Nextcloud failed loading app data when path didn't end with /
-  [#864](https://github.com/the-djmaze/snappymail/issues/864)
+  [#864](https://github.com/nextgen-networks/snappymail/issues/864)
 - Workaround Nextcloud session_start issue
-  [#813](https://github.com/the-djmaze/snappymail/issues/813)
+  [#813](https://github.com/nextgen-networks/snappymail/issues/813)
 
 ## 2.24.5 – 2023-01-12
 
@@ -1599,40 +1599,40 @@
 - Support for search criterias ON, SENTON, SENTSINCE and SENTBEFORE
 - New 'forward as attachment' glyph
 - NC integration app metadata: add links to admin and dev docs
-  [#820](https://github.com/the-djmaze/snappymail/pull/820) by @p-bo
+  [#820](https://github.com/nextgen-networks/snappymail/pull/820) by @p-bo
 - Clicking on messagelist grouped date/from searches on that date/from
-  [#815](https://github.com/the-djmaze/snappymail/issues/815)
+  [#815](https://github.com/nextgen-networks/snappymail/issues/815)
 - Nextcloud Improved file picker layout
-  [#825](https://github.com/the-djmaze/snappymail/issues/825)
+  [#825](https://github.com/nextgen-networks/snappymail/issues/825)
 
 ### Changed
 - Move release.php to cli/release.php
 - Moved sort options "FROM" direct below "DATE" for better understanding
 - Added DAV path error to log for
-  [#822](https://github.com/the-djmaze/snappymail/issues/822)
+  [#822](https://github.com/nextgen-networks/snappymail/issues/822)
 - Resolve layout issues by changing from `fixed` to `relative`
-  [#686](https://github.com/the-djmaze/snappymail/issues/686)
+  [#686](https://github.com/nextgen-networks/snappymail/issues/686)
 - Cache handling of messagelist changed due to etag issues
 - Improve german and italian translation
-  [#846](https://github.com/the-djmaze/snappymail/pull/846) by @cm-schl
+  [#846](https://github.com/nextgen-networks/snappymail/pull/846) by @cm-schl
 
 ### Fixed
 - Searching on Nextcloud search
-  [#787](https://github.com/the-djmaze/snappymail/issues/787)
+  [#787](https://github.com/nextgen-networks/snappymail/issues/787)
 - Workaround another Nextcloud disallowed .htaccess
-  [#790](https://github.com/the-djmaze/snappymail/issues/790)
+  [#790](https://github.com/nextgen-networks/snappymail/issues/790)
 - Compact display of folders in nextcloud
-  [#824](https://github.com/the-djmaze/snappymail/pull/824) by @makoehr
+  [#824](https://github.com/nextgen-networks/snappymail/pull/824) by @makoehr
 - Admin -> Contacts PDO test failed when using different AddressBookInterface
 - KolabAddressBook errors
 - Forgot debug js/css setting change in Nextcloud
 - Typed property MailSo\Mail\MessageListParams::$sSearch must not be accessed before initialization
 - Unable to change font/text colour when composing message using Safari
-  [#826](https://github.com/the-djmaze/snappymail/issues/826)
+  [#826](https://github.com/nextgen-networks/snappymail/issues/826)
 - auth_logging failed
-  [#489](https://github.com/the-djmaze/snappymail/issues/489)
+  [#489](https://github.com/nextgen-networks/snappymail/issues/489)
 - Class "RainLoop\Actions\Notifications" not found
-  [#839](https://github.com/the-djmaze/snappymail/issues/839)
+  [#839](https://github.com/nextgen-networks/snappymail/issues/839)
 
 ### Removed
 - 'set-version' argument for release.php
@@ -1645,16 +1645,16 @@
 
 ### Changed
 - A lot of MessageList sorting improvements
-  [#796](https://github.com/the-djmaze/snappymail/issues/796)
+  [#796](https://github.com/nextgen-networks/snappymail/issues/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/issues/790)
+  [#790](https://github.com/nextgen-networks/snappymail/issues/790)
 - Searching on Nextcloud search failed
-  [#787](https://github.com/the-djmaze/snappymail/issues/787)
+  [#787](https://github.com/nextgen-networks/snappymail/issues/787)
 
 
 ## 2.24.3 – 2022-12-28
@@ -1664,32 +1664,32 @@
 
 ### Fixed
 - F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
-  [#800](https://github.com/the-djmaze/snappymail/issues/800)
+  [#800](https://github.com/nextgen-networks/snappymail/issues/800)
 - Switching accounts does not work anymore with 2.24.2
-  [#802](https://github.com/the-djmaze/snappymail/issues/802)
+  [#802](https://github.com/nextgen-networks/snappymail/issues/802)
 
 
 ## 2.24.2 – 2022-12-27
 
 ### Changed
 - Disable sorting when viewing message thread
-  [#445](https://github.com/the-djmaze/snappymail/issues/445)
+  [#445](https://github.com/nextgen-networks/snappymail/issues/445)
 - Update Chinese translation
-  [#794](https://github.com/the-djmaze/snappymail/pull/794) by @mayswind
+  [#794](https://github.com/nextgen-networks/snappymail/pull/794) by @mayswind
 - No need to call IMAP EXAMINE when current folder already SELECT
 - Thread view now has tree indentation
 
 ### Fixed
 - Nextcloud failed on Integrity check
-  [#790](https://github.com/the-djmaze/snappymail/issues/790)
+  [#790](https://github.com/nextgen-networks/snappymail/issues/790)
 - Deleting message fails with message "Cannot move message" on hMailServer
-  [#793](https://github.com/the-djmaze/snappymail/issues/793)
+  [#793](https://github.com/nextgen-networks/snappymail/issues/793)
 - List messages per day feature is enabled by default and breaks sorting
-  [#796](https://github.com/the-djmaze/snappymail/issues/796)
+  [#796](https://github.com/nextgen-networks/snappymail/issues/796)
 - Custom page login not working for first time due to smctoken security
-  [#798](https://github.com/the-djmaze/snappymail/issues/798)
+  [#798](https://github.com/nextgen-networks/snappymail/issues/798)
 - Message list is always empty due to wrong implementation of RFC 8474
-  [#799](https://github.com/the-djmaze/snappymail/issues/799)
+  [#799](https://github.com/nextgen-networks/snappymail/issues/799)
 
 
 ## 2.24.1 – 2022-12-23
@@ -1698,15 +1698,15 @@
 - Intl.DateTimeFormat() into toLocaleString() for iOS < 14
 - Cleanup locale date/time handling
 - Make MessageList per day optional
-  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
 
 ### Fixed
 - Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization
-  [#792](https://github.com/the-djmaze/snappymail/issues/792)
+  [#792](https://github.com/nextgen-networks/snappymail/issues/792)
 - Attachments in mails in 2.24 not loading in reply/forward
-  [#789](https://github.com/the-djmaze/snappymail/issues/789)
+  [#789](https://github.com/nextgen-networks/snappymail/issues/789)
 - Rollback #280 due to complications
-  [#280](https://github.com/the-djmaze/snappymail/issues/280)
+  [#280](https://github.com/nextgen-networks/snappymail/issues/280)
 
 
 ## 2.24.0 – 2022-12-22
@@ -1719,24 +1719,24 @@
 
 ### Changed
 - MessageList now grouped/split per day
-  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
 - Account switcher still shown when allow_additional_accounts is set to Off
-  [#280](https://github.com/the-djmaze/snappymail/issues/280)
+  [#280](https://github.com/nextgen-networks/snappymail/issues/280)
 - PHP classes use typed properties
 - Speedup Contacts Suggestions handling
 - Check SMTP SIZE
-  [#779](https://github.com/the-djmaze/snappymail/issues/779)
+  [#779](https://github.com/nextgen-networks/snappymail/issues/779)
 
 ### Fixed
 - Handle multiple DKIM signatures authentication results
 - Reload admin extensions on update
 - SieveClient quoted string parsing failed
 - Invalid Attachments (PDF)
-  [#466](https://github.com/the-djmaze/snappymail/issues/466)
+  [#466](https://github.com/nextgen-networks/snappymail/issues/466)
 - Email HTML images rendering issue
-  [#564](https://github.com/the-djmaze/snappymail/issues/564)
+  [#564](https://github.com/nextgen-networks/snappymail/issues/564)
 - "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
-  [#780](https://github.com/the-djmaze/snappymail/issues/780)
+  [#780](https://github.com/nextgen-networks/snappymail/issues/780)
 
 ### Removed
 - Some unused plugin hooks to improve Action handling speed
@@ -1751,18 +1751,18 @@
 - Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
 - SnappyMail\Imap\Sync now matches folders based on JMAP role
 - Added the new imapsync.php command line script for
-  [#744](https://github.com/the-djmaze/snappymail/issues/744)
+  [#744](https://github.com/nextgen-networks/snappymail/issues/744)
 - Added manual setting for 12/24h clock
-  [#760](https://github.com/the-djmaze/snappymail/issues/760)
+  [#760](https://github.com/nextgen-networks/snappymail/issues/760)
 - Add options to mark the message I'm viewing as unread and return to the inbox
-  [#766](https://github.com/the-djmaze/snappymail/issues/766)
+  [#766](https://github.com/nextgen-networks/snappymail/issues/766)
 
 ### Fixed
 - Extension menu shows only some available extensions
-  [#778](https://github.com/the-djmaze/snappymail/issues/778)
-- New solution for [#423](https://github.com/the-djmaze/snappymail/issues/423) due to [#774](https://github.com/the-djmaze/snappymail/issues/774)
+  [#778](https://github.com/nextgen-networks/snappymail/issues/778)
+- New solution for [#423](https://github.com/nextgen-networks/snappymail/issues/423) due to [#774](https://github.com/nextgen-networks/snappymail/issues/774)
 - Avatars extension error on smartphone
-  [#764](https://github.com/the-djmaze/snappymail/issues/764)
+  [#764](https://github.com/nextgen-networks/snappymail/issues/764)
 - Don't fetch Unread count for main account
 - CSS .e-checkbox.material-design invisible on show/hide
 
@@ -1771,33 +1771,33 @@
 
 ### Added
 - Show the number of unread mails on all mail addresses/accounts
-  [#437](https://github.com/the-djmaze/snappymail/issues/437)
+  [#437](https://github.com/nextgen-networks/snappymail/issues/437)
 - Show OpenSSL version in Admin => About
 
 ### Changed
 - Redirect to login page instead of "invalid token" popup
-  [#752](https://github.com/the-djmaze/snappymail/issues/752)
+  [#752](https://github.com/nextgen-networks/snappymail/issues/752)
 - Make all dialogs fit in mobile view
 - Changed some Plugin hooks for better handling:
 	* json.action-pre-call => json.before-{actionname}
 	* json.action-post-call => json.after-{actionname}
 - Cleaner accounts list in systemdropdown
 - Multiple imapConnect handling for new import mail feature
-  [#744](https://github.com/the-djmaze/snappymail/issues/744)
+  [#744](https://github.com/nextgen-networks/snappymail/issues/744)
 
 ### Fixed
 - Loosing HTML signature in account identity under settings
-  [#750](https://github.com/the-djmaze/snappymail/issues/750)
+  [#750](https://github.com/nextgen-networks/snappymail/issues/750)
 - Plugin configuration did not load anymore when type was SELECTION
-  [#753](https://github.com/the-djmaze/snappymail/pull/753) by @cm-schl
+  [#753](https://github.com/nextgen-networks/snappymail/pull/753) by @cm-schl
 - Nextcloud Default theme shows gray text on gray background
-  [#754](https://github.com/the-djmaze/snappymail/issues/754)
+  [#754](https://github.com/nextgen-networks/snappymail/issues/754)
 - Only run JSON hooks when $sAction is set
-  [#755](https://github.com/the-djmaze/snappymail/issues/755)
+  [#755](https://github.com/nextgen-networks/snappymail/issues/755)
 - Unsupported SASL mechanism OAUTHBEARER
-  [#756](https://github.com/the-djmaze/snappymail/issues/756)
-  [#758](https://github.com/the-djmaze/snappymail/issues/758)
-  [#759](https://github.com/the-djmaze/snappymail/issues/759)
+  [#756](https://github.com/nextgen-networks/snappymail/issues/756)
+  [#758](https://github.com/nextgen-networks/snappymail/issues/758)
+  [#759](https://github.com/nextgen-networks/snappymail/issues/759)
 - border-box issue with .buttonCompose
 
 ### Removed
@@ -1808,15 +1808,15 @@
 
 ### Changed
 - Scroll bar with the mobile version in "Advanced search" screen
-  [#712](https://github.com/the-djmaze/snappymail/issues/712)
+  [#712](https://github.com/nextgen-networks/snappymail/issues/712)
 
 ### Fixed
 - Undefined property: MailSo\Mail\FolderCollection::$capabilities
 - PHP 8.2 Creation of dynamic property is deprecated
 - Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
-  [#745](https://github.com/the-djmaze/snappymail/issues/745)
-  [#746](https://github.com/the-djmaze/snappymail/issues/746)
-  [#748](https://github.com/the-djmaze/snappymail/issues/748)
+  [#745](https://github.com/nextgen-networks/snappymail/issues/745)
+  [#746](https://github.com/nextgen-networks/snappymail/issues/746)
+  [#748](https://github.com/nextgen-networks/snappymail/issues/748)
 - Admin domain test undefined matched domain should say email@example matched domain
 
 
@@ -1824,15 +1824,15 @@
 
 ### Changed
 - Narrow MessageList wraps star icon
-  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
 - Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
-  [#745](https://github.com/the-djmaze/snappymail/issues/745)
+  [#745](https://github.com/nextgen-networks/snappymail/issues/745)
 - No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
 - Update Chinese translation by @mayswind
 
 ### Fixed
 - PluginProperty DefaultValue contained array while it should not
-  [#741](https://github.com/the-djmaze/snappymail/issues/741)
+  [#741](https://github.com/nextgen-networks/snappymail/issues/741)
 
 ### Removed
 - IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
@@ -1843,7 +1843,7 @@
 ### Added
 - Support plugin minified .min.js and .min.css
 - ZIP Download multiple emails
-  [#717](https://github.com/the-djmaze/snappymail/issues/717)
+  [#717](https://github.com/nextgen-networks/snappymail/issues/717)
 
 ### Changed
 - Replaced some data-bind="click: function(){} with object functions to prevent eval()
@@ -1852,12 +1852,12 @@
 ### Fixed
 - Settings Themes style due to border-box change
 - "Remember me" failed due to v2.22.4 Session token change
-  [#719](https://github.com/the-djmaze/snappymail/issues/719)
-  [#731](https://github.com/the-djmaze/snappymail/issues/731)
+  [#719](https://github.com/nextgen-networks/snappymail/issues/719)
+  [#731](https://github.com/nextgen-networks/snappymail/issues/731)
 
 ### Removed
 - Vacation filter: Button to add recipients (+)
-  [#728](https://github.com/the-djmaze/snappymail/issues/728)
+  [#728](https://github.com/nextgen-networks/snappymail/issues/728)
 
 
 ## 2.22.4 – 2022-11-28
@@ -1865,19 +1865,19 @@
 ### Changed
 - Contacts dialog layout using flex
 - Session token is related to the user agent string
-  [#713](https://github.com/the-djmaze/snappymail/issues/713)
+  [#713](https://github.com/nextgen-networks/snappymail/issues/713)
 - Better browser cache handling for avatars plugin
-  [#714](https://github.com/the-djmaze/snappymail/issues/714)
+  [#714](https://github.com/nextgen-networks/snappymail/issues/714)
 - Force HTML editor when set as default when replying to message
-  [#355](https://github.com/the-djmaze/snappymail/issues/355)
+  [#355](https://github.com/nextgen-networks/snappymail/issues/355)
 
 ### Fixed
 - Contact Error - object Object
-  [#716](https://github.com/the-djmaze/snappymail/issues/716)
+  [#716](https://github.com/nextgen-networks/snappymail/issues/716)
 - Unable to move messages to different folder by drag and drop
-  [#710](https://github.com/the-djmaze/snappymail/issues/710)
+  [#710](https://github.com/nextgen-networks/snappymail/issues/710)
 - v2.22.3 unknown error
-  [#709https://github.com/the-djmaze/snappymail/issues/709)
+  [#709https://github.com/nextgen-networks/snappymail/issues/709)
 
 
 ## 2.22.3 – 2022-11-25
@@ -1887,71 +1887,71 @@
 
 ### Changed
 - Improved cPanel integration
-  [#697](https://github.com/the-djmaze/snappymail/issues/697)
+  [#697](https://github.com/nextgen-networks/snappymail/issues/697)
 - Update to OpenPGP.js v5.5.0
 
 ### Fixed
 - drag & drop folder expansion
-  [#707](https://github.com/the-djmaze/snappymail/issues/707)
+  [#707](https://github.com/nextgen-networks/snappymail/issues/707)
 - Save selected messages as .eml in Nextcloud failed
-  [#704](https://github.com/the-djmaze/snappymail/issues/704)
+  [#704](https://github.com/nextgen-networks/snappymail/issues/704)
 
 
 ## 2.22.2 – 2022-11-24
 
 ### Added
 - Support cPanel
-  [#697](https://github.com/the-djmaze/snappymail/issues/697)
+  [#697](https://github.com/nextgen-networks/snappymail/issues/697)
 
 
 ## 2.22.1 – 2022-11-23
 
 ### Added
 - AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
-  [#115](https://github.com/the-djmaze/snappymail/issues/115)
+  [#115](https://github.com/nextgen-networks/snappymail/issues/115)
 
 ### Changed
 - All the attachment zone is not clickable, even if the cursor is a hand
-  [#691](https://github.com/the-djmaze/snappymail/issues/691)
+  [#691](https://github.com/nextgen-networks/snappymail/issues/691)
 - Different approach for "update button duplicated in admin panel"
-  [#677](https://github.com/the-djmaze/snappymail/issues/677)
+  [#677](https://github.com/nextgen-networks/snappymail/issues/677)
 - Better drag & drop solution for leftPanel
 
 ### Fixed
 - The page does not change after batch deletion
-  [#684](https://github.com/the-djmaze/snappymail/issues/684)
+  [#684](https://github.com/nextgen-networks/snappymail/issues/684)
 - Prevent domain uppercase issues found in
-  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
 - Login invalid response: VXNlcm5hbWU6CG
-  [#693](https://github.com/the-djmaze/snappymail/issues/693)
+  [#693](https://github.com/nextgen-networks/snappymail/issues/693)
 
 
 ## 2.21.4 – 2022-11-22
 
 ### Added
 - Added domain matcher test for
-  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
 - Download all Attachments of selected Emails
-  [#361](https://github.com/the-djmaze/snappymail/issues/361)
+  [#361](https://github.com/nextgen-networks/snappymail/issues/361)
 
 ### Changed
 - Log current shortcuts scope for
-  [#690](https://github.com/the-djmaze/snappymail/issues/690)
+  [#690](https://github.com/nextgen-networks/snappymail/issues/690)
 - CSS everything to be box-sizing: border-box;
 - Make messageview a bit larger so that it is the same height as the messagelist
 - Cleanup and rearrange some fontastic glyphs
 - Also show From email address by default
-  [#683](https://github.com/the-djmaze/snappymail/issues/683)
+  [#683](https://github.com/nextgen-networks/snappymail/issues/683)
 
 ### Fixed
 - Contact.display() returns [object Object]
 - When left panel disabled and drag messages, show it
 - Issue with admin domain connection type settings selectbox
-  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
 - Mobile View on cellphones: automatic scrolling not working near the visual keyboard
-  [#686](https://github.com/the-djmaze/snappymail/issues/686)
+  [#686](https://github.com/nextgen-networks/snappymail/issues/686)
 - Unable to separate runtime from installation
-  [#685](https://github.com/the-djmaze/snappymail/issues/685)
+  [#685](https://github.com/nextgen-networks/snappymail/issues/685)
 
 ### Removed
 - Removed inline parameter of checkbox and select components
@@ -1964,18 +1964,18 @@
 
 ### Changed
 - Increase visible reading area for small screens
-  [#672](https://github.com/the-djmaze/snappymail/issues/672)
+  [#672](https://github.com/nextgen-networks/snappymail/issues/672)
 - Improved message spam score detailed view
 - Improved DAV connection logging
 
 ### Fixed
 - Handling attachments MIME type / content-type
 - Message responsive resizing width/height of elements
-  [#678](https://github.com/the-djmaze/snappymail/issues/678)
+  [#678](https://github.com/nextgen-networks/snappymail/issues/678)
 - Focus on textarea when creating a new plain text email
-  [#501](https://github.com/the-djmaze/snappymail/issues/501)
+  [#501](https://github.com/nextgen-networks/snappymail/issues/501)
 - CardDav remove photos of my contacts when synchronizing
-  [#679](https://github.com/the-djmaze/snappymail/issues/679)
+  [#679](https://github.com/nextgen-networks/snappymail/issues/679)
 
 ### Removed
 - \MailSo\Mime\Enumerations\MimeType
@@ -1983,21 +1983,21 @@
 ### Nextcloud
 - Use fontastic in Nextcloud Files selector dialog
 - Firefox < 98 dialogs
-  [#673](https://github.com/the-djmaze/snappymail/issues/673)
+  [#673](https://github.com/nextgen-networks/snappymail/issues/673)
 
 ## 2.21.2 – 2022-11-15
 
 ### Added
 - Allow browser Spellchecker
-  [#574](https://github.com/the-djmaze/snappymail/issues/574)
+  [#574](https://github.com/nextgen-networks/snappymail/issues/574)
 - Decode MIME charset of .EML attachments
-  [#662](https://github.com/the-djmaze/snappymail/issues/662)
+  [#662](https://github.com/nextgen-networks/snappymail/issues/662)
 
 ### Changed
 - Increase message visible text area
-  [#672](https://github.com/the-djmaze/snappymail/issues/672)
+  [#672](https://github.com/nextgen-networks/snappymail/issues/672)
 - When copy/paste image use the raw data instead of clipboard HTML
-  [#654](https://github.com/the-djmaze/snappymail/issues/654)
+  [#654](https://github.com/nextgen-networks/snappymail/issues/654)
 - When application.ini debug.enable is true, also debug js and css
 - JavaScript rl.setWindowTitle() renamed to rl.setTitle()
 
@@ -2006,28 +2006,28 @@
 
 ### Nextcloud
 - Workaround Nextcloud calendar crashes
-  [#622](https://github.com/the-djmaze/snappymail/issues/622)
-  [#661](https://github.com/the-djmaze/snappymail/issues/661)
+  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
+  [#661](https://github.com/nextgen-networks/snappymail/issues/661)
 - Added share public/internal file link
-  [#569](https://github.com/the-djmaze/snappymail/issues/569)
+  [#569](https://github.com/nextgen-networks/snappymail/issues/569)
 
 
 ## 2.21.1 – 2022-11-13
 
 ### Fixed
 - Crypt crashes when Sodium not installed
-  [#641](https://github.com/the-djmaze/snappymail/issues/641)
-  [#657](https://github.com/the-djmaze/snappymail/issues/657)
-  [#663](https://github.com/the-djmaze/snappymail/issues/663)
-  [#664](https://github.com/the-djmaze/snappymail/issues/664)
-  [#668](https://github.com/the-djmaze/snappymail/issues/668)
-  [#669](https://github.com/the-djmaze/snappymail/issues/669)
+  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
+  [#657](https://github.com/nextgen-networks/snappymail/issues/657)
+  [#663](https://github.com/nextgen-networks/snappymail/issues/663)
+  [#664](https://github.com/nextgen-networks/snappymail/issues/664)
+  [#668](https://github.com/nextgen-networks/snappymail/issues/668)
+  [#669](https://github.com/nextgen-networks/snappymail/issues/669)
 - Personalised favicon not working - default Snappymail favicon showing
-  [#665](https://github.com/the-djmaze/snappymail/issues/665)
+  [#665](https://github.com/nextgen-networks/snappymail/issues/665)
 
 ### Nextcloud
 - v23 ContentSecurityPolicy versions issue
-  [#666](https://github.com/the-djmaze/snappymail/issues/666)
+  [#666](https://github.com/nextgen-networks/snappymail/issues/666)
 
 
 ## 2.21.0 – 2022-11-11
@@ -2035,11 +2035,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/the-djmaze/snappymail/issues/643)
+  [#643](https://github.com/nextgen-networks/snappymail/issues/643)
 - Allow an account name/label
-  [#571](https://github.com/the-djmaze/snappymail/issues/571)
+  [#571](https://github.com/nextgen-networks/snappymail/issues/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -2050,13 +2050,13 @@
   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](https://github.com/the-djmaze/snappymail/issues/638)
+  [#638](https://github.com/nextgen-networks/snappymail/issues/638)
 
 ### Fixed
 - ldap-identities-plugin
-  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
+  [#647](https://github.com/nextgen-networks/snappymail/pull/647) by @cm-schl
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -2067,7 +2067,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/the-djmaze/snappymail/issues/642)
+  [#642](https://github.com/nextgen-networks/snappymail/issues/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -2075,8 +2075,8 @@
 
 ### Nextcloud
 - Improved workaround for 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -2087,8 +2087,8 @@
 
 ### 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -2096,7 +2096,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -2104,24 +2104,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/the-djmaze/snappymail/issues/631)
-  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+  [#635](https://github.com/nextgen-networks/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)
+  [#625](https://github.com/nextgen-networks/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -2129,11 +2129,11 @@
 ### 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)
+  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -2150,11 +2150,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
 - Update readme
-  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
+  [#617](https://github.com/nextgen-networks/snappymail/pull/617) by @cm-schl
 
 
 ## 2.20.0 – 2022-11-03
@@ -2172,7 +2172,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -2184,17 +2184,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -2205,11 +2205,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
@@ -2230,11 +2230,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/the-djmaze/snappymail/issues/643)
+  [#643](https://github.com/nextgen-networks/snappymail/issues/643)
 - Allow an account name/label
-  [#571](https://github.com/the-djmaze/snappymail/issues/571)
+  [#571](https://github.com/nextgen-networks/snappymail/issues/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -2245,13 +2245,13 @@
   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](https://github.com/the-djmaze/snappymail/issues/638)
+  [#638](https://github.com/nextgen-networks/snappymail/issues/638)
 
 ### Fixed
 - ldap-identities-plugin
-  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
+  [#647](https://github.com/nextgen-networks/snappymail/pull/647) by @cm-schl
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -2262,7 +2262,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/the-djmaze/snappymail/issues/642)
+  [#642](https://github.com/nextgen-networks/snappymail/issues/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -2270,8 +2270,8 @@
 
 ### Nextcloud
 - Improved workaround for 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -2282,8 +2282,8 @@
 
 ### 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -2291,7 +2291,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -2299,24 +2299,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/the-djmaze/snappymail/issues/631)
-  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+  [#635](https://github.com/nextgen-networks/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)
+  [#625](https://github.com/nextgen-networks/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -2324,11 +2324,11 @@
 ### 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)
+  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -2345,11 +2345,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
 - Update readme
-  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
+  [#617](https://github.com/nextgen-networks/snappymail/pull/617) by @cm-schl
 
 
 ## 2.20.0 – 2022-11-03
@@ -2367,7 +2367,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -2379,17 +2379,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -2400,11 +2400,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 95821f69d..9777f5e56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@
 2. Install node.js - `https://nodejs.org/download/`
 3. Install yarn - `https://yarnpkg.com/en/docs/install`
 4. Install gulp - `npm install gulp -g`
-5. Fork snappymail from https://github.com/the-djmaze/snappymail
+5. Fork snappymail from https://github.com/nextgen-networks/snappymail/
 6. Clone snappymail - `git clone git@github.com:USERNAME/snappymail.git snappymail`
 7. `cd snappymail`
 8. Install all dependencies - `yarn install`
diff --git a/build/arch/PKGBUILD b/build/arch/PKGBUILD
index 4dd25389c..207d109ab 100644
--- a/build/arch/PKGBUILD
+++ b/build/arch/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="modern PHP webmail client"
 arch=('any')
 license=('AGPL3')
-url="https://github.com/nextgen-networks/snappymail"
+url="https://github.com/nextgen-networks/snappymail/"
 depends=('php-fpm')
 makedepends=('php', 'nodejs' 'yarn' 'gulp', 'rollup')
 optdepends=('mariadb: storage backend for contacts'
diff --git a/build/deb.php b/build/deb.php
index 714f659b8..f866360d3 100755
--- a/build/deb.php
+++ b/build/deb.php
@@ -53,7 +53,7 @@ passthru('mv '
 
 passthru('rm -dfr '.escapeshellarg(DEB_DEST_DIR));
 
-// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
+// https://github.com/nextgen-networks/snappymail/issues/185#issuecomment-1059420588
 $cwd = getcwd();
 chdir($TARGET_DIR);
 passthru('dpkg-scanpackages . /dev/null > '.escapeshellarg($TARGET_DIR . 'Packages'));
diff --git a/build/deb/DEBIAN/control b/build/deb/DEBIAN/control
index 884792246..65bb6b79a 100644
--- a/build/deb/DEBIAN/control
+++ b/build/deb/DEBIAN/control
@@ -6,8 +6,8 @@ Recommends: php-intl, php-sodium, php-uuid
 Suggests: php-sqlite3 | php-mysql | php-pgsql, php-curl, php-exif, php-gnupg, php-gd | php-gmagick | php-imagick, php-openssl, php-zip
 Architecture: all
 Homepage: https://snappymail.eu
-Vcs-Browser: https://github.com/the-djmaze/snappymail
-Vcs-Git: https://github.com/the-djmaze/snappymail.git
+Vcs-Browser: https://github.com/nextgen-networks/snappymail/
+Vcs-Git: https://github.com/nextgen-networks/snappymail.git
 Description: SnappyMail is a PHP-based simple, modern, lightweight & fast web-based email client with no database requirements.
  It supports IMAP, SMTP and Sieve protocols, multiple accounts and identities, an admin panel for configuration.
  Plugins can be installed to further extend functionality.
diff --git a/cli/release.php b/cli/release.php
index 2e4e12c46..0094a083d 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -207,7 +207,7 @@ if ($options['aur']) {
 	pkgdesc = modern PHP webmail client
 	pkgver = '.$package->version.'
 	pkgrel = 1
-	url = https://github.com/nextgen-networks/snappymail
+	url = https://github.com/nextgen-networks/snappymail/
 	arch = any
 	license = AGPL3
 	makedepends = php
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 57b1f3d26..4f1131805 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -308,16 +308,16 @@ export const
 			// Not supported by <template> element
 //			.replace(/<!doctype[^>]*>/gi, '')
 //			.replace(/<\?xml[^>]*\?>/gi, '')
-			// https://github.com/the-djmaze/snappymail/issues/1860
+			// https://github.com/nextgen-networks/snappymail/issues/1860
 			.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
 //			.replace(/<\/?(html|head)[^>]*>/gi, '')
-			// Fix Reddit https://github.com/the-djmaze/snappymail/issues/540
+			// Fix Reddit https://github.com/nextgen-networks/snappymail/issues/540
 			.replace(/<span class="preview-text"[\s\S]+?<\/span>/, '')
-			// https://github.com/the-djmaze/snappymail/issues/900
+			// https://github.com/nextgen-networks/snappymail/issues/900
 			.replace(/\u2028/g,' ')
-			// https://github.com/the-djmaze/snappymail/issues/1415
+			// https://github.com/nextgen-networks/snappymail/issues/1415
 			.replace(/<br>\s*<\/p>/gi,'</p>')
 			.trim();
 		html = '';
@@ -343,7 +343,7 @@ export const
 			}
 		});
 
-		// https://github.com/the-djmaze/snappymail/issues/1125
+		// https://github.com/nextgen-networks/snappymail/issues/1125
 		tmpl.content.querySelectorAll(keepTagContent).forEach(oElement => replaceWithChildren(oElement));
 
 		tmpl.content.querySelectorAll(
@@ -359,7 +359,7 @@ export const
 		});
 */
 
-		// https://github.com/the-djmaze/snappymail/issues/1641
+		// https://github.com/nextgen-networks/snappymail/issues/1641
 		let body = tmpl.content.querySelector('.mail-body');
 		[...tmpl.content.querySelectorAll('.mail-body + .mail-body')]
 			.forEach(oElement => body.append(...oElement.childNodes));
@@ -626,7 +626,7 @@ export const
 					setAttribute('data-x-style-broken-urls', JSON.stringify(urls_broken));
 				}
 /*
-				// https://github.com/the-djmaze/snappymail/issues/1082
+				// https://github.com/nextgen-networks/snappymail/issues/1082
 				if (11 > pInt(oStyle.fontSize)) {
 					oStyle.removeProperty('font-size');
 				}
@@ -775,7 +775,7 @@ export const
 		plain = plain.toString()
 			.replace(/\r/g, '')
 			.replace(/^>[> ]>+/gm, ([match]) => (match ? match.replace(/[ ]+/g, '') : match))
-			// https://github.com/the-djmaze/snappymail/issues/900
+			// https://github.com/nextgen-networks/snappymail/issues/900
 			.replace(/\u2028/g,' ');
 
 		let bIn = false,
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 503cd793b..7d5a8eb4e 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -56,7 +56,7 @@ loadAccountsAndIdentities = () => {
 			);
 
 			// Invoke "Update Identity" pop up right after login
-			// https://github.com/the-djmaze/snappymail/issues/1689
+			// https://github.com/nextgen-networks/snappymail/issues/1689
 			const main = IdentityUserStore.main();
 			main && !main.exists() && setTimeout(()=>editIdentity(main), 1000);
 		}
@@ -69,7 +69,7 @@ loadAccountsAndIdentities = () => {
  */
 download = (link, name = "") => {
 	console.log('download: '+link);
-	// Firefox 98 issue https://github.com/the-djmaze/snappymail/issues/301
+	// Firefox 98 issue https://github.com/nextgen-networks/snappymail/issues/301
 	if (ThemeStore.isMobile() || /firefox/i.test(navigator.userAgent)) {
 		open(link, '_blank');
 		focus();
diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js
index c4c6e364f..44ca6f759 100644
--- a/dev/Component/EmailAddresses.js
+++ b/dev/Component/EmailAddresses.js
@@ -143,7 +143,7 @@ export class EmailAddressesComponent {
 								datalist.append(new Option(item));
 								chars = Math.max(chars, item.length);
 							});
-							// https://github.com/the-djmaze/snappymail/issues/368 and #513
+							// https://github.com/nextgen-networks/snappymail/issues/368 and #513
 							chars *= 8;
 							if (input.clientWidth < chars) {
 								input.style.width = chars + 'px';
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index b1e50fcad..3e87d0a2f 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -38,13 +38,13 @@ class SquireUI
 		const
 			clr = createElement('input'),
 			doClr = name => input => {
-				// https://github.com/the-djmaze/snappymail/issues/826
+				// https://github.com/nextgen-networks/snappymail/issues/826
 				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
 				clr.style.width = input.offsetWidth + 'px';
 
 				clr.value = '';
 				clr.onchange = () => squire.setStyle({[name]:clr.value});
-				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
+				// Chrome 110+ https://github.com/nextgen-networks/snappymail/issues/1199
 //				clr.oninput = () => squire.setStyle({[name]:clr.value});
 				setTimeout(()=>clr.click(),1);
 			},
@@ -263,7 +263,7 @@ class SquireUI
 
 		clr.type = 'color';
 		toolbar.append(clr);
-		// Chrome https://github.com/the-djmaze/snappymail/issues/1199
+		// Chrome https://github.com/nextgen-networks/snappymail/issues/1199
 		let clrid = 'squire-colors',
 			colorlist = doc.getElementById(clrid),
 			add = hex => colorlist.append(new Option(hex));
diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 228b4c502..6142b0205 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -438,8 +438,8 @@ export class FolderModel extends AbstractModel {
 /*
 			{
 				// TODO: make this optional in Settings
-				// https://github.com/the-djmaze/snappymail/issues/457
-				// https://github.com/the-djmaze/snappymail/issues/567
+				// https://github.com/nextgen-networks/snappymail/issues/457
+				// https://github.com/nextgen-networks/snappymail/issues/567
 				const
 					unread = this.unreadEmails(),
 					type = this.type();
diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js
index f05af9915..a71c8d8fb 100644
--- a/dev/Remote/AbstractFetch.js
+++ b/dev/Remote/AbstractFetch.js
@@ -47,7 +47,7 @@ fetchJSON = (action, sUrl, params, timeout, jsonCallback) => {
 			params.Action = action;
 		}
 	}
-	// Don't abort, read https://github.com/the-djmaze/snappymail/issues/487
+	// Don't abort, read https://github.com/nextgen-networks/snappymail/issues/487
 //	abort(action, 0, 1);
 	const controller = new AbortController(),
 		signal = controller.signal;
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 337f65240..1a54dfdc5 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -77,7 +77,7 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		 */
 		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
 		/**
-		 * https://github.com/the-djmaze/snappymail/issues/973
+		 * https://github.com/nextgen-networks/snappymail/issues/973
 		Remote.request('GetStoredPGPKeys', (iError, data) => {
 			console.dir([iError, data]);
 		});
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index fddf66882..56cd11ce9 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -10,7 +10,7 @@ let __themeTimer = 0;
 export const
 	// Also see Styles/_Values.less @maxMobileWidth
 	isMobile = matchMedia('(max-width: 799px)'),
-	// https://github.com/the-djmaze/snappymail/issues/1150
+	// https://github.com/nextgen-networks/snappymail/issues/1150
 //	isSmall = matchMedia('(max-width: 1400px)'),
 
 	ThemeStore = {
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 8afda5478..bd5285027 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -508,7 +508,7 @@ MessagelistUserStore.moveMessages = (
 		} else {
 			MessagelistUserStore.isIncomplete(true);
 
-			// Select next email https://github.com/the-djmaze/snappymail/issues/968
+			// Select next email https://github.com/nextgen-networks/snappymail/issues/968
 			if (currentMessage && 1 == messages.length && SettingsUserStore.showNextMessage()) {
 				let next = MessagelistUserStore.indexOf(currentMessage) + 1;
 				if (0 < next && (next = MessagelistUserStore()[next])) {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 8df8433ee..a22d0a2c2 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -79,7 +79,7 @@ dialog:not(.animate) {
 }
 
 /**
- * https://github.com/the-djmaze/snappymail/issues/686
+ * https://github.com/nextgen-networks/snappymail/issues/686
  */
 @media screen and (max-width: @maxMobileWidth) {
 	dialog {
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index d920dfd90..f9c1f3086 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -17,7 +17,7 @@
 	width: 100%;
 }
 
-/* https://github.com/the-djmaze/snappymail/issues/1427 */
+/* https://github.com/nextgen-networks/snappymail/issues/1427 */
 #V-MailFolderList .e-checkbox {
 	margin: 0 4px;
 	width: calc(100% - 8px);
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index d768ef88f..d1955c250 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -968,7 +968,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				// no default
 			}
 
-			// https://github.com/the-djmaze/snappymail/issues/491
+			// https://github.com/nextgen-networks/snappymail/issues/491
 			tpl.innerHTML = oLastMessage.bodyAsHTML();
 			tpl.content.querySelectorAll('img').forEach(img => {
 				img.src || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 764655acc..f99339e0f 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -269,7 +269,7 @@ export class DomainPopupView extends AbstractViewPopup {
 
 	testConnectionCommand() {
 		this.clearTesting();
-		// https://github.com/the-djmaze/snappymail/issues/477
+		// https://github.com/nextgen-networks/snappymail/issues/477
 		AskPopupView.credentials('IMAP', 'GLOBAL/TEST').then(credentials => {
 			if (credentials) {
 				this.testing(true);
diff --git a/examples/eml/tnef.eml b/examples/eml/tnef.eml
index 7709e9ada..9432fc4ce 100644
--- a/examples/eml/tnef.eml
+++ b/examples/eml/tnef.eml
@@ -10,7 +10,7 @@ Content-Type: text/plain; charset=us-ascii; format=flowed
 Test message body with example TNEF part from
 https://github.com/Yeraze/ytnef
 
-https://github.com/the-djmaze/snappymail/discussions/1012
+https://github.com/nextgen-networks/snappymail/discussions/1012
 
 --=-2UbcDuksJBAwUNBNW7UD
 Content-Type: application/vnd.ms-tnef
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index a3d442e96..94316c469 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
 VERSION=2.38.2
-RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
+RUN wget https://github.com/nextgen-networks/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
     find /app/code/snappymail -type d -exec chmod 755 {} \; && \
diff --git a/integrations/nextcloud/snappymail/INSTALL b/integrations/nextcloud/snappymail/INSTALL
index 2e42a4f67..c83f134f5 100755
--- a/integrations/nextcloud/snappymail/INSTALL
+++ b/integrations/nextcloud/snappymail/INSTALL
@@ -17,4 +17,4 @@ In the SnappyMail admin prompt, the default login is "admin" and the default pas
 This is it, you are now free to configure SnappyMail as you wish. One important point is the Domains section when you will set up the IMAP/SMTP parameters that shall be associated with the email adresses of your users.
 
 STUCK IN MAINTENANCE:
-https://github.com/the-djmaze/snappymail/issues/929
+https://github.com/nextgen-networks/snappymail/issues/929
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index b1a67e0b1..34b4c04b5 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -25,20 +25,20 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
-		<admin>https://github.com/the-djmaze/snappymail/wiki/Admin-Manual</admin>
-		<developer>https://github.com/the-djmaze/snappymail/wiki/Developer-Documentation</developer>
-		<website>https://github.com/the-djmaze/snappymail/wiki</website>
+		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
+		<admin>https://github.com/nextgen-networks/snappymail/wiki/Admin-Manual</admin>
+		<developer>https://github.com/nextgen-networks/snappymail/wiki/Developer-Documentation</developer>
+		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
-	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud</repository>
-	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
+	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
+	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/nextcloud</repository>
+	<bugs>https://github.com/nextgen-networks/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="32" />
 		<lib>mbstring</lib>
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
index 37613d383..4cc69ad29 100644
--- a/integrations/nextcloud/snappymail/css/embed.css
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -84,7 +84,7 @@ body > header ul {
 
 /**
  * Firefox < 98
- * https://github.com/the-djmaze/snappymail/issues/673
+ * https://github.com/nextgen-networks/snappymail/issues/673
  */
 #rl-app dialog.polyfill {
 	margin-top: 50px;
@@ -93,7 +93,7 @@ body > header ul {
 
 /**
  * hampoelz
- * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
+ * https://github.com/nextgen-networks/snappymail/issues/96#issuecomment-1279783076
  */
 
 .messageList {
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
index 6f00cedfe..cd81d6b13 100644
--- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -48,7 +48,7 @@ class InstallStep implements IRepairStep
 		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
 //		$app_dir = \rtrim(APP_INDEX_ROOT_PATH, '\\/');
 
-		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
+		// https://github.com/nextgen-networks/snappymail/issues/790#issuecomment-1366527884
 		if (!\file_exists($app_dir . '/.htaccess') && \file_exists($app_dir . '/_htaccess')) {
 			\rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
 		}
@@ -125,7 +125,7 @@ class InstallStep implements IRepairStep
 		// check if admins provided additional/custom initial config file
 		// https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#setting-a-single-configuration-value
 		// ex: php occ config:app:set snappymail custom_config_file --value="/path/to/config.php"
-		// https://github.com/the-djmaze/snappymail/pull/1197
+		// https://github.com/nextgen-networks/snappymail/pull/1197
 		try {
 			$customConfigFile = $this->config->getAppValue(Application::APP_ID, 'custom_config_file');
 			if ($customConfigFile) {
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 528f5917d..2fe372a6a 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -82,7 +82,7 @@ class SnappyMailHelper
 				$aCredentials = static::getLoginCredentials();
 /*
 				// NC25+ workaround for Impersonate plugin
-				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/nextgen-networks/snappymail/issues/561#issuecomment-1301317723
 				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
 				require \OC::$SERVERROOT . '/version.php';
 //				\OC\SystemConfig
@@ -128,7 +128,7 @@ class SnappyMailHelper
 			if ($handle) {
 				\header_remove('Content-Security-Policy');
 				\RainLoop\Service::Handle();
-				// https://github.com/the-djmaze/snappymail/issues/1069
+				// https://github.com/nextgen-networks/snappymail/issues/1069
 				exit;
 //				return new SnappyMailResponse();
 			}
diff --git a/integrations/owncloud/snappymail/CHANGELOG.md b/integrations/owncloud/snappymail/CHANGELOG.md
index 4d0457f06..e857c6c3e 100644
--- a/integrations/owncloud/snappymail/CHANGELOG.md
+++ b/integrations/owncloud/snappymail/CHANGELOG.md
@@ -5,16 +5,16 @@
 
 ## Changed
 - A lot of MessageList sorting improvements
-  [#796](https://github.com/the-djmaze/snappymail/pull/796)
+  [#796](https://github.com/nextgen-networks/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)
+  [#790](https://github.com/nextgen-networks/snappymail/pull/790)
 - Searching on Nextcloud search failed
-  [#787](https://github.com/the-djmaze/snappymail/pull/787)
+  [#787](https://github.com/nextgen-networks/snappymail/pull/787)
 
 
 ## 2.24.3 – 2022-12-28
@@ -24,32 +24,32 @@
 
 ## Fixed
 - F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
-  [#800](https://github.com/the-djmaze/snappymail/pull/800)
+  [#800](https://github.com/nextgen-networks/snappymail/pull/800)
 - Switching accounts does not work anymore with 2.24.2
-  [#802](https://github.com/the-djmaze/snappymail/pull/802)
+  [#802](https://github.com/nextgen-networks/snappymail/pull/802)
 
 
 ## 2.24.2 – 2022-12-27
 
 ### Changed
 - Disable sorting when viewing message thread
-  [#445](https://github.com/the-djmaze/snappymail/pull/445)
+  [#445](https://github.com/nextgen-networks/snappymail/pull/445)
 - Update Chinese translation by @mayswind
-  [#794](https://github.com/the-djmaze/snappymail/pull/794)
+  [#794](https://github.com/nextgen-networks/snappymail/pull/794)
 - No need to call IMAP EXAMINE when current folder already SELECT
 - Thread view now has tree indentation
 
 ### Fixed
 - Nextcloud failed on Integrity check
-  [#790](https://github.com/the-djmaze/snappymail/pull/790)
+  [#790](https://github.com/nextgen-networks/snappymail/pull/790)
 - Deleting message fails with message "Cannot move message" on hMailServer
-  [#793](https://github.com/the-djmaze/snappymail/pull/793)
+  [#793](https://github.com/nextgen-networks/snappymail/pull/793)
 - List messages per day feature is enabled by default and breaks sorting
-  [#796](https://github.com/the-djmaze/snappymail/pull/796)
+  [#796](https://github.com/nextgen-networks/snappymail/pull/796)
 - Custom page login not working for first time due to smctoken security
-  [#798](https://github.com/the-djmaze/snappymail/pull/798)
+  [#798](https://github.com/nextgen-networks/snappymail/pull/798)
 - Message list is always empty due to wrong implementation of RFC 8474
-  [#799](https://github.com/the-djmaze/snappymail/pull/799)
+  [#799](https://github.com/nextgen-networks/snappymail/pull/799)
 
 
 ## 2.24.1 – 2022-12-23
@@ -58,15 +58,15 @@
 - Intl.DateTimeFormat() into toLocaleString() for iOS < 14
 - Cleanup locale date/time handling
 - Make MessageList per day optional
-  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
 
 ### Fixed
 - Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization #792
-  [#792](https://github.com/the-djmaze/snappymail/pull/792)
+  [#792](https://github.com/nextgen-networks/snappymail/pull/792)
 - Attachments in mails in 2.24 not loading in reply/forward #789
-  [#789](https://github.com/the-djmaze/snappymail/pull/789)
+  [#789](https://github.com/nextgen-networks/snappymail/pull/789)
 - Rollback #280 due to complications
-  [#280](https://github.com/the-djmaze/snappymail/pull/280)
+  [#280](https://github.com/nextgen-networks/snappymail/pull/280)
 
 
 ## 2.24.0 – 2022-12-22
@@ -79,24 +79,24 @@
 
 ### Changed
 - MessageList now grouped/split per day
-  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
 - Account switcher still shown when allow_additional_accounts is set to Off
-  [#280](https://github.com/the-djmaze/snappymail/pull/280)
+  [#280](https://github.com/nextgen-networks/snappymail/pull/280)
 - PHP classes use typed properties
 - Speedup Contacts Suggestions handling
 - Check SMTP SIZE
-  [#779](https://github.com/the-djmaze/snappymail/pull/779)
+  [#779](https://github.com/nextgen-networks/snappymail/pull/779)
 
 ### Fixed
 - Handle multiple DKIM signatures authentication results
 - Reload admin extensions on update
 - SieveClient quoted string parsing failed
 - Invalid Attachments (PDF)
-  [#466](https://github.com/the-djmaze/snappymail/pull/466)
+  [#466](https://github.com/nextgen-networks/snappymail/pull/466)
 - Email HTML images rendering issue
-  [#564](https://github.com/the-djmaze/snappymail/pull/564)
+  [#564](https://github.com/nextgen-networks/snappymail/pull/564)
 - "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
-  [#780](https://github.com/the-djmaze/snappymail/pull/780)
+  [#780](https://github.com/nextgen-networks/snappymail/pull/780)
 
 ### Removed
 - Some unused plugin hooks to improve Action handling speed
@@ -111,16 +111,16 @@
 - Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
 - SnappyMail\Imap\Sync now matches folders based on JMAP role
 - Added the new imapsync.php command line script for
-  [#744](https://github.com/the-djmaze/snappymail/pull/744)
+  [#744](https://github.com/nextgen-networks/snappymail/pull/744)
 - Added manual setting for 12/24h clock
-  [#760](https://github.com/the-djmaze/snappymail/pull/760)
+  [#760](https://github.com/nextgen-networks/snappymail/pull/760)
 - Add options to mark the message I'm viewing as unread and return to the inbox #766
 
 ### Fixed
 - Extension menu shows only some available extensions #778
-- New solution for [#423](https://github.com/the-djmaze/snappymail/pull/423) due to [#774](https://github.com/the-djmaze/snappymail/pull/774)
+- New solution for [#423](https://github.com/nextgen-networks/snappymail/pull/423) due to [#774](https://github.com/nextgen-networks/snappymail/pull/774)
 - Avatars extension error on smartphone
-  [#764](https://github.com/the-djmaze/snappymail/pull/764)
+  [#764](https://github.com/nextgen-networks/snappymail/pull/764)
 - Don't fetch Unread count for main account
 - CSS .e-checkbox.material-design invisible on show/hide
 
@@ -129,33 +129,33 @@
 
 ### Added
 - Show the number of unread mails on all mail addresses/accounts
-  [#437](https://github.com/the-djmaze/snappymail/pull/437)
+  [#437](https://github.com/nextgen-networks/snappymail/pull/437)
 - Show OpenSSL version in Admin => About
 
 ### Changed
 - Redirect to login page instead of "invalid token" popup
-  [#752](https://github.com/the-djmaze/snappymail/pull/752)
+  [#752](https://github.com/nextgen-networks/snappymail/pull/752)
 - Make all dialogs fit in mobile view
 - Changed some Plugin hooks for better handling:
 	* json.action-pre-call => json.before-{actionname}
 	* json.action-post-call => json.after-{actionname}
 - Cleaner accounts list in systemdropdown
 - Multiple imapConnect handling for new import mail feature
-  [#744](https://github.com/the-djmaze/snappymail/pull/744)
+  [#744](https://github.com/nextgen-networks/snappymail/pull/744)
 
 ### Fixed
 - Loosing HTML signature in account identity under settings
-  [#750](https://github.com/the-djmaze/snappymail/pull/750)
+  [#750](https://github.com/nextgen-networks/snappymail/pull/750)
 - Plugin configuration did not load anymore when type was SELECTION by @cm-schl
-  [#753](https://github.com/the-djmaze/snappymail/pull/753)
+  [#753](https://github.com/nextgen-networks/snappymail/pull/753)
 - Nextcloud Default theme shows gray text on gray background
-  [#754](https://github.com/the-djmaze/snappymail/pull/754)
+  [#754](https://github.com/nextgen-networks/snappymail/pull/754)
 - Only run JSON hooks when $sAction is set
-  [#755](https://github.com/the-djmaze/snappymail/pull/755)
+  [#755](https://github.com/nextgen-networks/snappymail/pull/755)
 - Unsupported SASL mechanism OAUTHBEARER
-  [#756](https://github.com/the-djmaze/snappymail/pull/756)
-  [#758](https://github.com/the-djmaze/snappymail/pull/758)
-  [#759](https://github.com/the-djmaze/snappymail/pull/759)
+  [#756](https://github.com/nextgen-networks/snappymail/pull/756)
+  [#758](https://github.com/nextgen-networks/snappymail/pull/758)
+  [#759](https://github.com/nextgen-networks/snappymail/pull/759)
 - border-box issue with .buttonCompose
 
 ### Removed
@@ -166,15 +166,15 @@
 
 ### Changed
 - Scroll bar with the mobile version in "Advanced search" screen
-  [#712](https://github.com/the-djmaze/snappymail/pull/712)
+  [#712](https://github.com/nextgen-networks/snappymail/pull/712)
 
 ### Fixed
 - Undefined property: MailSo\Mail\FolderCollection::$capabilities
 - PHP 8.2 Creation of dynamic property is deprecated
 - Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
-  [#745](https://github.com/the-djmaze/snappymail/pull/745)
-  [#746](https://github.com/the-djmaze/snappymail/pull/746)
-  [#748](https://github.com/the-djmaze/snappymail/pull/748)
+  [#745](https://github.com/nextgen-networks/snappymail/pull/745)
+  [#746](https://github.com/nextgen-networks/snappymail/pull/746)
+  [#748](https://github.com/nextgen-networks/snappymail/pull/748)
 - Admin domain test undefined matched domain should say email@example matched domain
 
 
@@ -182,15 +182,15 @@
 
 ### Changed
 - Narrow MessageList wraps star icon
-  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
 - Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
-  [#745](https://github.com/the-djmaze/snappymail/pull/745)
+  [#745](https://github.com/nextgen-networks/snappymail/pull/745)
 - No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
 - Update Chinese translation by @mayswind
 
 ### Fixed
 - PluginProperty DefaultValue contained array while it should not
-  [#741](https://github.com/the-djmaze/snappymail/pull/741)
+  [#741](https://github.com/nextgen-networks/snappymail/pull/741)
 
 ### Removed
 - IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
@@ -201,7 +201,7 @@
 ### Added
 - Support plugin minified .min.js and .min.css
 - ZIP Download multiple emails
-  [#717](https://github.com/the-djmaze/snappymail/pull/717)
+  [#717](https://github.com/nextgen-networks/snappymail/pull/717)
 
 ### Changed
 - Replaced some data-bind="click: function(){} with object functions to prevent eval()
@@ -210,12 +210,12 @@
 ### Fixed
 - Settings Themes style due to border-box change
 - "Remember me" failed due to v2.22.4 Session token change
-  [#719](https://github.com/the-djmaze/snappymail/pull/719)
-  [#731](https://github.com/the-djmaze/snappymail/pull/731)
+  [#719](https://github.com/nextgen-networks/snappymail/pull/719)
+  [#731](https://github.com/nextgen-networks/snappymail/pull/731)
 
 ### Removed
 - Vacation filter: Button to add recipients (+)
-  [#728](https://github.com/the-djmaze/snappymail/pull/728)
+  [#728](https://github.com/nextgen-networks/snappymail/pull/728)
 
 
 ## 2.22.4 – 2022-11-28
@@ -223,19 +223,19 @@
 ### Changed
 - Contacts dialog layout using flex
 - Session token is related to the user agent string
-  [#713](https://github.com/the-djmaze/snappymail/pull/713)
+  [#713](https://github.com/nextgen-networks/snappymail/pull/713)
 - Better browser cache handling for avatars plugin
-  [#714](https://github.com/the-djmaze/snappymail/pull/714)
+  [#714](https://github.com/nextgen-networks/snappymail/pull/714)
 - Force HTML editor when set as default when replying to message
-  [#355](https://github.com/the-djmaze/snappymail/pull/355)
+  [#355](https://github.com/nextgen-networks/snappymail/pull/355)
 
 ### Fixed
 - Contact Error - object Object
-  [#716](https://github.com/the-djmaze/snappymail/pull/716)
+  [#716](https://github.com/nextgen-networks/snappymail/pull/716)
 - Unable to move messages to different folder by drag and drop
-  [#710](https://github.com/the-djmaze/snappymail/pull/710)
+  [#710](https://github.com/nextgen-networks/snappymail/pull/710)
 - v2.22.3 unknown error
-  [#709https://github.com/the-djmaze/snappymail/pull/709)
+  [#709https://github.com/nextgen-networks/snappymail/pull/709)
 
 
 ## 2.22.3 – 2022-11-25
@@ -245,14 +245,14 @@
 
 ### Changed
 - Improved cPanel integration
-  [#697](https://github.com/the-djmaze/snappymail/pull/697)
+  [#697](https://github.com/nextgen-networks/snappymail/pull/697)
 - Update to OpenPGP.js v5.5.0
 
 ### Fixed
 - drag & drop folder expansion
-  [#707](https://github.com/the-djmaze/snappymail/pull/707)
+  [#707](https://github.com/nextgen-networks/snappymail/pull/707)
 - Save selected messages as .eml in Nextcloud failed
-  [#704](https://github.com/the-djmaze/snappymail/pull/704)
+  [#704](https://github.com/nextgen-networks/snappymail/pull/704)
 
 
 ## 2.22.2 – 2022-11-24
@@ -265,50 +265,50 @@
 
 ### Added
 - AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
-  [#115](https://github.com/the-djmaze/snappymail/pull/115)
+  [#115](https://github.com/nextgen-networks/snappymail/pull/115)
 
 ### Changed
 - All the attachment zone is not clickable, even if the cursor is a hand
-  [#691](https://github.com/the-djmaze/snappymail/pull/691)
+  [#691](https://github.com/nextgen-networks/snappymail/pull/691)
 - Different approach for "update button duplicated in admin panel"
-  [#677](https://github.com/the-djmaze/snappymail/pull/677)
+  [#677](https://github.com/nextgen-networks/snappymail/pull/677)
 - Better drag & drop solution for leftPanel
 
 ### Fixed
 - The page does not change after batch deletion
-  [#684](https://github.com/the-djmaze/snappymail/pull/684)
+  [#684](https://github.com/nextgen-networks/snappymail/pull/684)
 - Prevent domain uppercase issues found in
-  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
 - Login invalid response: VXNlcm5hbWU6CG
-  [#693](https://github.com/the-djmaze/snappymail/pull/693)
+  [#693](https://github.com/nextgen-networks/snappymail/pull/693)
 
 
 ## 2.21.4 – 2022-11-22
 
 ### Added
 - Added domain matcher test for
-  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
 - Download all Attachments of selected Emails
-  [#361](https://github.com/the-djmaze/snappymail/pull/361)
+  [#361](https://github.com/nextgen-networks/snappymail/pull/361)
 
 ### Changed
 - Log current shortcuts scope for
-  [#690](https://github.com/the-djmaze/snappymail/pull/690)
+  [#690](https://github.com/nextgen-networks/snappymail/pull/690)
 - CSS everything to be box-sizing: border-box;
 - Make messageview a bit larger so that it is the same height as the messagelist
 - Cleanup and rearrange some fontastic glyphs
 - Also show From email address by default
-  [#683](https://github.com/the-djmaze/snappymail/pull/683)
+  [#683](https://github.com/nextgen-networks/snappymail/pull/683)
 
 ### Fixed
 - Contact.display() returns [object Object]
 - When left panel disabled and drag messages, show it
 - Issue with admin domain connection type settings selectbox
-  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
 - Mobile View on cellphones: automatic scrolling not working near the visual keyboard
-  [#686](https://github.com/the-djmaze/snappymail/pull/686)
+  [#686](https://github.com/nextgen-networks/snappymail/pull/686)
 - Unable to separate runtime from installation
-  [#685](https://github.com/the-djmaze/snappymail/pull/685)
+  [#685](https://github.com/nextgen-networks/snappymail/pull/685)
 
 ### Removed
 - Removed inline parameter of checkbox and select components
@@ -321,18 +321,18 @@
 
 ### Changed
 - Increase visible reading area for small screens
-  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+  [#672](https://github.com/nextgen-networks/snappymail/pull/672)
 - Improved message spam score detailed view
 - Improved DAV connection logging
 
 ### Fixed
 - Handling attachments MIME type / content-type
 - Message responsive resizing width/height of elements
-  [#678](https://github.com/the-djmaze/snappymail/pull/678)
+  [#678](https://github.com/nextgen-networks/snappymail/pull/678)
 - Focus on textarea when creating a new plain text email
-  [#501](https://github.com/the-djmaze/snappymail/pull/501)
+  [#501](https://github.com/nextgen-networks/snappymail/pull/501)
 - CardDav remove photos of my contacts when synchronizing
-  [#679](https://github.com/the-djmaze/snappymail/pull/679)
+  [#679](https://github.com/nextgen-networks/snappymail/pull/679)
 
 ### Removed
 - \MailSo\Mime\Enumerations\MimeType
@@ -340,21 +340,21 @@
 ### Nextcloud
 - Use fontastic in Nextcloud Files selector dialog
 - Firefox < 98 dialogs
-  [#673](https://github.com/the-djmaze/snappymail/pull/673)
+  [#673](https://github.com/nextgen-networks/snappymail/pull/673)
 
 ## 2.21.2 – 2022-11-15
 
 ### Added
 - Allow browser Spellchecker
-  [#574](https://github.com/the-djmaze/snappymail/pull/574)
+  [#574](https://github.com/nextgen-networks/snappymail/pull/574)
 - Decode MIME charset of .EML attachments
-  [#662](https://github.com/the-djmaze/snappymail/pull/662)
+  [#662](https://github.com/nextgen-networks/snappymail/pull/662)
 
 ### Changed
 - Increase message visible text area
-  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+  [#672](https://github.com/nextgen-networks/snappymail/pull/672)
 - When copy/paste image use the raw data instead of clipboard HTML
-  [#654](https://github.com/the-djmaze/snappymail/pull/654)
+  [#654](https://github.com/nextgen-networks/snappymail/pull/654)
 - When application.ini debug.enable is true, also debug js and css
 - JavaScript rl.setWindowTitle() renamed to rl.setTitle()
 
@@ -363,28 +363,28 @@
 
 ### Nextcloud
 - Workaround Nextcloud calendar crashes
-  [#622](https://github.com/the-djmaze/snappymail/pull/622)
-  [#661](https://github.com/the-djmaze/snappymail/pull/661)
+  [#622](https://github.com/nextgen-networks/snappymail/pull/622)
+  [#661](https://github.com/nextgen-networks/snappymail/pull/661)
 - Added share public/internal file link
-  [#569](https://github.com/the-djmaze/snappymail/pull/569)
+  [#569](https://github.com/nextgen-networks/snappymail/pull/569)
 
 
 ## 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)
+  [#641](https://github.com/nextgen-networks/snappymail/pull/641)
+  [#657](https://github.com/nextgen-networks/snappymail/pull/657)
+  [#663](https://github.com/nextgen-networks/snappymail/pull/663)
+  [#664](https://github.com/nextgen-networks/snappymail/pull/664)
+  [#668](https://github.com/nextgen-networks/snappymail/pull/668)
+  [#669](https://github.com/nextgen-networks/snappymail/pull/669)
 - Personalised favicon not working - default Snappymail favicon showing
-  [#665](https://github.com/the-djmaze/snappymail/pull/665)
+  [#665](https://github.com/nextgen-networks/snappymail/pull/665)
 
 ### Nextcloud
 - v23 ContentSecurityPolicy versions issue
-  [#666](https://github.com/the-djmaze/snappymail/pull/666)
+  [#666](https://github.com/nextgen-networks/snappymail/pull/666)
 
 
 ## 2.21.0 – 2022-11-11
@@ -392,11 +392,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/the-djmaze/snappymail/pull/585)
+  [#585](https://github.com/nextgen-networks/snappymail/pull/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/the-djmaze/snappymail/pull/643)
+  [#643](https://github.com/nextgen-networks/snappymail/pull/643)
 - Allow an account name/label
-  [#571](https://github.com/the-djmaze/snappymail/pull/571)
+  [#571](https://github.com/nextgen-networks/snappymail/pull/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -407,13 +407,13 @@
   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](https://github.com/the-djmaze/snappymail/pull/638)
+  [#638](https://github.com/nextgen-networks/snappymail/pull/638)
 
 ### Fixed
 - ldap-identities-plugin by @cm-schl
-  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+  [#647](https://github.com/nextgen-networks/snappymail/pull/647)
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+  [#641](https://github.com/nextgen-networks/snappymail/pull/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -424,7 +424,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/the-djmaze/snappymail/pull/642)
+  [#642](https://github.com/nextgen-networks/snappymail/pull/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -432,8 +432,8 @@
 
 ### Nextcloud
 - Improved workaround for 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -444,8 +444,8 @@
 
 ### 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -453,7 +453,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -461,24 +461,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/the-djmaze/snappymail/issues/631)
-  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+  [#635](https://github.com/nextgen-networks/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)
+  [#625](https://github.com/nextgen-networks/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -486,11 +486,11 @@
 ### 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)
+  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -507,11 +507,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
 - Update readme by @cm-schl
-  [#617](https://github.com/the-djmaze/snappymail/issues/617)
+  [#617](https://github.com/nextgen-networks/snappymail/issues/617)
 
 
 ## 2.20.0 – 2022-11-03
@@ -529,7 +529,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -541,17 +541,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -562,11 +562,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
@@ -602,7 +602,7 @@
 
 ### Fixed
 - ldap-identities-plugin by @cm-schl
-  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+  [#647](https://github.com/nextgen-networks/snappymail/pull/647)
 - OpenSSL v3 ciphers issue #641
 
 ### Nextcloud
@@ -614,7 +614,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/the-djmaze/snappymail/pull/642)
+  [#642](https://github.com/nextgen-networks/snappymail/pull/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -622,8 +622,8 @@
 
 ### Nextcloud
 - Improved workaround for 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -634,8 +634,8 @@
 
 ### 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)
+  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
   Reported [#35013](https://github.com/nextcloud/server/issues/35013)
 
 
@@ -643,7 +643,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -651,24 +651,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/the-djmaze/snappymail/issues/631)
-  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
+  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+  [#635](https://github.com/nextgen-networks/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)
+  [#625](https://github.com/nextgen-networks/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -676,11 +676,11 @@
 ### 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)
+  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -697,11 +697,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
 - Update readme by @cm-schl
-  [#617](https://github.com/the-djmaze/snappymail/issues/617)
+  [#617](https://github.com/nextgen-networks/snappymail/issues/617)
 
 
 ## 2.20.0 – 2022-11-03
@@ -719,7 +719,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -731,17 +731,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -752,11 +752,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
diff --git a/integrations/owncloud/snappymail/appinfo/info.xml b/integrations/owncloud/snappymail/appinfo/info.xml
index 84ce9cb7f..ea38d765f 100644
--- a/integrations/owncloud/snappymail/appinfo/info.xml
+++ b/integrations/owncloud/snappymail/appinfo/info.xml
@@ -22,18 +22,18 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
-		<website>https://github.com/the-djmaze/snappymail/wiki</website>
+		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
+		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
-	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/owncloud</repository>
-	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
+	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
+	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/owncloud</repository>
+	<bugs>https://github.com/nextgen-networks/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="64" />
 		<lib>mbstring</lib>
diff --git a/integrations/owncloud/snappymail/css/embed.css b/integrations/owncloud/snappymail/css/embed.css
index 150a27fe9..434c1781d 100644
--- a/integrations/owncloud/snappymail/css/embed.css
+++ b/integrations/owncloud/snappymail/css/embed.css
@@ -80,7 +80,7 @@ body > header ul {
 
 /**
  * Firefox < 98
- * https://github.com/the-djmaze/snappymail/issues/673
+ * https://github.com/nextgen-networks/snappymail/issues/673
  */
 #rl-app dialog.polyfill {
 	margin-top: 50px;
@@ -89,7 +89,7 @@ body > header ul {
 
 /**
  * hampoelz
- * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
+ * https://github.com/nextgen-networks/snappymail/issues/96#issuecomment-1279783076
  */
 
 .messageList {
diff --git a/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
index 8835da06c..453648527 100644
--- a/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -30,7 +30,7 @@ class SnappyMailHelper
 		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
 		require_once $app_dir . '/index.php';
 
-		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
+		// https://github.com/nextgen-networks/snappymail/issues/790#issuecomment-1366527884
 		if (!file_exists($app_dir . '/.htaccess') && file_exists($app_dir . '/_htaccess')) {
 			rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
 			if (!file_exists(APP_VERSION_ROOT_PATH . '/app/.htaccess') && file_exists(APP_VERSION_ROOT_PATH . '/app/_htaccess')) {
@@ -122,7 +122,7 @@ class SnappyMailHelper
 				$aCredentials = static::getLoginCredentials();
 /*
 				// NC25+ workaround for Impersonate plugin
-				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/nextgen-networks/snappymail/issues/561#issuecomment-1301317723
 				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
 				require \OC::$SERVERROOT . '/version.php';
 //				\OC\SystemConfig
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index c3fcc7ab5..61cba8f47 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -153,7 +153,7 @@ sub script_snappymail_files
 local ($d, $ver, $opts, $upgrade) = @_;
 local @files = ( { 'name' => "source",
 	           'file' => "snappymail-$ver.tar.gz",
-	           'url' => "https://github.com/the-djmaze/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
+	           'url' => "https://github.com/nextgen-networks/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
 	    );
 return @files;
 }
diff --git a/package.json b/package.json
index 3e3ff929d..708c088c0 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/the-djmaze/snappymail.git"
+    "url": "git://github.com/nextgen-networks/snappymail.git"
   },
   "scripts": {
     "watch-css": "gulp watchCss"
@@ -25,7 +25,7 @@
     }
   ],
   "bugs": {
-    "url": "https://github.com/the-djmaze/snappymail/issues"
+    "url": "https://github.com/nextgen-networks/snappymail/issues"
   },
   "keywords": [
     "webmail",
diff --git a/plugins/attachments-force-open/index.php b/plugins/attachments-force-open/index.php
index 4110b7894..11dd2a30b 100644
--- a/plugins/attachments-force-open/index.php
+++ b/plugins/attachments-force-open/index.php
@@ -5,7 +5,7 @@ class AttachmentsForceOpenPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME     = 'Attachments force open',
 		AUTHOR   = 'SnappyMail',
-		URL      = 'https://github.com/the-djmaze/snappymail/pull/1489',
+		URL      = 'https://github.com/nextgen-networks/snappymail/pull/1489',
 		VERSION  = '0.1',
 		RELEASE  = '2024-03-15',
 		REQUIRED = '2.14.0',
diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php
index ee2458948..5fea19cb2 100644
--- a/plugins/auto-domain-grab/index.php
+++ b/plugins/auto-domain-grab/index.php
@@ -7,7 +7,7 @@
  * be set to to 'example.com'.
  *
  * Based on:
- * https://github.com/the-djmaze/snappymail/blob/master/plugins/override-smtp-credentials/index.php
+ * https://github.com/nextgen-networks/snappymail/blob/master/plugins/override-smtp-credentials/index.php
  *
  */
 
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 417fdfd1b..eeb87cae0 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -27,7 +27,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		if ($identicon && \is_file(__DIR__ . "/{$identicon}.js")) {
 			$this->addJs("{$identicon}.js");
 		}
-		// https://github.com/the-djmaze/snappymail/issues/714
+		// https://github.com/nextgen-networks/snappymail/issues/714
 		if ($this->Config()->Get('plugin', 'service', true)
 //		 || !$this->Config()->Get('plugin', 'delay', true)
 		 || $this->Config()->Get('plugin', 'gravatar', false)
diff --git a/plugins/compact-composer/index.php b/plugins/compact-composer/index.php
index c9a1be1f5..fac781d72 100644
--- a/plugins/compact-composer/index.php
+++ b/plugins/compact-composer/index.php
@@ -5,7 +5,7 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Compact Composer',
 		AUTHOR = 'Sergey Mosin',
-		URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
+		URL = 'https://github.com/nextgen-networks/snappymail/pull/1466',
 		VERSION = '1.0.6',
 		RELEASE = '2024-08-08',
 		REQUIRED = '2.34.0',
diff --git a/plugins/compact-composer/js/CompactComposer.js b/plugins/compact-composer/js/CompactComposer.js
index 15ff25d03..791e77f0f 100644
--- a/plugins/compact-composer/js/CompactComposer.js
+++ b/plugins/compact-composer/js/CompactComposer.js
@@ -306,7 +306,7 @@
 
 			const clr = this.makeClr();
 			const doClr = name => input => {
-				// https://github.com/the-djmaze/snappymail/issues/826
+				// https://github.com/nextgen-networks/snappymail/issues/826
 				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
 				clr.style.width = input.offsetWidth + 'px';
 
@@ -324,7 +324,7 @@
 							console.error('invalid name:', name);
 					}
 				};
-				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
+				// Chrome 110+ https://github.com/nextgen-networks/snappymail/issues/1199
 //				clr.oninput = () => squire.setStyle({[name]:clr.value});
 				setTimeout(() => clr.click(), 1);
 			};
@@ -653,7 +653,7 @@
 			/**@type {HTMLInputElement} clr*/
 			const clr = createElement('input');
 			clr.type = 'color';
-			// Chrome https://github.com/the-djmaze/snappymail/issues/1199
+			// Chrome https://github.com/nextgen-networks/snappymail/issues/1199
 			let clrid = 'squire-colors',
 				colorlist = doc.getElementById(clrid),
 				add = hex => colorlist.append(new Option(hex));
diff --git a/plugins/demo-account/index.php b/plugins/demo-account/index.php
index 74a8cc675..0f198645d 100644
--- a/plugins/demo-account/index.php
+++ b/plugins/demo-account/index.php
@@ -61,7 +61,7 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$aActionParams['Password'] = $this->Config()->Get('plugin', 'password');
 		}
 		else if ('DoFolderCreate' === $sMethodName || 'DoFolderRename' === $sMethodName) {
-			// Block spam https://github.com/the-djmaze/snappymail/issues/371
+			// Block spam https://github.com/nextgen-networks/snappymail/issues/371
 			$latin = transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $aActionParams['folder']);
 			if (false !== \strpos($latin, 'nigger')) {
 				\error_log("blocked {$sMethodName} {$aActionParams['folder']}");
diff --git a/plugins/ldap-mail-accounts/LdapMailAccounts.php b/plugins/ldap-mail-accounts/LdapMailAccounts.php
index 5dc0c4eb6..40e8ea58a 100644
--- a/plugins/ldap-mail-accounts/LdapMailAccounts.php
+++ b/plugins/ldap-mail-accounts/LdapMailAccounts.php
@@ -132,7 +132,7 @@ class LdapMailAccounts
 			return false; // exceptions are only thrown from the handle error function that does logging already
 		}
 
-		//Basing on https://github.com/the-djmaze/snappymail/issues/616
+		//Basing on https://github.com/nextgen-networks/snappymail/issues/616
 
 		$oActions = \RainLoop\Api::Actions();
 
@@ -192,7 +192,7 @@ class LdapMailAccounts
 		//When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
 		//On a password change using ldap (or when the password has been forgotten by the user) this makes us some problems. Therefore overwrite
 		//the .cryptkey file in order to always accept the actual ldap password of the user. This has side effects on pgp keys! 
-		//See https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061
+		//See https://github.com/nextgen-networks/snappymail/issues/1570#issuecomment-2085528061
 		if ($this->config->bool_overwrite_cryptkey) {
 			if (!$oActions->StorageProvider()->Put($oAccount, StorageType::ROOT, '.cryptkey', "")) {
 				$this->logger->Write("Could not overwrite the .cryptkey file!", \LOG_WARNING, self::LOG_KEY);
diff --git a/plugins/ldap-mail-accounts/index.php b/plugins/ldap-mail-accounts/index.php
index bc53ad4f4..bbcba639e 100644
--- a/plugins/ldap-mail-accounts/index.php
+++ b/plugins/ldap-mail-accounts/index.php
@@ -101,7 +101,7 @@ class LdapMailAccountsPlugin extends AbstractPlugin
 			->SetDescription("SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file \".cryptkey\". When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
 				\nOn a password change using ldap (or when the password has been forgotten by the user) this makes problems and asks the user to insert the old password. Therefore activating this option overwrites the .cryptkey file on login in order to always accept the actual ldap password of the user.
 				\nATTENTION: This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore!
-				\nSee https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061")
+				\nSee https://github.com/nextgen-networks/snappymail/issues/1570#issuecomment-2085528061")
 			->SetDefaultValue(false),
 		]);
 
diff --git a/plugins/login-cpanel/index.php b/plugins/login-cpanel/index.php
index 9bc5ebf7a..2eb66b72a 100644
--- a/plugins/login-cpanel/index.php
+++ b/plugins/login-cpanel/index.php
@@ -58,7 +58,7 @@ class LogincPanelPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function FilterLoginCredentials(&$sEmail, &$sImapUser, &$sPassword, &$sSmtpUser)
 	{
-		// cPanel https://github.com/the-djmaze/snappymail/issues/697
+		// cPanel https://github.com/nextgen-networks/snappymail/issues/697
 //		 && !empty($_ENV['CPANEL'])
 		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
 			if (empty($_ENV['REMOTE_TEMP_USER'])) {
diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php
index a6b8d3f9d..ca4f4e6b1 100644
--- a/plugins/login-gmail/index.php
+++ b/plugins/login-gmail/index.php
@@ -148,7 +148,7 @@ class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#gmail'),
+				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#gmail'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php
index 62050f429..c372dd8ab 100644
--- a/plugins/login-o365/index.php
+++ b/plugins/login-o365/index.php
@@ -166,7 +166,7 @@ class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#o365'),
+				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#o365'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
index ab1550571..d95871875 100644
--- a/plugins/login-remote/index.php
+++ b/plugins/login-remote/index.php
@@ -58,7 +58,7 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
-		// cPanel https://github.com/the-djmaze/snappymail/issues/697
+		// cPanel https://github.com/nextgen-networks/snappymail/issues/697
 //		 && !empty($_ENV['CPANEL'])
 		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
 			if (empty($_ENV['REMOTE_TEMP_USER'])) {
diff --git a/plugins/login-virtuser/index.php b/plugins/login-virtuser/index.php
index 88207baec..615b9cb6e 100644
--- a/plugins/login-virtuser/index.php
+++ b/plugins/login-virtuser/index.php
@@ -5,7 +5,7 @@ class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Virtuser Login',
 		AUTHOR = 'v20z',
-		URL     = 'https://github.com/the-djmaze/snappymail/issues/1691',
+		URL     = 'https://github.com/nextgen-networks/snappymail/issues/1691',
 		VERSION = '0.2',
 		RELEASE = '2024-09-20',
 		REQUIRED = '2.36.1',
diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
index 5c2ab7662..7389b8bcf 100644
--- a/plugins/nextcloud/js/composer.js
+++ b/plugins/nextcloud/js/composer.js
@@ -35,7 +35,7 @@
 					});
 					if (urls.length) {
 						// TODO: other editors and text/plain
-						// https://github.com/the-djmaze/snappymail/issues/981
+						// https://github.com/nextgen-networks/snappymail/issues/981
 						view.oEditor.editor.squire.insertHTML(urls.join("<br>"));
 					}
 				});
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index f5154b745..184411493 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -27,7 +27,7 @@
 				}
 			}
 /*
-			// https://github.com/the-djmaze/snappymail/issues/592
+			// https://github.com/nextgen-networks/snappymail/issues/592
 			if (cfg.CalDAV) {
 				const attachmentsPlace = template.content.querySelector('.attachmentsPlace');
 				attachmentsPlace.after(Element.fromHTML(`
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index 24aa1f226..cc7129406 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -113,7 +113,7 @@ const
 				}
 				elemList.push(elem);
 			}
-			// https://github.com/the-djmaze/snappymail/issues/1177
+			// https://github.com/nextgen-networks/snappymail/issues/1177
 //			elemList.sort((a, b) => a.isFile != b.isFile ? (a.isFile ? 1 : -1) : a.name.localeCompare(b.name));
 			return Promise.resolve(elemList);
 		});
@@ -122,7 +122,7 @@ const
 	buildTree = (view, parent, items, path) => {
 		if (items.length) {
 			try {
-				// https://github.com/the-djmaze/snappymail/issues/1109
+				// https://github.com/nextgen-networks/snappymail/issues/1109
 				let collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
 				items.sort((a, b) => collator.compare(a.name, b.name));
 			} catch (e) {
diff --git a/plugins/search-filters/index.php b/plugins/search-filters/index.php
index 090f31141..bf4fbc16e 100644
--- a/plugins/search-filters/index.php
+++ b/plugins/search-filters/index.php
@@ -5,7 +5,7 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public const
 		NAME = 'Search Filters',
 		AUTHOR = 'AbdoBnHesham',
-		URL    = 'https://github.com/the-djmaze/snappymail/pull/1673',
+		URL    = 'https://github.com/nextgen-networks/snappymail/pull/1673',
 		VERSION = '0.2',
 		RELEASE = '2024-06-28',
 		REQUIRED = '2.36.3',
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index aa71747c2..24b3be045 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -25,7 +25,7 @@
 		}
 	});
 
-	// https://github.com/the-djmaze/snappymail/issues/349
+	// https://github.com/nextgen-networks/snappymail/issues/349
 	addEventListener('sm-show-screen', e => {
 		if (!e.detail.startsWith('settings') && rl.settings.get('SetupTwoFactor')) {
 			e.preventDefault();
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index 74bb1cc25..f27f408b1 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -41,9 +41,9 @@ abstract class DateTimeHelper
 			return 0;
 		}
 
-		// Strip invalid data after zone, https://github.com/the-djmaze/snappymail/issues/1554
+		// Strip invalid data after zone, https://github.com/nextgen-networks/snappymail/issues/1554
 		$sDateTime = \preg_replace('/\s+\([a-zA-Z0-9]+\)$/', '', $sDateTime);
-		// https://github.com/the-djmaze/snappymail/issues/1694#issuecomment-2270983942
+		// https://github.com/nextgen-networks/snappymail/issues/1694#issuecomment-2270983942
 		// Strip day-of-week
 		$sDateTime = \preg_replace('/^[^,]+,/', '', $sDateTime);
 		// Add optional seconds
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index bf3dc8981..f3053058f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -219,7 +219,7 @@ class BodyStructure implements \JsonSerializable
 		/**
 		 * Still no text found?
 		 * Look in attachments as it could be an X-Mms-Message
-		 * https://github.com/the-djmaze/snappymail/issues/1294
+		 * https://github.com/nextgen-networks/snappymail/issues/1294
 		 */
 		if (!$aParts) {
 			$gParts = $this->SearchByCallback(fn($oItem) => $oItem->isText());
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index 7210e6add..2e13eb923 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -83,7 +83,7 @@ trait Folders
 //		$this->FolderCheck();
 
 		// Will this workaround solve Dovecot issue?
-		// https://github.com/the-djmaze/snappymail/issues/124
+		// https://github.com/nextgen-networks/snappymail/issues/124
 		try {
 			$this->FolderRename($sFolderName, "{$sFolderName}-dummy");
 			$this->FolderRename("{$sFolderName}-dummy", $sFolderName);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
index 6f8e74db9..d0e81d675 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
@@ -315,7 +315,7 @@ class SearchCriterias
 							}
 							break;
 
-						// https://github.com/the-djmaze/snappymail/issues/625
+						// https://github.com/nextgen-networks/snappymail/issues/625
 						case 'READ':
 						case 'UNREAD':
 							$aCriteriasResult[] = \str_replace('READ', 'SEEN', $sName);
@@ -369,7 +369,7 @@ class SearchCriterias
 
 	public static function escapeSearchString(\MailSo\Imap\ImapClient $oImapClient, string $sSearch) : string
 	{
-		// https://github.com/the-djmaze/snappymail/issues/836
+		// https://github.com/nextgen-networks/snappymail/issues/836
 //		return $oImapClient->EscapeString($sSearch);
 //		return \MailSo\Base\Utils::IsAscii($sSearch) || $oImapClient->hasCapability('QQMail'))
 		return (\MailSo\Base\Utils::IsAscii($sSearch) || !$oImapClient->hasCapability('LITERAL+'))
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
index 34a257717..1155a1cda 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
@@ -39,8 +39,8 @@ trait ResponseParser
 
 	/**
 	 * A bug in the parser converts folder names that start with '[' into arrays.
-	 * https://github.com/the-djmaze/snappymail/issues/1
-	 * https://github.com/the-djmaze/snappymail/issues/70
+	 * https://github.com/nextgen-networks/snappymail/issues/1
+	 * https://github.com/nextgen-networks/snappymail/issues/70
 	 * The fix RainLoop implemented isn't correct either.
 	 * This one should as RFC 3501 only mentions:
 	 *
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
index 1fcba3997..5d2b08ece 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
@@ -123,7 +123,7 @@ trait Status
 				if (\is_string($value)) {
 					$this->MAILBOXID = \base64_encode($value);
 				} else {
-					// Cyrus bug https://github.com/the-djmaze/snappymail/issues/1640
+					// Cyrus bug https://github.com/nextgen-networks/snappymail/issues/1640
 					\error_log("{$this->FullName} invalid MAILBOXID value. Disable the OBJECTID capability.");
 				}
 			} else {
@@ -172,7 +172,7 @@ trait Status
 							$oResponse->ResponseList[3][$i+1]
 						);
 					} else {
-						// https://github.com/the-djmaze/snappymail/issues/1640
+						// https://github.com/nextgen-networks/snappymail/issues/1640
 						\error_log("{$this->FullName} STATUS missing value for {$oResponse->ResponseList[3][$i]}");
 					}
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index fa8c9cf2e..290d7d289 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -249,7 +249,7 @@ class Message implements \JsonSerializable
 						$oMessage->sSpamResult = "{$value[1]} / {$required[1]}";
 					}
 				}
-				// https://github.com/the-djmaze/snappymail/issues/1228
+				// https://github.com/nextgen-networks/snappymail/issues/1228
 				else if (\preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $spam, $value)
 				  || \preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $oHeaders->ValueByName(MimeHeader::X_SPAM_INFO), $value)
 				) {
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
index 3da957592..6ea17527a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
@@ -41,7 +41,7 @@ class ConnectSettings implements \JsonSerializable
 	public bool $lowerLogin = true;
 	public string $stripLogin = '';
 	public array $SASLMechanisms = [
-		// https://github.com/the-djmaze/snappymail/issues/182
+		// https://github.com/nextgen-networks/snappymail/issues/182
 		'SCRAM-SHA3-512',
 		'SCRAM-SHA-512',
 		'SCRAM-SHA-256',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index a0a1cd595..f2236e838 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -187,7 +187,7 @@ class SieveClient extends \MailSo\Net\NetClient
 			try {
 				$this->sendRequestWithCheck('LOGOUT');
 			} catch (\Throwable $e) {
-				// https://github.com/the-djmaze/snappymail/issues/1455
+				// https://github.com/nextgen-networks/snappymail/issues/1455
 				$this->writeLogException($e, \LOG_WARNING, false);
 			}
 			$this->bIsLoggined = false;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
index de25b99cd..27e9a8484 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
@@ -24,7 +24,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 	public bool
 		$setSender = false,
 		$usePhpMail = false,
-		// https://github.com/the-djmaze/snappymail/issues/1038
+		// https://github.com/nextgen-networks/snappymail/issues/1038
 		$authPlainLine = false,
 		$viewErrors = false;
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 4ca6cf8e2..08ec748d3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -162,7 +162,7 @@ class SmtpClient extends \MailSo\Net\NetClient
 		$SASL = \SnappyMail\SASL::factory($type);
 
 		if ($this->Settings->authPlainLine && $SASL instanceof \SnappyMail\SASL\Plain) {
-			// https://github.com/the-djmaze/snappymail/issues/1038
+			// https://github.com/nextgen-networks/snappymail/issues/1038
 			try
 			{
 				$sRequest = $SASL->authenticate($sLogin, $sPassword);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 4e78236e9..121cff1cd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -337,7 +337,7 @@ trait Accounts
 	 */
 	public function DoAccountsAndIdentities(): array
 	{
-		// https://github.com/the-djmaze/snappymail/issues/571
+		// https://github.com/nextgen-networks/snappymail/issues/571
 		return $this->DefaultResponse(array(
 			'Accounts' => \array_values(\array_map(function($value){
 					return [
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index a88d37116..4c25151d5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -66,7 +66,7 @@ trait Folders
 					}
 				}
 			} catch (\Throwable $e) {
-				// https://github.com/the-djmaze/snappymail/issues/1438
+				// https://github.com/nextgen-networks/snappymail/issues/1438
 				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
 				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
@@ -78,7 +78,7 @@ trait Folders
 					}
 				}
 			} catch (\Throwable $e) {
-				// https://github.com/the-djmaze/snappymail/issues/1438
+				// https://github.com/nextgen-networks/snappymail/issues/1438
 				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
 				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 8b04bbdad..540d2c4ee 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -1151,7 +1151,7 @@ trait Messages
 			}
 		}
 /*
-		// OpenPGP https://github.com/the-djmaze/snappymail/issues/1587
+		// OpenPGP https://github.com/nextgen-networks/snappymail/issues/1587
 		$sPublicKey = $this->GetActionParam('publicKey', '');
 		if ($sPublicKey) {
 			$oMessage->Attachments()->append(
@@ -1199,7 +1199,7 @@ trait Messages
 		if ($sFingerprint) {
 			$GPG = $this->GnuPG();
 /*
-			// https://github.com/the-djmaze/snappymail/issues/1587
+			// https://github.com/nextgen-networks/snappymail/issues/1587
 			if ($this->GetActionParam('attachPublicKey', false)) {
 				$sPublicKey = $GPG->export($sFingerprint);
 				$oMessage->Attachments()->append(
@@ -1269,7 +1269,7 @@ trait Messages
 				}
 			}
 /*
-			// https://github.com/the-djmaze/snappymail/issues/1587
+			// https://github.com/nextgen-networks/snappymail/issues/1587
 			if ($sCertificate && $this->GetActionParam('attachCertificate', false)) {
 				$oMessage->Attachments()->append(
 					new \MailSo\Mime\Attachment(
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index ef73f9c7f..161dbc75a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -125,7 +125,7 @@ trait Raw
 			if (!\is_resource($rResource)) {
 				return false;
 			}
-			// https://github.com/the-djmaze/snappymail/issues/144
+			// https://github.com/nextgen-networks/snappymail/issues/144
 			if ('.pdf' === \substr($sFileNameIn,-4)) {
 				$sContentTypeOut = 'application/pdf'; // application/octet-stream
 			} else {
@@ -174,7 +174,7 @@ trait Raw
 					$sFileName = $self->clearFileName($sFileName, $sContentType, $sMimeIndex);
 
 					if ('.pdf' === \substr($sFileName, -4)) {
-						// https://github.com/the-djmaze/snappymail/issues/144
+						// https://github.com/nextgen-networks/snappymail/issues/144
 						$sContentType = 'application/pdf';
 					} else {
 						$sContentType = $sContentTypeIn
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index be26a590e..0179eb587 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -259,7 +259,7 @@ trait UserAuth
 			if ($aData) {
 				/**
 				 * Server side control/kickout of logged in sessions
-				 * https://github.com/the-djmaze/snappymail/issues/151
+				 * https://github.com/nextgen-networks/snappymail/issues/151
 				 */
 				$sToken = Utils::GetSessionToken(false);
 				if (!$sToken) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
index 8de393fe7..6ddab4af5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
@@ -65,7 +65,7 @@ abstract class Base
 			if ($oSettings->sslCa) {
 				$options[\PDO::MYSQL_ATTR_SSL_CA] = $oSettings->sslCa;
 			}
-			// PHP 8.0 https://github.com/the-djmaze/snappymail/issues/1205
+			// PHP 8.0 https://github.com/nextgen-networks/snappymail/issues/1205
 			if (\defined('PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT')) {
 				$options[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $oSettings->sslVerify;
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 52104cf80..0e8694e9f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -136,7 +136,7 @@ abstract class Service
 		}
 
 		if ($bIndex) {
-			// https://github.com/the-djmaze/snappymail/issues/1024
+			// https://github.com/nextgen-networks/snappymail/issues/1024
 			$oHttp->ServerNoCache();
 
 			if (!$bAdmin) {
@@ -195,7 +195,7 @@ abstract class Service
 				))
 			);
 
-			// https://github.com/the-djmaze/snappymail/issues/1024
+			// https://github.com/nextgen-networks/snappymail/issues/1024
 //			$oActions->verifyCacheByKey($sCacheFileName);
 
 			if ($oConfig->Get('cache', 'system_data', true)) {
@@ -237,7 +237,7 @@ abstract class Service
 			$sScriptHash = 'sha256-'.\base64_encode(\hash('sha256', $script[1], true));
 			static::setCSP(null, $sScriptHash);
 */
-			// https://github.com/the-djmaze/snappymail/issues/1024
+			// https://github.com/nextgen-networks/snappymail/issues/1024
 //			$oActions->cacheByKey($sCacheFileName);
 
 			echo $sResult;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index c72d127f0..2a23ab05d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -125,7 +125,7 @@ class Utils
 		return self::WebPath() . 'snappymail/v/' . APP_VERSION . '/';
 		/**
 		 * TODO: solve this to support other paths.
-		 * https://github.com/the-djmaze/snappymail/issues/685
+		 * https://github.com/nextgen-networks/snappymail/issues/685
 		 */
 //		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
index ebe056ae1..cefe292d1 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
@@ -118,7 +118,7 @@ class Cookies
 		static::init();
 		$sPath = static::$DefaultPath;
 		$sPath = $sPath && \strlen($sPath) ? $sPath : '/';
-		// https://github.com/the-djmaze/snappymail/issues/451
+		// https://github.com/nextgen-networks/snappymail/issues/451
 		// The 4K browser limit is for the entire cookie, including name, value, expiry date etc.
 		$iMaxSize = 4000 - \strlen($sPath . $sName);
 /*
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
index 122d51ae6..eee9cd46d 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
@@ -79,7 +79,7 @@ abstract class Base
 		$gpgconf = static::findBinary('gpgconf');
 		if ($gpgconf) {
 			$cmd = $gpgconf . ' --kill gpg-agent';
-			// https://github.com/the-djmaze/snappymail/issues/1560#issuecomment-2144817883
+			// https://github.com/nextgen-networks/snappymail/issues/1560#issuecomment-2144817883
 //			if (\version_compare($this->version, '2.4.0', '<')) {
 				$cmd .= ' ' . \escapeshellarg($this->options['homedir']);
 //			}
@@ -402,7 +402,7 @@ abstract class Base
 	protected function setInput(&$input) : void
 	{
 		if (\is_resource($input)) {
-			// https://github.com/the-djmaze/snappymail/issues/331
+			// https://github.com/nextgen-networks/snappymail/issues/331
 			// $meta['stream_type'] == MEMORY or $meta['wrapper_data'] == MailSo\Base\StreamWrappers\Literal
 			$meta = \stream_get_meta_data($input);
 			if (!\in_array($meta['stream_type'], ['STDIO', 'TEMP'])) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
index f3921112f..46cb8b7ec 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
@@ -78,7 +78,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 
 	/**
 	 * TODO: parse result
-	 * https://github.com/the-djmaze/snappymail/issues/89
+	 * https://github.com/nextgen-networks/snappymail/issues/89
 	 */
 	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
@@ -137,7 +137,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 */
 	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
 		return false;
 	}
 
@@ -146,7 +146,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 */
 	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
 		return false;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
index bc66c7291..a81631bc6 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
@@ -65,7 +65,7 @@ class SMIME extends Base
 
 	/**
 	 * TODO: parse result
-	 * https://github.com/the-djmaze/snappymail/issues/89
+	 * https://github.com/nextgen-networks/snappymail/issues/89
 	 */
 	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
@@ -134,7 +134,7 @@ class SMIME extends Base
 	 */
 	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
 		return false;
 	}
 
@@ -143,7 +143,7 @@ class SMIME extends Base
 	 */
 	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
 		return false;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
index bf514fa20..71f841725 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
@@ -28,7 +28,7 @@ class IMagick extends \Imagick implements \SnappyMail\Image
 
 	public static function createFromStream($fp)
 	{
-		// https://github.com/the-djmaze/snappymail/issues/1201
+		// https://github.com/nextgen-networks/snappymail/issues/1201
 		$data = \stream_get_contents($fp);
 		return static::createFromString($data);
 /*
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
index e6d25e6bd..9a2c81721 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
@@ -104,9 +104,9 @@ abstract class Integrity
 			'json'     => function_exists('json_decode'),
 			'libxml'   => function_exists('libxml_use_internal_errors'),
 			'dom'      => class_exists('DOMDocument'),
-			// https://github.com/the-djmaze/snappymail/issues/1392
+			// https://github.com/nextgen-networks/snappymail/issues/1392
 			'fileinfo' => extension_loaded('fileinfo')
-			// https://github.com/the-djmaze/snappymail/issues/392
+			// https://github.com/nextgen-networks/snappymail/issues/392
 		//	'phar'     => class_exists('PharData')
 		);
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
index 2f0441fcb..a32f90dc8 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
@@ -15,7 +15,7 @@ class Login extends \SnappyMail\SASL
 		?string $challenge = null) : string
 	{
 		// $challenge should be 'VXNlcm5hbWU6', but broken on some systems
-		// See https://github.com/the-djmaze/snappymail/issues/693
+		// See https://github.com/nextgen-networks/snappymail/issues/693
 		if ($challenge && !\str_starts_with($this->decode($challenge), 'Username:')) {
 			throw new \Exception("Invalid response: {$this->decode($challenge)}");
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
index 8091c155a..7722cefb8 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
@@ -21,7 +21,7 @@ class Scram extends \SnappyMail\SASL
 	function __construct(string $algo)
 	{
 		if (\stripos($algo, '-PLUS')) {
-			// https://github.com/the-djmaze/snappymail/issues/182
+			// https://github.com/nextgen-networks/snappymail/issues/182
 			throw new \Exception("SASL SCRAM channel binding unsupported: {$algo}");
 		}
 		$algo = \str_replace('sha-', 'sha', \strtolower($algo));
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index b83ea9345..0a8626baa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -40,9 +40,9 @@
 						<br />
 					</span>
 					<br />
-					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
+					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
 					<a class="btn" data-bind="visible: coreUpdatable, click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
-					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
 				</div>
 				<div data-bind="visible: 'up-to-date' === statusType()">
 					<i style="color: green">✔</i>
@@ -78,7 +78,7 @@
 			<h3>PHP</h3>
 			<div data-bind="hidden: php64" class="alert">
 				<i class="fontastic" style="color:red">⚠</i>
-				PHP is running in 32bit mode. <a href="https://github.com/the-djmaze/snappymail/issues/830#issuecomment-1372112793">read here</a>
+				PHP is running in 32bit mode. <a href="https://github.com/nextgen-networks/snappymail/issues/830#issuecomment-1372112793">read here</a>
 			</div>
 
 			<table class="table table-hover table-bordered"><thead><tr>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index e31f81108..e5b68f2bd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -9,8 +9,8 @@
 	<div class="alert alert-error span8" style="margin-top: 10px;">
 		<h4 data-i18n="TAB_GENERAL/ALERT_WARNING"></h4>
 		<div data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></div>
-		<a href="https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#secure-data-folder"
-			target="_blank"><strong>https://github.com/the-djmaze/snappymail/wiki/Installation-instructions</strong></a>
+		<a href="https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions#secure-data-folder"
+			target="_blank"><strong>https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions</strong></a>
 	</div>
 </div>
 <div class="form-horizontal">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index b78891e18..86780f5c7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -93,7 +93,7 @@
 
 				<h4>
 					<span data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></span>
-					<a style="margin-left:0.5em" href="https://github.com/the-djmaze/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
+					<a style="margin-left:0.5em" href="https://github.com/nextgen-networks/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
 				</h4>
 
 				<div data-bind="foreach: imapCapabilities" style="columns: 16em auto">
diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
index 4159a4a2d..9f6a4a39c 100644
--- a/snappymail/v/0.0.0/cpanel.php
+++ b/snappymail/v/0.0.0/cpanel.php
@@ -1,6 +1,6 @@
 <?php
 
-// cPanel https://github.com/the-djmaze/snappymail/issues/697
+// cPanel https://github.com/nextgen-networks/snappymail/issues/697
 if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-cpanel')) {
 	$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
 	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 947d7a800..5f17eb322 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -128,7 +128,7 @@ if (isset($_SERVER['HTTPS']) && !headers_sent()) {
 	header('Strict-Transport-Security: max-age=31536000');
 }
 
-// cPanel https://github.com/the-djmaze/snappymail/issues/697
+// cPanel https://github.com/nextgen-networks/snappymail/issues/697
 if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
 	require __DIR__ . '/cpanel.php';
 }

From 60696d03fd3b15a16257794314adc4be0f066f02 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 20 Feb 2026 11:43:13 +0000
Subject: [PATCH 16/17] Update repository URLs to nextgen-networks while
 preserving deep links

Replaced bare references to the-djmaze/snappymail with nextgen-networks/snappymail/
and updated .git URLs to the new organization.

Per user request:
- README files are excluded.
- URLs with a trailing slash (e.g. issues, pull requests, releases) are
  left pointing to the original repository to preserve historical context.
- Bare web URLs now include the requested trailing slash.
- Existing nextgen-networks bare URLs were updated to include the trailing slash.

Co-authored-by: nextgen-networks <21206978+nextgen-networks@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md          |    2 +-
 CHANGELOG.md                                  | 1124 ++++++++---------
 build/deb.php                                 |    2 +-
 dev/Common/Html.js                            |   16 +-
 dev/Common/UtilsUser.js                       |    4 +-
 dev/Component/EmailAddresses.js               |    2 +-
 dev/External/SquireUI.js                      |    6 +-
 dev/Model/FolderCollection.js                 |    4 +-
 dev/Remote/AbstractFetch.js                   |    2 +-
 dev/Settings/User/Security.js                 |    2 +-
 dev/Stores/Theme.js                           |    2 +-
 dev/Stores/User/Messagelist.js                |    2 +-
 dev/Styles/Main.less                          |    2 +-
 dev/Styles/User/FolderList.less               |    2 +-
 dev/View/Popup/Compose.js                     |    2 +-
 dev/View/Popup/Domain.js                      |    2 +-
 examples/eml/tnef.eml                         |    2 +-
 integrations/cloudron/Dockerfile              |    2 +-
 integrations/nextcloud/snappymail/INSTALL     |    2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |   16 +-
 .../nextcloud/snappymail/css/embed.css        |    4 +-
 .../snappymail/lib/Migration/InstallStep.php  |    4 +-
 .../snappymail/lib/Util/SnappyMailHelper.php  |    4 +-
 integrations/owncloud/snappymail/CHANGELOG.md |  296 ++---
 .../owncloud/snappymail/appinfo/info.xml      |   12 +-
 .../owncloud/snappymail/css/embed.css         |    4 +-
 .../snappymail/lib/Util/SnappyMailHelper.php  |    4 +-
 integrations/virtualmin/snappymail.pl         |    2 +-
 package.json                                  |    2 +-
 plugins/attachments-force-open/index.php      |    2 +-
 plugins/auto-domain-grab/index.php            |    2 +-
 plugins/avatars/index.php                     |    2 +-
 plugins/compact-composer/index.php            |    2 +-
 .../compact-composer/js/CompactComposer.js    |    6 +-
 plugins/demo-account/index.php                |    2 +-
 .../ldap-mail-accounts/LdapMailAccounts.php   |    4 +-
 plugins/ldap-mail-accounts/index.php          |    2 +-
 plugins/login-cpanel/index.php                |    2 +-
 plugins/login-gmail/index.php                 |    2 +-
 plugins/login-o365/index.php                  |    2 +-
 plugins/login-remote/index.php                |    2 +-
 plugins/login-virtuser/index.php              |    2 +-
 plugins/nextcloud/js/composer.js              |    2 +-
 plugins/nextcloud/js/message.js               |    2 +-
 plugins/nextcloud/js/webdav.js                |    4 +-
 plugins/search-filters/index.php              |    2 +-
 .../two-factor-auth/js/TwoFactorAuthLogin.js  |    2 +-
 .../libraries/MailSo/Base/DateTimeHelper.php  |    4 +-
 .../libraries/MailSo/Imap/BodyStructure.php   |    2 +-
 .../MailSo/Imap/Commands/Folders.php          |    2 +-
 .../libraries/MailSo/Imap/SearchCriterias.php |    4 +-
 .../MailSo/Imap/Traits/ResponseParser.php     |    4 +-
 .../libraries/MailSo/Imap/Traits/Status.php   |    4 +-
 .../app/libraries/MailSo/Mail/Message.php     |    2 +-
 .../libraries/MailSo/Net/ConnectSettings.php  |    2 +-
 .../libraries/MailSo/Sieve/SieveClient.php    |    2 +-
 .../app/libraries/MailSo/Smtp/Settings.php    |    2 +-
 .../app/libraries/MailSo/Smtp/SmtpClient.php  |    2 +-
 .../libraries/RainLoop/Actions/Accounts.php   |    2 +-
 .../libraries/RainLoop/Actions/Folders.php    |    4 +-
 .../libraries/RainLoop/Actions/Messages.php   |    6 +-
 .../app/libraries/RainLoop/Actions/Raw.php    |    4 +-
 .../libraries/RainLoop/Actions/UserAuth.php   |    2 +-
 .../0.0.0/app/libraries/RainLoop/Pdo/Base.php |    2 +-
 .../0.0.0/app/libraries/RainLoop/Service.php  |    6 +-
 .../v/0.0.0/app/libraries/RainLoop/Utils.php  |    2 +-
 .../app/libraries/snappymail/cookies.php      |    2 +-
 .../app/libraries/snappymail/gpg/base.php     |    4 +-
 .../app/libraries/snappymail/gpg/pgp.php      |    6 +-
 .../app/libraries/snappymail/gpg/smime.php    |    6 +-
 .../libraries/snappymail/image/imagick.php    |    2 +-
 .../app/libraries/snappymail/integrity.php    |    4 +-
 .../app/libraries/snappymail/sasl/login.php   |    2 +-
 .../app/libraries/snappymail/sasl/scram.php   |    2 +-
 .../Views/Admin/AdminSettingsAbout.html       |    6 +-
 .../Views/Admin/AdminSettingsGeneral.html     |    4 +-
 .../templates/Views/Admin/PopupsDomain.html   |    2 +-
 snappymail/v/0.0.0/cpanel.php                 |    2 +-
 snappymail/v/0.0.0/include.php                |    2 +-
 79 files changed, 838 insertions(+), 838 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9c16abc7e..998692964 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
 - Mode: [e.g. standalone, nextcloud, cyberpanel, docker]
 
 **Debug/logging information**
-[Read here how to log](https://github.com/nextgen-networks/snappymail/wiki/FAQ#how-do-i-enable-logging)
+[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)
 - [ ] I've placed them here (few lines) or as attachments (many lines)
 
 **Additional context**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d11b12ce..d31a1b771 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## 2.38.2 – 2024-10-09
 ### Fixed
 - error '$index is not defined' in Settings > Accounts
-  [#1797](https://github.com/nextgen-networks/snappymail/issues/1797)
+  [#1797](https://github.com/the-djmaze/snappymail/issues/1797)
 
 
 ## 2.38.1 – 2024-10-08
@@ -9,15 +9,15 @@
 ### Added
 - Admin - Extensions search filter
 - Options to unset current font family and size
-  [#1726](https://github.com/nextgen-networks/snappymail/issues/1726)
+  [#1726](https://github.com/the-djmaze/snappymail/issues/1726)
 - Option to allow insecure cryptkey
-  [#1746](https://github.com/nextgen-networks/snappymail/issues/1746)
+  [#1746](https://github.com/the-djmaze/snappymail/issues/1746)
 - Save vCard FN property
-  [#1761](https://github.com/nextgen-networks/snappymail/issues/1761)
+  [#1761](https://github.com/the-djmaze/snappymail/issues/1761)
 - Docker Nginx should listen on IPv6 addresses in addition to IPv4
-  [#1770](https://github.com/nextgen-networks/snappymail/issues/1770)
+  [#1770](https://github.com/the-djmaze/snappymail/issues/1770)
 - Full-screen Message View on Double-Click
-  [#1787](https://github.com/nextgen-networks/snappymail/issues/1787)
+  [#1787](https://github.com/the-djmaze/snappymail/issues/1787)
 
 ### Changed
 - Use the custom Squire as submodule vendors/squire2
@@ -25,11 +25,11 @@
 - Keep 1 space between HTML elements in compressed templates
 - Squire: sanitizeToDOMFragment now uses cleanHTML()
 - Squire: improved handling of BR elements
-  [#1389](https://github.com/nextgen-networks/snappymail/issues/1389)
+  [#1389](https://github.com/the-djmaze/snappymail/issues/1389)
 - Nextcloud border-radius by @gnilebein
-  [#1790](https://github.com/nextgen-networks/snappymail/pull/1790)
+  [#1790](https://github.com/the-djmaze/snappymail/pull/1790)
 - Compose window sentFolder handling for
-  [#1793](https://github.com/nextgen-networks/snappymail/pull/1793)
+  [#1793](https://github.com/the-djmaze/snappymail/pull/1793)
 - Update Portuguese by @ner00
 - Update Polish by @tinola
 - Update French by @hguilbert
@@ -40,18 +40,18 @@
 - Composer dialog "from" triangle button wrong position due to font changes
 - Admin - Config `search` should be ko.observable() not ko.observableArray()
 - Squire: paste images
-  [#1389](https://github.com/nextgen-networks/snappymail/issues/1389)
+  [#1389](https://github.com/the-djmaze/snappymail/issues/1389)
 - Domain whitelist failures on login
-  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
+  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
 - Sieve parse errors
 - Sieve support `index` was not optional for
-  [#1709](https://github.com/nextgen-networks/snappymail/issues/1709)
+  [#1709](https://github.com/the-djmaze/snappymail/issues/1709)
 - Pagination problem for large mailbox after 2.36.1
-  [#1716](https://github.com/nextgen-networks/snappymail/issues/1716)
+  [#1716](https://github.com/the-djmaze/snappymail/issues/1716)
 - Undefined constant "LOG_ERROR"
-  [#1754](https://github.com/nextgen-networks/snappymail/issues/1754)
+  [#1754](https://github.com/the-djmaze/snappymail/issues/1754)
 - Search Filter Capital "B" not working
-  [#1780](https://github.com/nextgen-networks/snappymail/issues/1780)
+  [#1780](https://github.com/the-djmaze/snappymail/issues/1780)
 - PHP 8.4: Implicitly nullable parameter declarations deprecated
 
 
@@ -59,11 +59,11 @@
 
 ### Added
 - Remove `tel:` links when converting HTML to plain
-  [#1724](https://github.com/nextgen-networks/snappymail/issues/1724)
+  [#1724](https://github.com/the-djmaze/snappymail/issues/1724)
 - Convert HTML to Markdown instead of plain, by using [Turndown](https://github.com/mixmark-io/turndown)
-  [#1604](https://github.com/nextgen-networks/snappymail/issues/1604)
+  [#1604](https://github.com/the-djmaze/snappymail/issues/1604)
 - Check HTMLInputElement.validity() for
-  [#1733](https://github.com/nextgen-networks/snappymail/issues/1733)
+  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
 
 ### Changed
 - Use a modified [Squire 2.3.2](https://github.com/the-djmaze/Squire/commits/snappymail/)
@@ -72,13 +72,13 @@
 
 ### Fixed
 - mXSS exploit found by SonarSource
-  [CVE-2024-45800](https://github.com/nextgen-networks/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
+  [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
 - Call to a member function Email() on null
-  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
+  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
 - IMAP capabilities via IMAP Proxy
-  [#1725](https://github.com/nextgen-networks/snappymail/issues/1725)
+  [#1725](https://github.com/the-djmaze/snappymail/issues/1725)
 - Messages on page setting is not validated against 999 max
-  [#1733](https://github.com/nextgen-networks/snappymail/issues/1733)
+  [#1733](https://github.com/the-djmaze/snappymail/issues/1733)
 
 
 ## 2.37.3 – 2024-08-27
@@ -87,38 +87,38 @@
 - Mark images with width=1 as tracking pixel
 - Show warning in Admin -> About when PHP runs in 32bit
 - Edit ACL rules
-  [#157](https://github.com/nextgen-networks/snappymail/issues/157)
+  [#157](https://github.com/the-djmaze/snappymail/issues/157)
 - Show GnuPG version for
-  [#1560](https://github.com/nextgen-networks/snappymail/issues/1560)
+  [#1560](https://github.com/the-djmaze/snappymail/issues/1560)
 - Make sure only scalar values are allowed in $_ENV for
-  [#1560](https://github.com/nextgen-networks/snappymail/issues/1560)
+  [#1560](https://github.com/the-djmaze/snappymail/issues/1560)
 - Change minimum new mail check interval
-  [#1678](https://github.com/nextgen-networks/snappymail/issues/1678)
+  [#1678](https://github.com/the-djmaze/snappymail/issues/1678)
 - Sieve editor does not support "index" extension
-  [#1709](https://github.com/nextgen-networks/snappymail/issues/1709)
+  [#1709](https://github.com/the-djmaze/snappymail/issues/1709)
 
 ### Changed
 - Improved domain autoconfig interaction
 - MS autodiscover priorities DNS over subdomain
 - Simplify sieve scripts list
-  [#1675](https://github.com/nextgen-networks/snappymail/issues/1675)
+  [#1675](https://github.com/the-djmaze/snappymail/issues/1675)
 - Handling of (token) errors due to
-  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
+  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
 - Sabre/Xml to v4.0.5
 - Update Chinese by @Artoria2e5
 - Update French by @hguilbert
 
 ### Fixed
 - Thread sorting visible after disabling the imap capability
-  [#1574](https://github.com/nextgen-networks/snappymail/issues/1574)
+  [#1574](https://github.com/the-djmaze/snappymail/issues/1574)
 - Creating new message impossible as long as a draft exists?
-  [#1710](https://github.com/nextgen-networks/snappymail/issues/1710)
+  [#1710](https://github.com/the-djmaze/snappymail/issues/1710)
 - InvalidToken error at login
-  [#1706](https://github.com/nextgen-networks/snappymail/issues/1706)
+  [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
 
 ### Nextcloud
 - Force Nextcloud personal language by default
-  [#1428](https://github.com/nextgen-networks/snappymail/issues/1428)
+  [#1428](https://github.com/the-djmaze/snappymail/issues/1428)
 
 
 ## 2.37.2 – 2024-08-13
@@ -132,7 +132,7 @@
 
 ### Nextcloud
 - Failed loading due to Office365 OAuth2 attempt
-  [#1703](https://github.com/nextgen-networks/snappymail/issues/1703)
+  [#1703](https://github.com/the-djmaze/snappymail/issues/1703)
 
 
 ## 2.37.1 – 2024-08-12
@@ -149,15 +149,15 @@
 ### Added
 - JavaScript event `rl-vm-visible`
 - Detailed error message on account switch failure for
-  [#1594](https://github.com/nextgen-networks/snappymail/issues/1594)
+  [#1594](https://github.com/the-djmaze/snappymail/issues/1594)
 - Workarounds for Microsoft OAuth2 (currently requires Apache AcceptPathInfo)
-  [#1645](https://github.com/nextgen-networks/snappymail/issues/1645)
+  [#1645](https://github.com/the-djmaze/snappymail/issues/1645)
 - Support "mark for deletion"
-  [#1657](https://github.com/nextgen-networks/snappymail/issues/1657) by @smsoft-ru
+  [#1657](https://github.com/the-djmaze/snappymail/issues/1657) by @smsoft-ru
 - Invoke "Update Identity" pop up right after login (when not initialized)
-  [#1689](https://github.com/nextgen-networks/snappymail/issues/1689)
+  [#1689](https://github.com/the-djmaze/snappymail/issues/1689)
 - Keyboard shortcut for "Swap default (background) color"
-  [#1690](https://github.com/nextgen-networks/snappymail/issues/1690)
+  [#1690](https://github.com/the-djmaze/snappymail/issues/1690)
 
 ### Changed
 - Updated gulp to v5
@@ -166,7 +166,7 @@
 - Align save button in admin security settings
 - Made registerProtocolHandler('mailto') optional by activating at Settings -> General
 - Improved InvalidToken handling for
-  [#1653](https://github.com/nextgen-networks/snappymail/issues/1653)
+  [#1653](https://github.com/the-djmaze/snappymail/issues/1653)
 - Cleanup localizations
 - Update French by @hguilbert
 - Update German by @tkasch
@@ -177,41 +177,41 @@
 - prevent multiple afterShow() and afterHide() due to `transitionend` on multiple CSS properties
 - Attempt to read property "smimeSigned" on null
 - Refreshing mail list doesn't update current message
-  [#1654](https://github.com/nextgen-networks/snappymail/issues/1654)
+  [#1654](https://github.com/the-djmaze/snappymail/issues/1654)
 - Deletion of CACHE folder causing error
-  [#1660](https://github.com/nextgen-networks/snappymail/issues/1660)
+  [#1660](https://github.com/the-djmaze/snappymail/issues/1660)
 - Multiple line breaks are not displayed
-  [#1666](https://github.com/nextgen-networks/snappymail/issues/1666)
+  [#1666](https://github.com/the-djmaze/snappymail/issues/1666)
 - RainLoop\Exceptions\ClientException::__construct(): Argument #2 ($oPrevious) must be of type ?Throwable, string given
-  [#1686](https://github.com/nextgen-networks/snappymail/issues/1686)
+  [#1686](https://github.com/the-djmaze/snappymail/issues/1686)
 - SpamAssassin Division by zero
-  [#1694](https://github.com/nextgen-networks/snappymail/issues/1694)
+  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
 - Failed to parse RFC 2822 date '6 Jul 2024 16:42:09 +0200'
-  [#1694](https://github.com/nextgen-networks/snappymail/issues/1694)
+  [#1694](https://github.com/the-djmaze/snappymail/issues/1694)
 - Fix capabilities when THREAD is disabled
-  [#1698](https://github.com/nextgen-networks/snappymail/pull/1698) by @akhil1508
+  [#1698](https://github.com/the-djmaze/snappymail/pull/1698) by @akhil1508
 
 ### Nextcloud
 - Failed loading due to incorrect `app_path`
 - Bugfix language detection
 - Allow multi-account in nc with oauth login
-  [#1699](https://github.com/nextgen-networks/snappymail/pull/1699) by @akhil1508
+  [#1699](https://github.com/the-djmaze/snappymail/pull/1699) by @akhil1508
 
 
 ## 2.36.4 – 2024-06-25
 
 ### Added
 - Customize private key passphrase expiration interval
-  [#1545](https://github.com/nextgen-networks/snappymail/discussions/1545)
+  [#1545](https://github.com/the-djmaze/snappymail/discussions/1545)
 - AdvancedSearch support for filtering mails before a given date
-  [#1606](https://github.com/nextgen-networks/snappymail/pull/1606) by @codiflow
+  [#1606](https://github.com/the-djmaze/snappymail/pull/1606) by @codiflow
 - Control valid spam and virus headers
-  [#1607](https://github.com/nextgen-networks/snappymail/issues/1607)
+  [#1607](https://github.com/the-djmaze/snappymail/issues/1607)
 - Remember S/MIME private Key without function
-  [#1611](https://github.com/nextgen-networks/snappymail/issues/1611)
+  [#1611](https://github.com/the-djmaze/snappymail/issues/1611)
 - Resize compose dialog
 - Magnetic theme
-  [#1637](https://github.com/nextgen-networks/snappymail/pull/1637) by @TheCuteFoxxy
+  [#1637](https://github.com/the-djmaze/snappymail/pull/1637) by @TheCuteFoxxy
 
 ### Changed
 - Improved signing messages by allowing to choose between the options
@@ -226,17 +226,17 @@
 - Default language error
 - Undefined $sEmail in DoAdminDomainMatch
 - Handling Autocrypt header failed on `=`
-  [#1608](https://github.com/nextgen-networks/snappymail/issues/1608)
+  [#1608](https://github.com/the-djmaze/snappymail/issues/1608)
 - Blank lines are inserted when editing draft
-  [#1609](https://github.com/nextgen-networks/snappymail/issues/1609)
+  [#1609](https://github.com/the-djmaze/snappymail/issues/1609)
 - Workaround Cyrus MAILBOXID bug (disable OBJECTID capability by default due to impact)
-  [#1640](https://github.com/nextgen-networks/snappymail/issues/1640)
+  [#1640](https://github.com/the-djmaze/snappymail/issues/1640)
 - Workaround HTML with multiple body elements or MIME with multiple text/html
-  [#1641](https://github.com/nextgen-networks/snappymail/issues/1641)
+  [#1641](https://github.com/the-djmaze/snappymail/issues/1641)
 
 ### Nextcloud
 - OIDC stay logged in
-  [#1620](https://github.com/nextgen-networks/snappymail/pull/1620) by @avinash-0007
+  [#1620](https://github.com/the-djmaze/snappymail/pull/1620) by @avinash-0007
 
 
 ## 2.36.3 – 2024-05-27
@@ -246,16 +246,16 @@
 
 ### Fixed
 - Undefined variable $aTokenData
-  [#1567](https://github.com/nextgen-networks/snappymail/issues/1567)
+  [#1567](https://github.com/the-djmaze/snappymail/issues/1567)
 
 
 ## 2.36.2 – 2024-05-26
 
 ### Added
 - "copy to" action in menu's for
-  [#1559](https://github.com/nextgen-networks/snappymail/issues/1559)
+  [#1559](https://github.com/the-djmaze/snappymail/issues/1559)
 - Log signal info for
-  [#1569](https://github.com/nextgen-networks/snappymail/issues/1569)
+  [#1569](https://github.com/the-djmaze/snappymail/issues/1569)
 - OpenPGP.js automatically import backup keys from server
 
 ### Changed
@@ -265,23 +265,23 @@
 
 ### Fixed
 - "Account already exists"
-  [#1561](https://github.com/nextgen-networks/snappymail/issues/1561)
+  [#1561](https://github.com/the-djmaze/snappymail/issues/1561)
 - Properly escape path separator in tar.php file list regex
-  [#1562](https://github.com/nextgen-networks/snappymail/pull/1562) by @sevmonster
+  [#1562](https://github.com/the-djmaze/snappymail/pull/1562) by @sevmonster
 - Prevent mkdir() error
-  [#1565](https://github.com/nextgen-networks/snappymail/issues/1565)
+  [#1565](https://github.com/the-djmaze/snappymail/issues/1565)
 - SCRAM Exception when trying to log in to SMTP
-  [#1575](https://github.com/nextgen-networks/snappymail/issues/1575)
+  [#1575](https://github.com/the-djmaze/snappymail/issues/1575)
 - Error when redirected back to instance after Gmail OAuth
-  [#1580](https://github.com/nextgen-networks/snappymail/issues/1580)
+  [#1580](https://github.com/the-djmaze/snappymail/issues/1580)
 - Uncaught TypeError: hasPublicKeyForEmails(...).then is not a function
-  [#1589](https://github.com/nextgen-networks/snappymail/issues/1589)
+  [#1589](https://github.com/the-djmaze/snappymail/issues/1589)
 - Undefined variable $sFilename
 - GPG/PGP exec() return false handling
 
 ### Nextcloud
 - OIDC login active again
-  [#1572](https://github.com/nextgen-networks/snappymail/pull/1572) by @avinash-0007
+  [#1572](https://github.com/the-djmaze/snappymail/pull/1572) by @avinash-0007
 
 
 ## 2.36.1 – 2024-04-23
@@ -292,7 +292,7 @@
 - Handle RFC 5987 in Content-Disposition header
 - Ignore text/x-amp-html
 - Show SMTP error to user
-  [#1521](https://github.com/nextgen-networks/snappymail/issues/1521)
+  [#1521](https://github.com/the-djmaze/snappymail/issues/1521)
 - OAuth2 for login using gmail (and others)
 
 ### Changed
@@ -315,19 +315,19 @@
 - Content encoding and type detection in JavaScript could fail due to case-sensitivity.
 - Extensions set logger failed
 - GnuPG check open_basedir and if shell_exec is disabled
-  [#1385](https://github.com/nextgen-networks/snappymail/issues/1385)
-  [#1496](https://github.com/nextgen-networks/snappymail/issues/1496)
-  [#1555](https://github.com/nextgen-networks/snappymail/issues/1555)
+  [#1385](https://github.com/the-djmaze/snappymail/issues/1385)
+  [#1496](https://github.com/the-djmaze/snappymail/issues/1496)
+  [#1555](https://github.com/the-djmaze/snappymail/issues/1555)
 - Hide pagination when search result has no messages
 - Prevent mbstring error before setup.php
 - Prevent MessagesPerPage Infinity
-  [#1540](https://github.com/nextgen-networks/snappymail/issues/1540)
+  [#1540](https://github.com/the-djmaze/snappymail/issues/1540)
 - Reseal CryptKey failed
-  [#1543](https://github.com/nextgen-networks/snappymail/issues/1543)
+  [#1543](https://github.com/the-djmaze/snappymail/issues/1543)
 
 ### Nextcloud
 - Add an occ command to set up the login settings
-  [#1552](https://github.com/nextgen-networks/snappymail/issues/1552)
+  [#1552](https://github.com/the-djmaze/snappymail/issues/1552)
 
 
 ## 2.36.0 – 2024-03-18
@@ -336,24 +336,24 @@
 - Allow setting the supported THREAD algorithm
 - Icon to system folders
 - Remove remembered password after 15 minutes of inactivity
-  [#1142](https://github.com/nextgen-networks/snappymail/issues/1142)
+  [#1142](https://github.com/the-djmaze/snappymail/issues/1142)
 - Swap background and text color for unreadable text on dark background
-  [#1486](https://github.com/nextgen-networks/snappymail/issues/1486)
+  [#1486](https://github.com/the-djmaze/snappymail/issues/1486)
 - Generate TOTP code at ?Admin -> Security
-  [#1501](https://github.com/nextgen-networks/snappymail/issues/1501)
+  [#1501](https://github.com/the-djmaze/snappymail/issues/1501)
 - Button to change S/MIME private key passphrase
-  [#1505](https://github.com/nextgen-networks/snappymail/issues/1505)
+  [#1505](https://github.com/the-djmaze/snappymail/issues/1505)
 - Belarusian
-  [#1512](https://github.com/nextgen-networks/snappymail/pull/1512) by @spoooyders
+  [#1512](https://github.com/the-djmaze/snappymail/pull/1512) by @spoooyders
 - Log some domain idn_to_ascii issues
-  [#1513](https://github.com/nextgen-networks/snappymail/issues/1513)
+  [#1513](https://github.com/the-djmaze/snappymail/issues/1513)
 
 ### Changed
 - On folder/mailbox rename, also rename all children instead of reloading all
 - Seal MainAccount CryptKey and on error ask old login passphrase to reseal key.
 - Moved cache drivers outside core into extensions
 - Sieve always allow fileinto INBOX
-  [#1510](https://github.com/nextgen-networks/snappymail/issues/1510)
+  [#1510](https://github.com/the-djmaze/snappymail/issues/1510)
 - Moved application.ini `sieve_auth_plain_initial` to per domain config
 - Languages use rfc5646, by using the shortest ISO 639 code by default
 - Update French by @hguilbert
@@ -364,15 +364,15 @@
 - On folder/mailbox rename, the checkable option was not renamed
 - Sort accounts drag & drop
 - S/MIME encrypted and opaque signed not visible
-  [#1450](https://github.com/nextgen-networks/snappymail/issues/1450)
+  [#1450](https://github.com/the-djmaze/snappymail/issues/1450)
 - Wrong last UID of thread
-  [#1507](https://github.com/nextgen-networks/snappymail/issues/1507)
+  [#1507](https://github.com/the-djmaze/snappymail/issues/1507)
 - Creation of dynamic property SnappyMail\DAV\Client::$HTTP
-  [#1509](https://github.com/nextgen-networks/snappymail/issues/1509)
+  [#1509](https://github.com/the-djmaze/snappymail/issues/1509)
 - "Download as ZIP" fails for messages
-  [#1514](https://github.com/nextgen-networks/snappymail/issues/1514)
+  [#1514](https://github.com/the-djmaze/snappymail/issues/1514)
 - SMTP "Authentication failed" when IMAP uses `shortLogin` and SMTP not
-  [#1517](https://github.com/nextgen-networks/snappymail/issues/1517)
+  [#1517](https://github.com/the-djmaze/snappymail/issues/1517)
 
 
 ## 2.35.4 – 2024-03-16
@@ -388,19 +388,19 @@
 
 ### Fixed
 - Raise JS TypeEroor "toLowerCase" after update
-  [#1491](https://github.com/nextgen-networks/snappymail/issues/1491)
+  [#1491](https://github.com/the-djmaze/snappymail/issues/1491)
 - Call to undefined function shell_exec
-  [#1496](https://github.com/nextgen-networks/snappymail/issues/1496)
+  [#1496](https://github.com/the-djmaze/snappymail/issues/1496)
 - Download attachments as ZIP doesn't work for PGP encrypted mail
-  [#1499](https://github.com/nextgen-networks/snappymail/issues/1499)
+  [#1499](https://github.com/the-djmaze/snappymail/issues/1499)
 - Importing or downloading a PGP public key attachment from a PGP encrypted message doesn't work
-  [#1500](https://github.com/nextgen-networks/snappymail/issues/1500)
+  [#1500](https://github.com/the-djmaze/snappymail/issues/1500)
 - VCard PHP Notice: Undefined index: ENCODING
 
 ### Nextcloud
 - Changed stored password handling
 - Can't login from nextcloud with 2.35.3 bug Nextcloud
-  [#1490](https://github.com/nextgen-networks/snappymail/issues/1490)
+  [#1490](https://github.com/the-djmaze/snappymail/issues/1490)
 
 
 ## 2.35.3 – 2024-03-12
@@ -408,14 +408,14 @@
 ### Added
 - GnuPG can be disabled
 - Missing strings for localization inside identity popup (Cryptography > S/MIME)
-  [#1458](https://github.com/nextgen-networks/snappymail/issues/1458)
+  [#1458](https://github.com/the-djmaze/snappymail/issues/1458)
 - Automatically verify PGP and S/MIME signed messages
 - TNEFDecoder for
-  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
+  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
 - RTF to HTML converter for
-  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
+  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
 - Polyfill for PHP ctype
-  [#1250](https://github.com/nextgen-networks/snappymail/issues/1250)
+  [#1250](https://github.com/the-djmaze/snappymail/issues/1250)
 
 ### Changed
 - `new Error()` to `Error()`
@@ -438,20 +438,20 @@
 - Handling of Internationalized Domain Names in several areas
 - Decrypt error message
 - Stalwart ManageSieve Error 352 when getting Filters
-  [#1455](https://github.com/nextgen-networks/snappymail/issues/1455)
+  [#1455](https://github.com/the-djmaze/snappymail/issues/1455)
 - Nextcloud V25+ theme slightly broken
-  [#1463](https://github.com/nextgen-networks/snappymail/issues/1463)
+  [#1463](https://github.com/the-djmaze/snappymail/issues/1463)
 - PGP decryption fails with "Not armored text"
-  [#1462](https://github.com/nextgen-networks/snappymail/issues/1462)
+  [#1462](https://github.com/the-djmaze/snappymail/issues/1462)
 - AUTH_BASIC falling through as AUTH_BEARER; change AUTH_BEARER to a different value
-  [#1461](https://github.com/nextgen-networks/snappymail/issues/1461)
+  [#1461](https://github.com/the-djmaze/snappymail/issues/1461)
 - SetPassword expects \SnappyMail\SensitiveString
 - Crash on importing corrupt OpenPGP keys
 - Crash on old browsers instead of showing error
 - Ignore popups on logoutReload()
-  [#1467](https://github.com/nextgen-networks/snappymail/issues/1467)
+  [#1467](https://github.com/the-djmaze/snappymail/issues/1467)
 - Custom SASLMechanisms fail in IMAP when the connection is secure
-  [#1484](https://github.com/nextgen-networks/snappymail/pull/1484) by @botsarenthuman
+  [#1484](https://github.com/the-djmaze/snappymail/pull/1484) by @botsarenthuman
 
 
 ## 2.35.2 – 2024-02-27
@@ -459,7 +459,7 @@
 ### Added
 - GnuPG error handling
 - Missing strings for localization inside identity popup (Cryptography > S/MIME)
-  [#1458](https://github.com/nextgen-networks/snappymail/issues/1458)
+  [#1458](https://github.com/the-djmaze/snappymail/issues/1458)
 
 ### Changed
 - Update Portuguese by @ner00
@@ -467,11 +467,11 @@
 ### Fixed
 - Drop support for gnupg PECL extension as it fails with "no passphrase" issues
 - Error 352 when getting Filters
-  [#1455](https://github.com/nextgen-networks/snappymail/issues/1455)
+  [#1455](https://github.com/the-djmaze/snappymail/issues/1455)
 
 ### Nextcloud
 - SetPassword(): Argument #1 must be of type SensitiveString, string given
-  [#1456](https://github.com/nextgen-networks/snappymail/issues/1456)
+  [#1456](https://github.com/the-djmaze/snappymail/issues/1456)
 
 
 ## 2.35.1 – 2024-02-26
@@ -507,7 +507,7 @@
 
 ### Added
 - S/MIME support
-  [#259](https://github.com/nextgen-networks/snappymail/issues/259)
+  [#259](https://github.com/the-djmaze/snappymail/issues/259)
 
 ### Changed
 - Disable IMAP METADATA by default (hardly used)
@@ -522,49 +522,49 @@
 - Sign messages using PGP
 - Check for CONDSTORE or QRESYNC to get the HIGHESTMODSEQ
 - Unable to login on certain IMAP server since 2.34.2
-  [#1438](https://github.com/nextgen-networks/snappymail/issues/1438)
+  [#1438](https://github.com/the-djmaze/snappymail/issues/1438)
 
 ### Nextcloud
 - Save as .eml
-  [#1425](https://github.com/nextgen-networks/snappymail/issues/1425)
+  [#1425](https://github.com/the-djmaze/snappymail/issues/1425)
 
 
 ## 2.34.2 – 2024-02-14
 
 ### Fixed
 - Message was sent but not saved to sent items folder
-  [#1432](https://github.com/nextgen-networks/snappymail/issues/1432)
+  [#1432](https://github.com/the-djmaze/snappymail/issues/1432)
 - Login with scram failed
-  [#1433](https://github.com/nextgen-networks/snappymail/issues/1433)
+  [#1433](https://github.com/the-djmaze/snappymail/issues/1433)
 
 
 ## 2.34.1 – 2024-02-13
 
 ### Added
 - Autocrypt support
-  [#342](https://github.com/nextgen-networks/snappymail/issues/342)
+  [#342](https://github.com/the-djmaze/snappymail/issues/342)
 - Load the mailboxes/folders of all namespaces (other users, global, shared, etc.)
 - Load keys from server into OpenPGP.js
-  [#973](https://github.com/nextgen-networks/snappymail/issues/973)
+  [#973](https://github.com/the-djmaze/snappymail/issues/973)
 - Import PGP Keys from remote key servers
 - Sort Inbox Folders with Unread Messages First
-  [#1427](https://github.com/nextgen-networks/snappymail/issues/1427)
+  [#1427](https://github.com/the-djmaze/snappymail/issues/1427)
 - Define JMAP FolderModel.myRights
 - Identity Management: add identity display name
-  [#1405](https://github.com/nextgen-networks/snappymail/issues/1405)
+  [#1405](https://github.com/the-djmaze/snappymail/issues/1405)
 - Identity Management: add per-identity "sent" folder
-  [#1404](https://github.com/nextgen-networks/snappymail/issues/1404)
+  [#1404](https://github.com/the-djmaze/snappymail/issues/1404)
 - Some support for JSON-LD / Structured Email
-  [#1422](https://github.com/nextgen-networks/snappymail/issues/1422)
+  [#1422](https://github.com/the-djmaze/snappymail/issues/1422)
 - Domain Autoconfig and Microsoft's autodiscover (and also as extension/plugin)
 - View MMS messages that are received via email
-  [#1294](https://github.com/nextgen-networks/snappymail/issues/1294)
+  [#1294](https://github.com/the-djmaze/snappymail/issues/1294)
 - Draft code for S/MIME
-  [#259](https://github.com/nextgen-networks/snappymail/issues/259)
+  [#259](https://github.com/the-djmaze/snappymail/issues/259)
 
 ### Changed
 - Many OpenPGP improvements
-  [#89](https://github.com/nextgen-networks/snappymail/issues/89)
+  [#89](https://github.com/the-djmaze/snappymail/issues/89)
 - Allow CSP connect-src CORS for keys.openpgp.org to directly fetch PGP keys
 - Improved handling of visible folders
 - KnockoutJS Replace some ko.exportSymbol('*') in favour of ko['*']
@@ -572,10 +572,10 @@
 - Simplify generating folderListVisible
 - Drop the bSearchSecretWords param from logger
 - Transparent background for text
-  [#1412](https://github.com/nextgen-networks/snappymail/issues/1412)
+  [#1412](https://github.com/the-djmaze/snappymail/issues/1412)
 - Enable OpenPGP.js by default at install
 - Added folder edit popup for improved IMAP ACL Support
-  [#157](https://github.com/nextgen-networks/snappymail/issues/157)
+  [#157](https://github.com/the-djmaze/snappymail/issues/157)
 - Process all IMAP namespaces
 - Update Polish by @tinola
 - Update Portuguese by @ner00
@@ -583,20 +583,20 @@
 ### Fixed
 - Make time_zone a select list due to PEBKAC
 - Workaround Outlook generated double spacing
-  [#1415](https://github.com/nextgen-networks/snappymail/issues/1415)
+  [#1415](https://github.com/the-djmaze/snappymail/issues/1415)
 - HTML Parser is not picking up the full Unsubscribe URL in the attached text file
-  [#1225](https://github.com/nextgen-networks/snappymail/issues/1225)
+  [#1225](https://github.com/the-djmaze/snappymail/issues/1225)
 - Contacts - it auto "Select All", after entry delete
-  [#1411](https://github.com/nextgen-networks/snappymail/issues/1411)
+  [#1411](https://github.com/the-djmaze/snappymail/issues/1411)
 - Message header parsing issue
-  [#1403](https://github.com/nextgen-networks/snappymail/issues/1403)
+  [#1403](https://github.com/the-djmaze/snappymail/issues/1403)
 - apple-touch-icon should not be transparent
-  [#1408](https://github.com/nextgen-networks/snappymail/issues/1408)
+  [#1408](https://github.com/the-djmaze/snappymail/issues/1408)
 - Creation of dynamic property is deprecated
-  [#1409](https://github.com/nextgen-networks/snappymail/issues/1409)
+  [#1409](https://github.com/the-djmaze/snappymail/issues/1409)
 - Ask/send readReceipt was broken
 - OpenPGP public key can not be removed anymore after importing private key of subkey
-  [#1384](https://github.com/nextgen-networks/snappymail/issues/1384)
+  [#1384](https://github.com/the-djmaze/snappymail/issues/1384)
 - KnockoutJS failed to output text '0'
 - JavaScript friendlySize() failed on 0
 - Workaround Dovecot `PREAUTH [CAPABILITY (null)]` issue
@@ -604,9 +604,9 @@
 
 ### Nextcloud
 - Save multiple as .eml
-  [#1425](https://github.com/nextgen-networks/snappymail/issues/1425)
+  [#1425](https://github.com/the-djmaze/snappymail/issues/1425)
 - Disabled support for Nextcloud OpenID Connect
-  [#1420](https://github.com/nextgen-networks/snappymail/issues/1420)
+  [#1420](https://github.com/the-djmaze/snappymail/issues/1420)
 
 
 ## 2.33.0 – 2024-01-22
@@ -630,18 +630,18 @@
 
 ### Fixed
 - Sorting not supported since 2.32.0
-  [#1373](https://github.com/nextgen-networks/snappymail/issues/1373)
+  [#1373](https://github.com/the-djmaze/snappymail/issues/1373)
 - FILE_ON_SAVING_ERROR is not defined
-  [#1379](https://github.com/nextgen-networks/snappymail/issues/1379)
+  [#1379](https://github.com/the-djmaze/snappymail/issues/1379)
 - Saving EML files with same subject result in only saving latest email
-  [#1381](https://github.com/nextgen-networks/snappymail/issues/1381)
+  [#1381](https://github.com/the-djmaze/snappymail/issues/1381)
 - Some Sieve parser issues
 - Handling of RainLoop Sieve script
 - Sieve rfc5429 RejectCommand and ErejectCommand
 - KnockoutJS title:value was removed, use attr:{title:value}
 - dataBaseUpgrade() always runs on sqlite and pgsql
 - Message was sent but not saved to sent items folder
-  [#1397](https://github.com/nextgen-networks/snappymail/issues/1397)
+  [#1397](https://github.com/the-djmaze/snappymail/issues/1397)
 - DKIM `pass` detection sometimes failed
 
 
@@ -652,22 +652,22 @@
 - MessageListThreadsMap as background task when message_list_limit is set
 - Properly set CACHEDIR.TAG
 - Sending group email to all contact addresses
-  [#1286](https://github.com/nextgen-networks/snappymail/pull/1286) by @rezaei92
+  [#1286](https://github.com/the-djmaze/snappymail/pull/1286) by @rezaei92
 
 ### Changed
 - Default IMAP message_list_limit to 10000
 - DoMessageCopy() return toFolder hash/etag
 - Improved Squire WYSIWYG
 - Sort real attachments and inline attachments for
-  [#1360](https://github.com/nextgen-networks/snappymail/issues/1360)
+  [#1360](https://github.com/the-djmaze/snappymail/issues/1360)
 - Nextcloud Theme fixes and improvements
-  [#1363](https://github.com/nextgen-networks/snappymail/pull/1363) by @hampoelz
+  [#1363](https://github.com/the-djmaze/snappymail/pull/1363) by @hampoelz
 - Improve display of attachments
-  [#1361](https://github.com/nextgen-networks/snappymail/issues/1361)
+  [#1361](https://github.com/the-djmaze/snappymail/issues/1361)
 - Rename messageVisibility to messageVisible
 - All CSS font-size to % instead of px
 - Flip source code view of .eml attachments
-  [#1332](https://github.com/nextgen-networks/snappymail/issues/1332)
+  [#1332](https://github.com/the-djmaze/snappymail/issues/1332)
 
 ### Fixed
 - Folders array_filter(): Argument 1 must be of type array, null given
@@ -676,7 +676,7 @@
 
 ### Nextcloud
 - Improved language handling
-  [#1362](https://github.com/nextgen-networks/snappymail/pull/1362) by @avinash-0007
+  [#1362](https://github.com/the-djmaze/snappymail/pull/1362) by @avinash-0007
 - FilterLanguage had wrong parameter order
 - Use NextcloudV25+ theme by default
 
@@ -694,18 +694,18 @@
 
 ### Fixed
 - Call to undefined method FolderMyRights()
-  [#1344](https://github.com/nextgen-networks/snappymail/issues/1344)
+  [#1344](https://github.com/the-djmaze/snappymail/issues/1344)
 - NO Mailbox does not exist, or must be subscribed to")
-  [#1354](https://github.com/nextgen-networks/snappymail/issues/1354)
+  [#1354](https://github.com/the-djmaze/snappymail/issues/1354)
 - Flag indicators are added to wrong message
-  [#1347](https://github.com/nextgen-networks/snappymail/pull/1347) by @SergeyMosin
+  [#1347](https://github.com/the-djmaze/snappymail/pull/1347) by @SergeyMosin
 - Squire: issue when using the enter key in a reply window
-  [#1296](https://github.com/nextgen-networks/snappymail/issues/1296)
+  [#1296](https://github.com/the-djmaze/snappymail/issues/1296)
 - Squire: crash on cut/delete range
 
 ### Nextcloud
 - Use language as defined in Nextcloud settings
-  [#1293](https://github.com/nextgen-networks/snappymail/issues/1293)
+  [#1293](https://github.com/the-djmaze/snappymail/issues/1293)
 - Plugin Call to undefined method RainLoop\Model\MainAccount::ImapConnectAndLoginHelper()
 - SnappyMail failed due to Nextcloud Symfony polyfill
 
@@ -716,22 +716,22 @@
 - SnappyMail\SensitiveString class to secure passwords
 - Allow to disable all IMAP features through Admin -> Domain
 - Setting to open mails in a tab or new window
-  [#951](https://github.com/nextgen-networks/snappymail/issues/951)
+  [#951](https://github.com/the-djmaze/snappymail/issues/951)
 - Fully support IMAP PREVIEW
-  [#1338](https://github.com/nextgen-networks/snappymail/issues/1338)
+  [#1338](https://github.com/the-djmaze/snappymail/issues/1338)
 - Disable "Mark message as read after", offer manual toggle
-  [#1289](https://github.com/nextgen-networks/snappymail/issues/1289)
+  [#1289](https://github.com/the-djmaze/snappymail/issues/1289)
 - A "Move to" button inside message view as an icon/button and in the drop down menu.
-  [#1295](https://github.com/nextgen-networks/snappymail/issues/1295)
+  [#1295](https://github.com/the-djmaze/snappymail/issues/1295)
 - Support for IMAP WITHIN
 - Support \noinferiors to disallow creating subfolders
 - A test due to Failed loading libs.min.js
-  [#358](https://github.com/nextgen-networks/snappymail/issues/358),
-  [#862](https://github.com/nextgen-networks/snappymail/issues/862),
-  [#890](https://github.com/nextgen-networks/snappymail/issues/890),
-  [#895](https://github.com/nextgen-networks/snappymail/issues/895),
-  [#1238](https://github.com/nextgen-networks/snappymail/issues/1238),
-  [#1320](https://github.com/nextgen-networks/snappymail/issues/1320)
+  [#358](https://github.com/the-djmaze/snappymail/issues/358),
+  [#862](https://github.com/the-djmaze/snappymail/issues/862),
+  [#890](https://github.com/the-djmaze/snappymail/issues/890),
+  [#895](https://github.com/the-djmaze/snappymail/issues/895),
+  [#1238](https://github.com/the-djmaze/snappymail/issues/1238),
+  [#1320](https://github.com/the-djmaze/snappymail/issues/1320)
 
 ### Changed
 - Split PHP 8 polyfills from include.php
@@ -745,75 +745,75 @@
 
 ### Fixed
 - Move to button does not work
-  [#1328](https://github.com/nextgen-networks/snappymail/issues/1328)
+  [#1328](https://github.com/the-djmaze/snappymail/issues/1328)
 - Mark passwords as sensitive information
-  [#1343](https://github.com/nextgen-networks/snappymail/issues/1343)
+  [#1343](https://github.com/the-djmaze/snappymail/issues/1343)
 - Account sSmtpPassword wrong value
 - SCRAM sign-in failed
-  [#1245](https://github.com/nextgen-networks/snappymail/issues/1245)
+  [#1245](https://github.com/the-djmaze/snappymail/issues/1245)
 - Squire generates to many `<div><br></div>`
-  [#1339](https://github.com/nextgen-networks/snappymail/issues/1339)
+  [#1339](https://github.com/the-djmaze/snappymail/issues/1339)
 - Creation of dynamic property SnappyMail\Stream\ZipEntry::$compression is deprecated
 - `json.after-*` hooks didn't send $aResponse as recursive array
 - Sieve: Move to folder with trailing space does not work
-  [#1329](https://github.com/nextgen-networks/snappymail/issues/1329)
+  [#1329](https://github.com/the-djmaze/snappymail/issues/1329)
 - Squire: cantFocusEmptyTextNodes var is always undefined
-  [#1337](https://github.com/nextgen-networks/snappymail/issues/1337)
+  [#1337](https://github.com/the-djmaze/snappymail/issues/1337)
 - Squire: Remove redundant <span> after replacing styles
 - Squire: Handle empty nodes in moveRangeBoundariesDownTree
 - Theme "Nextcloud V25+" can't be translated
-  [#1331](https://github.com/nextgen-networks/snappymail/issues/1331)
+  [#1331](https://github.com/the-djmaze/snappymail/issues/1331)
 
 
 ## 2.29.4 – 2023-11-21
 
 ### Fixed
 - Contacts not work
-  [#1319](https://github.com/nextgen-networks/snappymail/issues/1319)
+  [#1319](https://github.com/the-djmaze/snappymail/issues/1319)
 
 
 ## 2.29.3 – 2023-11-21
 
 ### Added
 - Docker Hub image
-  [#965](https://github.com/nextgen-networks/snappymail/pull/965) by @leojonathanoh
+  [#965](https://github.com/the-djmaze/snappymail/pull/965) by @leojonathanoh
 
 ### Changed
 - Sabre/VObject 4.5.4 and Sabre/Xml 4.0.4
-  [#1311](https://github.com/nextgen-networks/snappymail/issues/1311)
+  [#1311](https://github.com/the-djmaze/snappymail/issues/1311)
 
 ### Fixed
 - '#/mailbox/folder/mUID/search' uri/route handling
-  [#1301](https://github.com/nextgen-networks/snappymail/pull/1301) by @SergeyMosin
+  [#1301](https://github.com/the-djmaze/snappymail/pull/1301) by @SergeyMosin
 - "Remember me" doesn't work when browser is closed
-  [#1313](https://github.com/nextgen-networks/snappymail/issues/1313)
+  [#1313](https://github.com/the-djmaze/snappymail/issues/1313)
 - Blank email displayed when "Prefer HTML to plain text" is unchecked and the message is html only
-  [#1302](https://github.com/nextgen-networks/snappymail/issues/1302)
+  [#1302](https://github.com/the-djmaze/snappymail/issues/1302)
 - Parent folder of Sub folder not useable.
-  [#1008](https://github.com/nextgen-networks/snappymail/issues/1008)
+  [#1008](https://github.com/the-djmaze/snappymail/issues/1008)
 - Large detailed header don't display body
-  [#1284](https://github.com/nextgen-networks/snappymail/issues/1284)
+  [#1284](https://github.com/the-djmaze/snappymail/issues/1284)
 
 ### Nextcloud
 - Improvements for Install / update issues #929
-  [#929](https://github.com/nextgen-networks/snappymail/issues/929)
+  [#929](https://github.com/the-djmaze/snappymail/issues/929)
 - Should use language as defined in cloud settings #1293
-  [#1293](https://github.com/nextgen-networks/snappymail/issues/1293)
+  [#1293](https://github.com/the-djmaze/snappymail/issues/1293)
 
 
 ## 2.29.2 – 2023-11-14
 
 ### Added
 - Show size of folders in folders list #1303
-  [#1303](https://github.com/nextgen-networks/snappymail/issues/1303)
+  [#1303](https://github.com/the-djmaze/snappymail/issues/1303)
 
 ### Fixed
 - Configuration failed when using special chars in MySQL password #1308
-  [#1308](https://github.com/nextgen-networks/snappymail/issues/1308)
+  [#1308](https://github.com/the-djmaze/snappymail/issues/1308)
 - With email open, "delete" doesn't delete #1274
-  [#1274](https://github.com/nextgen-networks/snappymail/issues/1274)
+  [#1274](https://github.com/the-djmaze/snappymail/issues/1274)
 - Fix threading view in Thunderbird (others?)
-  [#1304](https://github.com/nextgen-networks/snappymail/pull/1304) by @tkasch
+  [#1304](https://github.com/the-djmaze/snappymail/pull/1304) by @tkasch
 
 
 ## 2.29.1 – 2023-10-02
@@ -826,102 +826,102 @@
 
 ### Added
 - Modern UI / Nextcloud Theme
-  [#629](https://github.com/nextgen-networks/snappymail/pull/629) by @hampoelz
+  [#629](https://github.com/the-djmaze/snappymail/pull/629) by @hampoelz
 - "Add/Edit signature" label to PopupsIdentity.html
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - use calendar icon in message list for messages with '.ics' or 'text/calendar' attachments by @SergeyMosin
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248)
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248)
 - Show unseen message count when the message list is threaded
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - in mobile mode hide folders(left) panel when a folder is clicked
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - spellcheck the subject when 'allowSpellcheck' setting is true
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - 'collapse_blockquotes', 'allow_spellcheck' and 'mail_list_grouped' to admin settings ('defaults' section)
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - Browser support for autocompleting TOTP code
-  [#1251](https://github.com/nextgen-networks/snappymail/issues/1251)
+  [#1251](https://github.com/the-djmaze/snappymail/issues/1251)
 
 ### Changed
 - URL strip tracking for
-  [#1225](https://github.com/nextgen-networks/snappymail/issues/1225)
+  [#1225](https://github.com/the-djmaze/snappymail/issues/1225)
 - Color picker use color blind palette "Tableau 10" by Maureen Stone by default
-  [#1199](https://github.com/nextgen-networks/snappymail/issues/1199)
+  [#1199](https://github.com/the-djmaze/snappymail/issues/1199)
 - Draft code to improve mobile breakpoints
-  [#1150](https://github.com/nextgen-networks/snappymail/issues/1150)
+  [#1150](https://github.com/the-djmaze/snappymail/issues/1150)
 - address input: space character can trigger '_parseValue' if the email address looks complete
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - if applicable set '\\answered' or '$forwarded' flag after a message is sent so the proper icon is shown in the message list view
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 
 ### Fixed
 - CHARSET is not valid in UTF8 mode
-  [#1230](https://github.com/nextgen-networks/snappymail/issues/1230)
+  [#1230](https://github.com/the-djmaze/snappymail/issues/1230)
 - Spam score is always "acceptable"
-  [#1228](https://github.com/nextgen-networks/snappymail/issues/1228)
+  [#1228](https://github.com/the-djmaze/snappymail/issues/1228)
 - Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
-  [#1205](https://github.com/nextgen-networks/snappymail/issues/1205)
+  [#1205](https://github.com/the-djmaze/snappymail/issues/1205)
 - Fetch controller.abort(reason) handling
-  [#1220](https://github.com/nextgen-networks/snappymail/issues/1220)
+  [#1220](https://github.com/the-djmaze/snappymail/issues/1220)
 - "Request failed" on message move
-  [#1220](https://github.com/nextgen-networks/snappymail/issues/1220)
+  [#1220](https://github.com/the-djmaze/snappymail/issues/1220)
 - Unwrapped text nodes attached to squire._root
-  [#1234](https://github.com/nextgen-networks/snappymail/pull/1234) by @SergeyMosin
+  [#1234](https://github.com/the-djmaze/snappymail/pull/1234) by @SergeyMosin
 - Extra wrapper div is added in Squire every time a Draft is open (or closed) after save.
-  [#1208](https://github.com/nextgen-networks/snappymail/issues/1208)
+  [#1208](https://github.com/the-djmaze/snappymail/issues/1208)
 - foreach() argument must be of type array|object
-  [#1237](https://github.com/nextgen-networks/snappymail/issues/1237)
+  [#1237](https://github.com/the-djmaze/snappymail/issues/1237)
 - `<font>` tag 'style' is lost in replies
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - unseen indicator is not shown in thread view when 'listGrouped' settings is false
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - TOTP plugin is dependent on ctype
-  [#1250](https://github.com/nextgen-networks/snappymail/issues/1250)
+  [#1250](https://github.com/the-djmaze/snappymail/issues/1250)
 
 ### Nextcloud
 - iFrame mode: click on unified search result opens inner iFrame
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - set 'smremember' cookie if 'sign_me_auto' is set to 'DefaultOn' when using 'snappymail-autologin*', otherwise nextcloud users need to re-login when the browser is re-opened
-  [#1248](https://github.com/nextgen-networks/snappymail/pull/1248) by @SergeyMosin
+  [#1248](https://github.com/the-djmaze/snappymail/pull/1248) by @SergeyMosin
 - Improve UX of "Put in Calendar" option in plugin
-  [#1259](https://github.com/nextgen-networks/snappymail/pull/1259) by @theronakpatel
+  [#1259](https://github.com/the-djmaze/snappymail/pull/1259) by @theronakpatel
 
 
 ## 2.28.4 – 2023-07-10
 
 ### Added
 - application.ini msg_default_action
-  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
 - application.ini view_show_next_message
-  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
 - application.ini view_images
-  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
 - nextcloud add ability to include custom php file in InstallStep migration
-  [#1197](https://github.com/nextgen-networks/snappymail/pull/1197) by @SergeyMosin
+  [#1197](https://github.com/the-djmaze/snappymail/pull/1197) by @SergeyMosin
 - Support plugin for Squire editor
-  [#1192](https://github.com/nextgen-networks/snappymail/issues/1192)
+  [#1192](https://github.com/the-djmaze/snappymail/issues/1192)
 
 ### Changed
 - only show 'Add "domain.tld" as an application for mailto links?' message after login (firefox shows the message on every reload otherwise).
-  [#1204](https://github.com/nextgen-networks/snappymail/issues/1204)
+  [#1204](https://github.com/the-djmaze/snappymail/issues/1204)
 - Convert getPdoAccessData() : array to a RainLoop\Pdo\Settings object instance
 - New bidi buttons to Squire editor
-  [#1200](https://github.com/nextgen-networks/snappymail/pull/1200) by @rezaei92
+  [#1200](https://github.com/the-djmaze/snappymail/pull/1200) by @rezaei92
 
 ### Fixed
 - Undefined constant PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
-  [#1205](https://github.com/nextgen-networks/snappymail/issues/1205)
+  [#1205](https://github.com/the-djmaze/snappymail/issues/1205)
 - 'reloadTime' function result is passed into 'setInterval' instead of the function
-  [#1204](https://github.com/nextgen-networks/snappymail/pull/1204) by @SergeyMosin
+  [#1204](https://github.com/the-djmaze/snappymail/pull/1204) by @SergeyMosin
 - UNKNOWN-CTE Invalid data in MIME part
-  [#1186](https://github.com/nextgen-networks/snappymail/issues/1186)
+  [#1186](https://github.com/the-djmaze/snappymail/issues/1186)
 
 
 ## 2.28.3 – 2023-06-22
 
 ### Added
 - Attachments in "new window" view
-  [#1166](https://github.com/nextgen-networks/snappymail/issues/1166)
+  [#1166](https://github.com/the-djmaze/snappymail/issues/1166)
 
 ### Changed
 - Update Portuguese by @ner00
@@ -929,22 +929,22 @@
 
 ### Fixed
 - Some emails with inline CSS break the UI
-  [#1187](https://github.com/nextgen-networks/snappymail/issues/1187)
+  [#1187](https://github.com/the-djmaze/snappymail/issues/1187)
 - Remote.get() Promise broken by previous change
-  [#1185](https://github.com/nextgen-networks/snappymail/issues/1185)
+  [#1185](https://github.com/the-djmaze/snappymail/issues/1185)
 - Class "MailSo\Base\Exceptions\InvalidArgumentException" not found
-  [#1182](https://github.com/nextgen-networks/snappymail/issues/1182)
+  [#1182](https://github.com/the-djmaze/snappymail/issues/1182)
 - First account not showed in the right list (dropbox)
-  [#1180](https://github.com/nextgen-networks/snappymail/issues/1180)
+  [#1180](https://github.com/the-djmaze/snappymail/issues/1180)
 
 
 ## 2.28.2 – 2023-06-19
 
 ### Added
 - Detailed error for "Cannot access the repository at the moment"
-  [#1164](https://github.com/nextgen-networks/snappymail/issues/1164)
+  [#1164](https://github.com/the-djmaze/snappymail/issues/1164)
 - Bidi in Squire editor
-  [#1158](https://github.com/nextgen-networks/snappymail/issues/1158)
+  [#1158](https://github.com/the-djmaze/snappymail/issues/1158)
 - Translate Squire UI
 - Nextcloud 27 compatibility by @LarsBel
 - JWT class for handling JSON Web Tokens
@@ -954,19 +954,19 @@
 - Update French by @hguilbert
 - Update Polish by @tinola
 - Merge handling of local Account Settings. Found while investigating
-  [#1170](https://github.com/nextgen-networks/snappymail/issues/1170)
+  [#1170](https://github.com/the-djmaze/snappymail/issues/1170)
 - Image max-width now 100% instead of 90vw
 
 ### Fixed
 - Cannot modify header information
-  [#929](https://github.com/nextgen-networks/snappymail/issues/929) (comment)
+  [#929](https://github.com/the-djmaze/snappymail/issues/929) (comment)
 - Admin Panel broken when admin_panel_host is set
-  [#1169](https://github.com/nextgen-networks/snappymail/issues/1169)
+  [#1169](https://github.com/the-djmaze/snappymail/issues/1169)
 - Invalid CSP report-uri
 - Prevent MessageList multiple request at the same time
-  [#1071](https://github.com/nextgen-networks/snappymail/issues/1071)
+  [#1071](https://github.com/the-djmaze/snappymail/issues/1071)
 - Error in Addressbook Sync
-  [#1179](https://github.com/nextgen-networks/snappymail/issues/1179)
+  [#1179](https://github.com/the-djmaze/snappymail/issues/1179)
 - base64_decode() second parameter must be true
 
 
@@ -974,91 +974,91 @@
 
 ### Changed
 - Optical issue with input fields for mail and folder search
-  [#1149](https://github.com/nextgen-networks/snappymail/issues/1149)
+  [#1149](https://github.com/the-djmaze/snappymail/issues/1149)
 - Update Chinese translation
-  [#1157](https://github.com/nextgen-networks/snappymail/pull/1157) by @mayswind
+  [#1157](https://github.com/the-djmaze/snappymail/pull/1157) by @mayswind
 - Update Polish translation
-  [#1156](https://github.com/nextgen-networks/snappymail/pull/1156) by @tinola
+  [#1156](https://github.com/the-djmaze/snappymail/pull/1156) by @tinola
 
 ### Fixed
 - Undefined SIG constants
-  [#1147](https://github.com/nextgen-networks/snappymail/issues/1147)
+  [#1147](https://github.com/the-djmaze/snappymail/issues/1147)
 
 
 ## 2.28.0 – 2023-05-30
 
 ### Added
 - Threaded view make number orange when unread sub-messages
-  [#1028](https://github.com/nextgen-networks/snappymail/issues/1028)
+  [#1028](https://github.com/the-djmaze/snappymail/issues/1028)
 - Handle PHP pctnl messages
 - addEventListener('rl-view-model') missing for Settings
-  [#1013](https://github.com/nextgen-networks/snappymail/issues/1013)
+  [#1013](https://github.com/the-djmaze/snappymail/issues/1013)
 - CSS `--btn-border-radius`
 
 ### Changed
 - Improved RTL languages support
-  [#1056](https://github.com/nextgen-networks/snappymail/issues/1056)
+  [#1056](https://github.com/the-djmaze/snappymail/issues/1056)
 - Composer text/attachments as tabs
-  [#1119](https://github.com/nextgen-networks/snappymail/issues/1119)
+  [#1119](https://github.com/the-djmaze/snappymail/issues/1119)
 - Filter dialog doesn't refer to folder names consistently
-  [#1111](https://github.com/nextgen-networks/snappymail/issues/1111)
+  [#1111](https://github.com/the-djmaze/snappymail/issues/1111)
 - TLS connection for MYSQL contact db
-  [#1078](https://github.com/nextgen-networks/snappymail/issues/1078)
+  [#1078](https://github.com/the-djmaze/snappymail/issues/1078)
 - Allow empty message body when there are attachments
-  [#1052](https://github.com/nextgen-networks/snappymail/issues/1052)
+  [#1052](https://github.com/the-djmaze/snappymail/issues/1052)
 - PHP inherit logger as Trait
 - Update Portuguese
-  [#1124](https://github.com/nextgen-networks/snappymail/pull/1124) by @ner00
+  [#1124](https://github.com/the-djmaze/snappymail/pull/1124) by @ner00
 - Update Traditional Chinese (Taiwan)
-  [#1107](https://github.com/nextgen-networks/snappymail/pull/1107) by @chiyi4488
+  [#1107](https://github.com/the-djmaze/snappymail/pull/1107) by @chiyi4488
 - Update Russian
-  [#1108](https://github.com/nextgen-networks/snappymail/pull/1108) by @konkere
+  [#1108](https://github.com/the-djmaze/snappymail/pull/1108) by @konkere
 - Update Italian
-  [#1094](https://github.com/nextgen-networks/snappymail/pull/1094) by @cm-schl
+  [#1094](https://github.com/the-djmaze/snappymail/pull/1094) by @cm-schl
 - Update French
-  [#1102](https://github.com/nextgen-networks/snappymail/pull/1102) by @hguilbert
+  [#1102](https://github.com/the-djmaze/snappymail/pull/1102) by @hguilbert
 - Update German
-  [#1087](https://github.com/nextgen-networks/snappymail/pull/1087) by @cm-schl
+  [#1087](https://github.com/the-djmaze/snappymail/pull/1087) by @cm-schl
 
 ### Fixed
 - Show messagelist timeout/abort error for
-  [#1071](https://github.com/nextgen-networks/snappymail/issues/1071)
+  [#1071](https://github.com/the-djmaze/snappymail/issues/1071)
 - DesktopNotifications setting not saved
-  [#1137](https://github.com/nextgen-networks/snappymail/issues/1137)
+  [#1137](https://github.com/the-djmaze/snappymail/issues/1137)
 - PHP Deprecation warning for $_openPipes
-  [#1141](https://github.com/nextgen-networks/snappymail/issues/1141)
+  [#1141](https://github.com/the-djmaze/snappymail/issues/1141)
 - Images size wrong
-  [#1134](https://github.com/nextgen-networks/snappymail/issues/1134)
+  [#1134](https://github.com/the-djmaze/snappymail/issues/1134)
 - Unable to preview body of encrypted mail in mailvelope reply-to
-  [#1130](https://github.com/nextgen-networks/snappymail/issues/1130)
+  [#1130](https://github.com/the-djmaze/snappymail/issues/1130)
 - Replace `<button>` in HTML message with innerHTML instead of remove
-  [#1125](https://github.com/nextgen-networks/snappymail/issues/1125)
+  [#1125](https://github.com/the-djmaze/snappymail/issues/1125)
 - Mailvelope failed
-  [#1126](https://github.com/nextgen-networks/snappymail/issues/1126)
+  [#1126](https://github.com/the-djmaze/snappymail/issues/1126)
 - Tabs labels row height
 - Selecting not yet existing filter throws error message instead of opening edit box
-  [#1104](https://github.com/nextgen-networks/snappymail/issues/1104)
+  [#1104](https://github.com/the-djmaze/snappymail/issues/1104)
 - JavaScript Squire `node is null` error
 - Config/Application.php: array_rand(): Argument
-  [#1](https://github.com/nextgen-networks/snappymail/issues/1) cannot be empty
-  [#1123](https://github.com/nextgen-networks/snappymail/issues/1123)
+  [#1](https://github.com/the-djmaze/snappymail/issues/1) cannot be empty
+  [#1123](https://github.com/the-djmaze/snappymail/issues/1123)
 - Pressing Enter in Add Filter dialog results in "Leave page?" prompt
-  [#1112](https://github.com/nextgen-networks/snappymail/issues/1112)
+  [#1112](https://github.com/the-djmaze/snappymail/issues/1112)
 - Issue with certain Amazon emails
-  [#1086](https://github.com/nextgen-networks/snappymail/issues/1086)
+  [#1086](https://github.com/the-djmaze/snappymail/issues/1086)
 - HTML font 8px and 10px issue
-  [#1082](https://github.com/nextgen-networks/snappymail/issues/1082)
+  [#1082](https://github.com/the-djmaze/snappymail/issues/1082)
 - Exception when executed on command line on the first-time
-  [#1085](https://github.com/nextgen-networks/snappymail/issues/1085)
+  [#1085](https://github.com/the-djmaze/snappymail/issues/1085)
 - Folders missing pagination
-  [#1070](https://github.com/nextgen-networks/snappymail/issues/1070)
+  [#1070](https://github.com/the-djmaze/snappymail/issues/1070)
 - Nextcloud WYSIWYG button style
-  [#1138](https://github.com/nextgen-networks/snappymail/issues/1138)
+  [#1138](https://github.com/the-djmaze/snappymail/issues/1138)
 - Nextcloud .btn-group > .btn layout
 - Nextcloud Bulleted items do not show the bullets in the preview window.
-  [#1117](https://github.com/nextgen-networks/snappymail/issues/1117)
+  [#1117](https://github.com/the-djmaze/snappymail/issues/1117)
 - Nextcloud Contacts integration
-  [#1083](https://github.com/nextgen-networks/snappymail/issues/1083)
+  [#1083](https://github.com/the-djmaze/snappymail/issues/1083)
 
 
 ## 2.27.3 – 2023-04-04
@@ -1066,57 +1066,57 @@
 ### Added
 - Squire visualize some active buttons states
 - Hard coded string "Message body is empty"
-  [#1048](https://github.com/nextgen-networks/snappymail/issues/1048)
+  [#1048](https://github.com/the-djmaze/snappymail/issues/1048)
 - Split SPAM label in user.json for directory and action
-  [#1065](https://github.com/nextgen-networks/snappymail/issues/1065)
+  [#1065](https://github.com/the-djmaze/snappymail/issues/1065)
 - A solution for
-  [#1056](https://github.com/nextgen-networks/snappymail/issues/1056) to support dates in different language/calendar
+  [#1056](https://github.com/the-djmaze/snappymail/issues/1056) to support dates in different language/calendar
 - Log \nonexistent folder for
-  [#1008](https://github.com/nextgen-networks/snappymail/issues/1008)
+  [#1008](https://github.com/the-djmaze/snappymail/issues/1008)
 
 ### Changed
 - Cleanup some enums to consts
 - Workaround Upgrade with Nextcloud stuck in Maintenance mode
-  [#1046](https://github.com/nextgen-networks/snappymail/issues/1046)
+  [#1046](https://github.com/the-djmaze/snappymail/issues/1046)
 - Use Actions()->decodeRawKey()
 - French language updated
-  [#1045](https://github.com/nextgen-networks/snappymail/pull/1045) by @hguilbert
+  [#1045](https://github.com/the-djmaze/snappymail/pull/1045) by @hguilbert
 - Sorting in folders not working
-  [#1022](https://github.com/nextgen-networks/snappymail/issues/1022)
+  [#1022](https://github.com/the-djmaze/snappymail/issues/1022)
 - Allow saving draft with empty body
-  [#1052](https://github.com/nextgen-networks/snappymail/issues/1052)
+  [#1052](https://github.com/the-djmaze/snappymail/issues/1052)
 
 ### Fixed
 - GnuPG decrypt failed
 - Clear folder link should be hidden if "dangerous actions" is not active
-  [#1037](https://github.com/nextgen-networks/snappymail/issues/1037)
+  [#1037](https://github.com/the-djmaze/snappymail/issues/1037)
 - 500 error generating preview with GD2
-  [#1009](https://github.com/nextgen-networks/snappymail/issues/1009)
+  [#1009](https://github.com/the-djmaze/snappymail/issues/1009)
 - Text and Links Jumping While Writing
-  [#1004](https://github.com/nextgen-networks/snappymail/issues/1004)
+  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
 - Odd annoying behaviour when copy/ pasting anything into an email and then attempting to edit it.
-  [#1054](https://github.com/nextgen-networks/snappymail/issues/1054)
+  [#1054](https://github.com/the-djmaze/snappymail/issues/1054)
 - Check if $rImapLiteralStream is open resource and not closed
 - Save as eml to nextcloud not working anymore
-  [#1057](https://github.com/nextgen-networks/snappymail/issues/1057)
+  [#1057](https://github.com/the-djmaze/snappymail/issues/1057)
 - AuthError and Call to a member function ImapConnectAndLogin() on null
-  [#1060](https://github.com/nextgen-networks/snappymail/issues/1060)
+  [#1060](https://github.com/the-djmaze/snappymail/issues/1060)
 - Thread count missing/shown
-  [#1003](https://github.com/nextgen-networks/snappymail/issues/1003)
+  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
 
 
 ## 2.27.2 – 2023-03-22
 
 ### Added
 - authentication with smtp freenet.de
-  [#1038](https://github.com/nextgen-networks/snappymail/issues/1038)
+  [#1038](https://github.com/the-djmaze/snappymail/issues/1038)
 
 ### Changed
 - SASL always base64 by default
 
 ### Fixed
 - Cache issue with index
-  [#1024](https://github.com/nextgen-networks/snappymail/issues/1024)
+  [#1024](https://github.com/the-djmaze/snappymail/issues/1024)
 
 
 ## 2.27.1 – 2023-03-21
@@ -1124,58 +1124,58 @@
 ### Changed
 - Improved attachmentIcon glyph coloring
 - Better design for .accountPlace text
-  [#1025](https://github.com/nextgen-networks/snappymail/issues/1025)
+  [#1025](https://github.com/the-djmaze/snappymail/issues/1025)
 
 ### Fixed
 - Reply is broken
-  [#1027](https://github.com/nextgen-networks/snappymail/issues/1027)
+  [#1027](https://github.com/the-djmaze/snappymail/issues/1027)
 - Endless loop at login - Cannot assign array to property MailSo\Imap\Folder::$MAILBOXID
-  [#1032](https://github.com/nextgen-networks/snappymail/issues/1032)
+  [#1032](https://github.com/the-djmaze/snappymail/issues/1032)
 
 
 ## 2.27.0 – 2023-03-20
 
 ### Added
 - Unique attachments.zip filename
-  [#992](https://github.com/nextgen-networks/snappymail/issues/992)
+  [#992](https://github.com/the-djmaze/snappymail/issues/992)
 - Select next email after (re)move current
-  [#968](https://github.com/nextgen-networks/snappymail/issues/968)
+  [#968](https://github.com/the-djmaze/snappymail/issues/968)
 
 ### Changed
 - Improved FolderCollection handling
 - MODSEQ requires 64-bit int
 - Update russian language
-  [#994](https://github.com/nextgen-networks/snappymail/pull/994) by @Akrobs
+  [#994](https://github.com/the-djmaze/snappymail/pull/994) by @Akrobs
 - Don't make font bigger when screen > 1400px
 - Put top menu "accountPlace" inside top-system-dropdown-id
 - Put attachment controls inside attachmentsPlace
 - Show message toolbar on screens > 1400px
-  [#970](https://github.com/nextgen-networks/snappymail/issues/970)
+  [#970](https://github.com/the-djmaze/snappymail/issues/970)
 - Chinese updated
-  [#1011](https://github.com/nextgen-networks/snappymail/pull/1011) by @mayswind
+  [#1011](https://github.com/the-djmaze/snappymail/pull/1011) by @mayswind
 - Prevent folder/messages flags conflict by using the right name `attributes` for Folders
 - FolderInformation() use jsonSerialize()
 - Squire space handling on paste use `\u00A0` instead of `&nbsp;` for
-  [#1004](https://github.com/nextgen-networks/snappymail/issues/1004)
+  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
 - Better line-height for QR code
 
 ### Fixed
 - Composer src is null
 - Image in Signature disappears in Sent/Draft
-  [#932](https://github.com/nextgen-networks/snappymail/issues/932)
+  [#932](https://github.com/the-djmaze/snappymail/issues/932)
 - Mail list is empty
-  [#998](https://github.com/nextgen-networks/snappymail/issues/998)
+  [#998](https://github.com/the-djmaze/snappymail/issues/998)
 - Cache handling issues
-  [#1003](https://github.com/nextgen-networks/snappymail/issues/1003)
+  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
 - No message notification popup when installed in sub-directory
-  [#1007](https://github.com/nextgen-networks/snappymail/issues/1007)
+  [#1007](https://github.com/the-djmaze/snappymail/issues/1007)
 - ERROR: Undefined constant "MailSo\Log\Drivers\STDERR"
-  [#965](https://github.com/nextgen-networks/snappymail/issues/965)
+  [#965](https://github.com/the-djmaze/snappymail/issues/965)
 - 'Location:' headers using proper '302 Found' header
 - Can't send email
-  [#1006](https://github.com/nextgen-networks/snappymail/issues/1006)
+  [#1006](https://github.com/the-djmaze/snappymail/issues/1006)
 - Attachment preview
-  [#1005](https://github.com/nextgen-networks/snappymail/issues/1005)
+  [#1005](https://github.com/the-djmaze/snappymail/issues/1005)
 - When decrypt message, subject was replaced empty
 
 ### Removed
@@ -1184,38 +1184,38 @@
 ### Nextcloud
 - CSS `--panel-bg-clr` was missing
 - SnappyMail Menu under Nextcloud top bar
-  [#1017](https://github.com/nextgen-networks/snappymail/issues/1017)
+  [#1017](https://github.com/the-djmaze/snappymail/issues/1017)
 
 
 ## 2.26.4 – 2023-02-24
 
 ### Added
 - Add CSP frame-ancestors for
-  [#537](https://github.com/nextgen-networks/snappymail/issues/537)
+  [#537](https://github.com/the-djmaze/snappymail/issues/537)
 
 ### Changed
 - Reduce/simplify CSS footprint
 - Use the System/Browser font by default
-  [#988](https://github.com/nextgen-networks/snappymail/pull/988) by @HeySora
+  [#988](https://github.com/the-djmaze/snappymail/pull/988) by @HeySora
 - Make layout fully responsive using matchMedia('(max-width: 799px)')
 - Move brotli and gzip compress option to application.ini
 - After page refreshes in background whilst editing a draft, the space bar stops working
-  [#860](https://github.com/nextgen-networks/snappymail/issues/860)
+  [#860](https://github.com/the-djmaze/snappymail/issues/860)
 - Updated Portuguese
-  [#984](https://github.com/nextgen-networks/snappymail/pull/984) by @ner00
+  [#984](https://github.com/the-djmaze/snappymail/pull/984) by @ner00
 - Updated French
-  [#985](https://github.com/nextgen-networks/snappymail/pull/985) by @hguilbert
+  [#985](https://github.com/the-djmaze/snappymail/pull/985) by @hguilbert
 
 ### Fixed
 - unset border-box for message body
-  [#990](https://github.com/nextgen-networks/snappymail/issues/990)
+  [#990](https://github.com/the-djmaze/snappymail/issues/990)
 - Unread email count badge shows -1
-  [#989](https://github.com/nextgen-networks/snappymail/issues/989)
+  [#989](https://github.com/the-djmaze/snappymail/issues/989)
 - unicode mailto: addresses not decoded
 - Unicode email/url address matching
-  [#955](https://github.com/nextgen-networks/snappymail/issues/955)
+  [#955](https://github.com/the-djmaze/snappymail/issues/955)
 - Invalid Token if run in IFrame
-  [#537](https://github.com/nextgen-networks/snappymail/issues/537)
+  [#537](https://github.com/the-djmaze/snappymail/issues/537)
 
 ### Removed
 - rl.initData
@@ -1239,13 +1239,13 @@
 - Threads indicator got lost with new message cache handling
 - messagesBodiesDom never cached previous messages
 - Nextcloud File picker doesn't insert multiple links
-  [#981](https://github.com/nextgen-networks/snappymail/issues/981)
+  [#981](https://github.com/the-djmaze/snappymail/issues/981)
 - Call to protected method RainLoop\Enumerations\UploadError::getUserMessage()
-  [#982](https://github.com/nextgen-networks/snappymail/issues/982)
+  [#982](https://github.com/the-djmaze/snappymail/issues/982)
 - Issue with the top logo and text of a certain e-mail
-  [#953](https://github.com/nextgen-networks/snappymail/issues/953)
+  [#953](https://github.com/the-djmaze/snappymail/issues/953)
 - Facebook logo missing from emails sent out by it
-  [#954](https://github.com/nextgen-networks/snappymail/issues/954)
+  [#954](https://github.com/the-djmaze/snappymail/issues/954)
 
 ### Removed
 - Unused Squire code
@@ -1256,9 +1256,9 @@
 ### Added
 - Remove CSS white-space from messages to prevent annoying side scrolling
 - Show error when trying to send empty message
-  [#974](https://github.com/nextgen-networks/snappymail/issues/974)
+  [#974](https://github.com/the-djmaze/snappymail/issues/974)
 - max_sys_loadavg as setting
-  [#971](https://github.com/nextgen-networks/snappymail/issues/971)
+  [#971](https://github.com/the-djmaze/snappymail/issues/971)
 
 ### Changed
 - Speedup and improved cleanHtml() and cleanCSS() handling
@@ -1271,20 +1271,20 @@
 
 ### Fixed
 - Remove SVG elements properly from messages
-  [#972](https://github.com/nextgen-networks/snappymail/issues/972)
+  [#972](https://github.com/the-djmaze/snappymail/issues/972)
 - Sending large HTML messages slow/fail
-  [#962](https://github.com/nextgen-networks/snappymail/issues/962)
+  [#962](https://github.com/the-djmaze/snappymail/issues/962)
 - Nextcloud login failed
-  [#969](https://github.com/nextgen-networks/snappymail/issues/969)
+  [#969](https://github.com/the-djmaze/snappymail/issues/969)
 - DoMessageList() hash check was incorrect
 - "Move to folder" button overlays folder sidebar on mobile
-  [#961](https://github.com/nextgen-networks/snappymail/issues/961)
+  [#961](https://github.com/the-djmaze/snappymail/issues/961)
 - Spanish translation SPAM and NOT SPAM strings are reversed
-  [#964](https://github.com/nextgen-networks/snappymail/issues/964)
+  [#964](https://github.com/the-djmaze/snappymail/issues/964)
 - Can't open Thunderbird PGP keys from decrypted message
-  [#958](https://github.com/nextgen-networks/snappymail/issues/958)
+  [#958](https://github.com/the-djmaze/snappymail/issues/958)
 - Can't close Sieve dialog
-  [#960](https://github.com/nextgen-networks/snappymail/issues/960)
+  [#960](https://github.com/the-djmaze/snappymail/issues/960)
 
 
 ## 2.26.1 – 2023-02-14
@@ -1298,21 +1298,21 @@
 - emailArrayToStringLineHelper() now filters addresses without email address
 - Cleanup EmailModel and better email address parsing and handling
 - Workaround "server connection error"
-  [#936](https://github.com/nextgen-networks/snappymail/issues/936)
+  [#936](https://github.com/the-djmaze/snappymail/issues/936)
 - Cleanup AbstractViewPopup handling
 - Italian translation
-  [#948](https://github.com/nextgen-networks/snappymail/pull/948) by @lota
+  [#948](https://github.com/the-djmaze/snappymail/pull/948) by @lota
 - Replace Element.fromHTML() with createElement()
 
 ### Fixed
 - New subfolder not visible
-  [#937](https://github.com/nextgen-networks/snappymail/issues/937)
+  [#937](https://github.com/the-djmaze/snappymail/issues/937)
 - OpenPGP decrypted attachments `friendlySize` not a function
 - Message @media print was broken due to new `display:flex`
 - addressparser() didn't handle groups properly
 - middleclick in messages list failed when messagesDom not yet initialized
 - Cannot open messages that have an email address without an @ in the From header
-  [#950](https://github.com/nextgen-networks/snappymail/issues/950)
+  [#950](https://github.com/the-djmaze/snappymail/issues/950)
 - CSS don't display:flex when `[hidden]`
 - Default theme handling by @Niveshkrishna
 
@@ -1321,51 +1321,51 @@
 
 ### Added
 - Whitelist advanced SPF/DKIM/DMARC valid feature
-  [#938](https://github.com/nextgen-networks/snappymail/issues/938)
+  [#938](https://github.com/the-djmaze/snappymail/issues/938)
 
 ### Changed
 - \RainLoop\Providers\AddressBook\Utils functions param `Contact` changed to `VCard`
 
 ### Fixed
 - Issue with themes and Chrome cache
-  [#188](https://github.com/nextgen-networks/snappymail/issues/188)
+  [#188](https://github.com/the-djmaze/snappymail/issues/188)
 - Settings panel width due to display:flex
-  [#940](https://github.com/nextgen-networks/snappymail/issues/940)
+  [#940](https://github.com/the-djmaze/snappymail/issues/940)
 - Not respecting default theme setting
-  [#941](https://github.com/nextgen-networks/snappymail/issues/941)
+  [#941](https://github.com/the-djmaze/snappymail/issues/941)
 - Some files had 0755 instead of 0644
 - Some spacing between message "view images" buttons for
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 - Whitelist failed when empty or when using `:`
-  [#938](https://github.com/nextgen-networks/snappymail/issues/938)
+  [#938](https://github.com/the-djmaze/snappymail/issues/938)
 - Cosmetics of the external images whitelist menu
-  [#939](https://github.com/nextgen-networks/snappymail/issues/939)
+  [#939](https://github.com/the-djmaze/snappymail/issues/939)
 - PdoAddressBook ORDER BY deleted DESC to prevent sync and export issues
 - Undefined variable $items in upgrade.php
 - qq.com not supporting literal-string in search
-  [#836](https://github.com/nextgen-networks/snappymail/issues/836)
+  [#836](https://github.com/the-djmaze/snappymail/issues/836)
 
 
 ## 2.25.5 – 2023-02-09
 
 ### Added
 - New dark themes
-  [#925](https://github.com/nextgen-networks/snappymail/pull/925) by @TheCuteFoxxy
+  [#925](https://github.com/the-djmaze/snappymail/pull/925) by @TheCuteFoxxy
 - External images option 'Always when DKIM is valid' for
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 - Image whitelist menu on message for
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 
 ### Changed
 - pt-PT translation by @ner00
-  [#917](https://github.com/nextgen-networks/snappymail/issues/917) and
-  [#920](https://github.com/nextgen-networks/snappymail/issues/920)
+  [#917](https://github.com/the-djmaze/snappymail/issues/917) and
+  [#920](https://github.com/the-djmaze/snappymail/issues/920)
 - fr-FR translation by @hguilbert
-  [#919](https://github.com/nextgen-networks/snappymail/issues/919)
+  [#919](https://github.com/the-djmaze/snappymail/issues/919)
 - Layout section rl-right now is `display: flex` and solves
-  [#928](https://github.com/nextgen-networks/snappymail/issues/928)
+  [#928](https://github.com/the-djmaze/snappymail/issues/928)
 - Some Themes background to `cover`
-  [#918](https://github.com/nextgen-networks/snappymail/issues/918)
+  [#918](https://github.com/the-djmaze/snappymail/issues/918)
 - Speedup cleanHtml() parser
 - Reduce memory usage on addressbook import
 
@@ -1374,24 +1374,24 @@
 - Admin -> Config layout
 - Inline images sometimes failed
 - Undefined index: cid
-  [#921](https://github.com/nextgen-networks/snappymail/issues/921)
+  [#921](https://github.com/the-djmaze/snappymail/issues/921)
 - On upgrade prevent Apache access errors for
-  [#358](https://github.com/nextgen-networks/snappymail/issues/358)
+  [#358](https://github.com/the-djmaze/snappymail/issues/358)
 - Import contacts as CSV is broken
-  [#931](https://github.com/nextgen-networks/snappymail/issues/931)
+  [#931](https://github.com/the-djmaze/snappymail/issues/931)
 
 ### Removed
 - Blockquote height calculator for
-  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
 
 
 ## 2.25.4 – 2023-02-06
 
 ### Added
 - message maximum quoted text level for speed.
-  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
 - LoveDark Theme
-  [#913](https://github.com/nextgen-networks/snappymail/pull/913) by @TheCuteFoxxy
+  [#913](https://github.com/the-djmaze/snappymail/pull/913) by @TheCuteFoxxy
 
 ### Changed
 - Moved pluginEnable() to \SnappyMail\Repository::enablePackage()
@@ -1400,26 +1400,26 @@
 - Some style change for settings panels
 - Some MailMessageView styling
 - Disabled blockquotes height calculation for
-  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
 - Enhance Add domain dialog
-  [#916](https://github.com/nextgen-networks/snappymail/issues/916)
+  [#916](https://github.com/the-djmaze/snappymail/issues/916)
 
 ### Fixed
 - Fixed arrows in thread view while scrolling
-  [#908](https://github.com/nextgen-networks/snappymail/issues/908)
+  [#908](https://github.com/the-djmaze/snappymail/issues/908)
 - CSS btn-thin were too high
 - Whitelist to show images directly
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 - MailSo\Base\Http::GetHost(): Return value must be of type string
-  [#910](https://github.com/nextgen-networks/snappymail/issues/910)
+  [#910](https://github.com/the-djmaze/snappymail/issues/910)
 - Nextcloud undefined variable $sUser
-  [#915](https://github.com/nextgen-networks/snappymail/issues/915)
+  [#915](https://github.com/the-djmaze/snappymail/issues/915)
 - Hopefull improved styling for Firefox mobile fixes
 - Scroll display error
-  [#912](https://github.com/nextgen-networks/snappymail/issues/912)
+  [#912](https://github.com/the-djmaze/snappymail/issues/912)
 - Autofocus was triggered when view resized
 - Better solution for Settings Page is bigger than the Account Page
-  [#897](https://github.com/nextgen-networks/snappymail/issues/897)
+  [#897](https://github.com/the-djmaze/snappymail/issues/897)
 
 ### Removed
 - $bUrlEncode as it was always false
@@ -1429,7 +1429,7 @@
 
 ### Added
 - Make message collapse quotes optional
-  [#902](https://github.com/nextgen-networks/snappymail/issues/902)
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
 
 ### Changed
 - Improved loginErrorDelay to prevent timing attacks and default to 5 seconds
@@ -1440,56 +1440,56 @@
 
 ### Fixed
 - Prevent plugin property decrypt error
-  [#859](https://github.com/nextgen-networks/snappymail/issues/859)
+  [#859](https://github.com/the-djmaze/snappymail/issues/859)
 - Index.html cache issue
-  [#891](https://github.com/nextgen-networks/snappymail/issues/891)
+  [#891](https://github.com/the-djmaze/snappymail/issues/891)
 - Images whitelist regular expression failed
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 - Undefined index: ShowImages
-  [#901](https://github.com/nextgen-networks/snappymail/issues/901)
+  [#901](https://github.com/the-djmaze/snappymail/issues/901)
 - Chrome shows LSep boxes in certain emails
-  [#900](https://github.com/nextgen-networks/snappymail/issues/900)
+  [#900](https://github.com/the-djmaze/snappymail/issues/900)
 - Don't remember OpenPGP/GnuPGP key passphrase when it fails
-  [#840](https://github.com/nextgen-networks/snappymail/issues/840)
+  [#840](https://github.com/the-djmaze/snappymail/issues/840)
 
 
 ## 2.25.2 – 2023-02-02
 
 ### Added
 - Refresh frequency of the mailboxes
-  [#486](https://github.com/nextgen-networks/snappymail/issues/486)
+  [#486](https://github.com/the-djmaze/snappymail/issues/486)
 - Temporarily save password for private key during session
-  [#840](https://github.com/nextgen-networks/snappymail/issues/840)
+  [#840](https://github.com/the-djmaze/snappymail/issues/840)
 - Upgrade from Rainloop, password not migrated
-  [#898](https://github.com/nextgen-networks/snappymail/issues/898)
+  [#898](https://github.com/the-djmaze/snappymail/issues/898)
 - Whitelist to show images directly
-  [#201](https://github.com/nextgen-networks/snappymail/issues/201)
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
 - HTML editor paste image makes it max 1024px width/height
-  [#262](https://github.com/nextgen-networks/snappymail/issues/262)
+  [#262](https://github.com/the-djmaze/snappymail/issues/262)
 - SnappyMail\TAR::extractTo support the $files and $overwrite parameters
 
 ### Changed
 - Issue with themes when Chrome crashes
-  [#188](https://github.com/nextgen-networks/snappymail/issues/188)
+  [#188](https://github.com/the-djmaze/snappymail/issues/188)
 - /static/.htaccess as mentioned by @dbiczo in
-  [#895](https://github.com/nextgen-networks/snappymail/issues/895)
+  [#895](https://github.com/the-djmaze/snappymail/issues/895)
 - Update nb-NO language
-  [#896](https://github.com/nextgen-networks/snappymail/pull/896) by @master3395
+  [#896](https://github.com/the-djmaze/snappymail/pull/896) by @master3395
 - \RainLoop\Utils::SetCookie() to \SnappyMail\Cookies::set()
 - Merge \MailSo\Base\Utils::RecRmDir() and \MailSo\Base\Utils::RecTimeDirRemove()
 
 ### Fixed
 - Two issues with images being delivered via ProxyExternal
-  [#887](https://github.com/nextgen-networks/snappymail/issues/887)
+  [#887](https://github.com/the-djmaze/snappymail/issues/887)
 - Multiple accounts conflicts when using multiple tabs
-  [#892](https://github.com/nextgen-networks/snappymail/issues/892)
+  [#892](https://github.com/the-djmaze/snappymail/issues/892)
 - Spaces in attached file names are not preserved
-  [#893](https://github.com/nextgen-networks/snappymail/issues/893)
+  [#893](https://github.com/the-djmaze/snappymail/issues/893)
 - Prevent empty area scroll on body
 
 ### Removed
 - Floating HTML text formatting menu on mobile
-  [#828](https://github.com/nextgen-networks/snappymail/issues/828)
+  [#828](https://github.com/the-djmaze/snappymail/issues/828)
 - Unused AUTH_SPEC_LOGOUT_TOKEN_KEY and AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY
 
 
@@ -1498,9 +1498,9 @@
 ### Added
 - Support RFC 8689
 - Nextcloud move themes outside of app folder
-  [#875](https://github.com/nextgen-networks/snappymail/issues/875)
+  [#875](https://github.com/the-djmaze/snappymail/issues/875)
 - Add check to unregister system addressbook
-  [#879](https://github.com/nextgen-networks/snappymail/pull/879) by @akhil1508
+  [#879](https://github.com/the-djmaze/snappymail/pull/879) by @akhil1508
 
 ### Changed
 - material-design checkbox use hidden input for accessibility
@@ -1512,20 +1512,20 @@
 - PHP < 8.1 ini_set() only accepts strings when `declare(strict_types=1);` is used
 - Nextcloud also fix settings on upgrade
 - Nextcloud workaround upgrade OPCache issue
-  [#880](https://github.com/nextgen-networks/snappymail/issues/880)
+  [#880](https://github.com/the-djmaze/snappymail/issues/880)
 - SMTP error while using PHP mail()
-  [#884](https://github.com/nextgen-networks/snappymail/issues/884)
+  [#884](https://github.com/the-djmaze/snappymail/issues/884)
 - Cannot create folder
-  [#885](https://github.com/nextgen-networks/snappymail/issues/885)
+  [#885](https://github.com/the-djmaze/snappymail/issues/885)
 - Image stretching when image hasd max-width
-  [#869](https://github.com/nextgen-networks/snappymail/issues/869)
+  [#869](https://github.com/the-djmaze/snappymail/issues/869)
 
 
 ## 2.25.0 – 2023-01-26
 
 ### Changed
 - Right margin to folder search input wrapper
-  [#871](https://github.com/nextgen-networks/snappymail/pull/871) by @codiflow
+  [#871](https://github.com/the-djmaze/snappymail/pull/871) by @codiflow
 - Almost all request params now use JavaScript camelCase instead of CamelCase
 - #rl-content to use flex for better layout control
 - Decode some Copernica link tracking
@@ -1536,11 +1536,11 @@
 
 ### Fixed
 - CardDAV sync error - Request aborted
-  [#866](https://github.com/nextgen-networks/snappymail/issues/866)
+  [#866](https://github.com/the-djmaze/snappymail/issues/866)
 - PDF not possible to be viewed in the browser
-  [#867](https://github.com/nextgen-networks/snappymail/issues/867)
+  [#867](https://github.com/the-djmaze/snappymail/issues/867)
 - ZIP Files cannot be uploaded from Desktop to attachments (other files can be uploaded)
-  [#878](https://github.com/nextgen-networks/snappymail/issues/878)
+  [#878](https://github.com/the-djmaze/snappymail/issues/878)
 - Mobile view issues with leftside menu
 - Default messageListItem border left color for dark mode
 - Nextcloud layout in ?admin
@@ -1555,24 +1555,24 @@
 - Preparations for RFC 8689
 - Add admin setting for the contacts suggestions limit
 - A button to clear folder search input field
-  [#847](https://github.com/nextgen-networks/snappymail/pull/847) by @codiflow
+  [#847](https://github.com/the-djmaze/snappymail/pull/847) by @codiflow
 - Preparations for custom SMTP credentials handling for
-  [#859](https://github.com/nextgen-networks/snappymail/issues/859)
-  [#458](https://github.com/nextgen-networks/snappymail/issues/458)
-  [#431](https://github.com/nextgen-networks/snappymail/issues/431)
-  [#233](https://github.com/nextgen-networks/snappymail/issues/233)
+  [#859](https://github.com/the-djmaze/snappymail/issues/859)
+  [#458](https://github.com/the-djmaze/snappymail/issues/458)
+  [#431](https://github.com/the-djmaze/snappymail/issues/431)
+  [#233](https://github.com/the-djmaze/snappymail/issues/233)
 
 ### Changed
 - Display the time of emails, not just the size and date
-  [#843](https://github.com/nextgen-networks/snappymail/issues/843)
+  [#843](https://github.com/the-djmaze/snappymail/issues/843)
 - Made thread number a bit wider
-  [#844](https://github.com/nextgen-networks/snappymail/issues/844)
+  [#844](https://github.com/the-djmaze/snappymail/issues/844)
 - Improved contacts suggestions limit handling
-  [#849](https://github.com/nextgen-networks/snappymail/issues/849)
+  [#849](https://github.com/the-djmaze/snappymail/issues/849)
 - 64-bit PHP was required
-  [#852](https://github.com/nextgen-networks/snappymail/issues/852)
+  [#852](https://github.com/the-djmaze/snappymail/issues/852)
 - Update fr-FR translations
-  [#854](https://github.com/nextgen-networks/snappymail/pull/854) by @dominiquefournier
+  [#854](https://github.com/the-djmaze/snappymail/pull/854) by @dominiquefournier
 - Move createDomain & createDomainAlias buttons below table
 - Move some Nextcloud SnappyMailHelper code to new InstallStep
 - Cleanup messages cache handling
@@ -1580,18 +1580,18 @@
 
 ### Fixed
 - LiteSpeed does not disable compression although .htaccess says so
-  [#525](https://github.com/nextgen-networks/snappymail/issues/525)
-  [#855](https://github.com/nextgen-networks/snappymail/issues/855)
+  [#525](https://github.com/the-djmaze/snappymail/issues/525)
+  [#855](https://github.com/the-djmaze/snappymail/issues/855)
 - "Move to folder" functionality displays in desktop view when on mobile
-  [#858](https://github.com/nextgen-networks/snappymail/issues/858)
+  [#858](https://github.com/the-djmaze/snappymail/issues/858)
 - matchAnyRule() Return value must be of type bool, none returned
 - Unknown CSP directive 'strict-dynamic' in Safari 13.1.2
 - Wrong timeStyle issue in Safari 13.1.2
 - Language SETTINGS_LABELS got lost
 - Nextcloud failed loading app data when path didn't end with /
-  [#864](https://github.com/nextgen-networks/snappymail/issues/864)
+  [#864](https://github.com/the-djmaze/snappymail/issues/864)
 - Workaround Nextcloud session_start issue
-  [#813](https://github.com/nextgen-networks/snappymail/issues/813)
+  [#813](https://github.com/the-djmaze/snappymail/issues/813)
 
 ## 2.24.5 – 2023-01-12
 
@@ -1599,40 +1599,40 @@
 - Support for search criterias ON, SENTON, SENTSINCE and SENTBEFORE
 - New 'forward as attachment' glyph
 - NC integration app metadata: add links to admin and dev docs
-  [#820](https://github.com/nextgen-networks/snappymail/pull/820) by @p-bo
+  [#820](https://github.com/the-djmaze/snappymail/pull/820) by @p-bo
 - Clicking on messagelist grouped date/from searches on that date/from
-  [#815](https://github.com/nextgen-networks/snappymail/issues/815)
+  [#815](https://github.com/the-djmaze/snappymail/issues/815)
 - Nextcloud Improved file picker layout
-  [#825](https://github.com/nextgen-networks/snappymail/issues/825)
+  [#825](https://github.com/the-djmaze/snappymail/issues/825)
 
 ### Changed
 - Move release.php to cli/release.php
 - Moved sort options "FROM" direct below "DATE" for better understanding
 - Added DAV path error to log for
-  [#822](https://github.com/nextgen-networks/snappymail/issues/822)
+  [#822](https://github.com/the-djmaze/snappymail/issues/822)
 - Resolve layout issues by changing from `fixed` to `relative`
-  [#686](https://github.com/nextgen-networks/snappymail/issues/686)
+  [#686](https://github.com/the-djmaze/snappymail/issues/686)
 - Cache handling of messagelist changed due to etag issues
 - Improve german and italian translation
-  [#846](https://github.com/nextgen-networks/snappymail/pull/846) by @cm-schl
+  [#846](https://github.com/the-djmaze/snappymail/pull/846) by @cm-schl
 
 ### Fixed
 - Searching on Nextcloud search
-  [#787](https://github.com/nextgen-networks/snappymail/issues/787)
+  [#787](https://github.com/the-djmaze/snappymail/issues/787)
 - Workaround another Nextcloud disallowed .htaccess
-  [#790](https://github.com/nextgen-networks/snappymail/issues/790)
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
 - Compact display of folders in nextcloud
-  [#824](https://github.com/nextgen-networks/snappymail/pull/824) by @makoehr
+  [#824](https://github.com/the-djmaze/snappymail/pull/824) by @makoehr
 - Admin -> Contacts PDO test failed when using different AddressBookInterface
 - KolabAddressBook errors
 - Forgot debug js/css setting change in Nextcloud
 - Typed property MailSo\Mail\MessageListParams::$sSearch must not be accessed before initialization
 - Unable to change font/text colour when composing message using Safari
-  [#826](https://github.com/nextgen-networks/snappymail/issues/826)
+  [#826](https://github.com/the-djmaze/snappymail/issues/826)
 - auth_logging failed
-  [#489](https://github.com/nextgen-networks/snappymail/issues/489)
+  [#489](https://github.com/the-djmaze/snappymail/issues/489)
 - Class "RainLoop\Actions\Notifications" not found
-  [#839](https://github.com/nextgen-networks/snappymail/issues/839)
+  [#839](https://github.com/the-djmaze/snappymail/issues/839)
 
 ### Removed
 - 'set-version' argument for release.php
@@ -1645,16 +1645,16 @@
 
 ### Changed
 - A lot of MessageList sorting improvements
-  [#796](https://github.com/nextgen-networks/snappymail/issues/796)
+  [#796](https://github.com/the-djmaze/snappymail/issues/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/nextgen-networks/snappymail/issues/790)
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
 - Searching on Nextcloud search failed
-  [#787](https://github.com/nextgen-networks/snappymail/issues/787)
+  [#787](https://github.com/the-djmaze/snappymail/issues/787)
 
 
 ## 2.24.3 – 2022-12-28
@@ -1664,32 +1664,32 @@
 
 ### Fixed
 - F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
-  [#800](https://github.com/nextgen-networks/snappymail/issues/800)
+  [#800](https://github.com/the-djmaze/snappymail/issues/800)
 - Switching accounts does not work anymore with 2.24.2
-  [#802](https://github.com/nextgen-networks/snappymail/issues/802)
+  [#802](https://github.com/the-djmaze/snappymail/issues/802)
 
 
 ## 2.24.2 – 2022-12-27
 
 ### Changed
 - Disable sorting when viewing message thread
-  [#445](https://github.com/nextgen-networks/snappymail/issues/445)
+  [#445](https://github.com/the-djmaze/snappymail/issues/445)
 - Update Chinese translation
-  [#794](https://github.com/nextgen-networks/snappymail/pull/794) by @mayswind
+  [#794](https://github.com/the-djmaze/snappymail/pull/794) by @mayswind
 - No need to call IMAP EXAMINE when current folder already SELECT
 - Thread view now has tree indentation
 
 ### Fixed
 - Nextcloud failed on Integrity check
-  [#790](https://github.com/nextgen-networks/snappymail/issues/790)
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
 - Deleting message fails with message "Cannot move message" on hMailServer
-  [#793](https://github.com/nextgen-networks/snappymail/issues/793)
+  [#793](https://github.com/the-djmaze/snappymail/issues/793)
 - List messages per day feature is enabled by default and breaks sorting
-  [#796](https://github.com/nextgen-networks/snappymail/issues/796)
+  [#796](https://github.com/the-djmaze/snappymail/issues/796)
 - Custom page login not working for first time due to smctoken security
-  [#798](https://github.com/nextgen-networks/snappymail/issues/798)
+  [#798](https://github.com/the-djmaze/snappymail/issues/798)
 - Message list is always empty due to wrong implementation of RFC 8474
-  [#799](https://github.com/nextgen-networks/snappymail/issues/799)
+  [#799](https://github.com/the-djmaze/snappymail/issues/799)
 
 
 ## 2.24.1 – 2022-12-23
@@ -1698,15 +1698,15 @@
 - Intl.DateTimeFormat() into toLocaleString() for iOS < 14
 - Cleanup locale date/time handling
 - Make MessageList per day optional
-  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
 
 ### Fixed
 - Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization
-  [#792](https://github.com/nextgen-networks/snappymail/issues/792)
+  [#792](https://github.com/the-djmaze/snappymail/issues/792)
 - Attachments in mails in 2.24 not loading in reply/forward
-  [#789](https://github.com/nextgen-networks/snappymail/issues/789)
+  [#789](https://github.com/the-djmaze/snappymail/issues/789)
 - Rollback #280 due to complications
-  [#280](https://github.com/nextgen-networks/snappymail/issues/280)
+  [#280](https://github.com/the-djmaze/snappymail/issues/280)
 
 
 ## 2.24.0 – 2022-12-22
@@ -1719,24 +1719,24 @@
 
 ### Changed
 - MessageList now grouped/split per day
-  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
 - Account switcher still shown when allow_additional_accounts is set to Off
-  [#280](https://github.com/nextgen-networks/snappymail/issues/280)
+  [#280](https://github.com/the-djmaze/snappymail/issues/280)
 - PHP classes use typed properties
 - Speedup Contacts Suggestions handling
 - Check SMTP SIZE
-  [#779](https://github.com/nextgen-networks/snappymail/issues/779)
+  [#779](https://github.com/the-djmaze/snappymail/issues/779)
 
 ### Fixed
 - Handle multiple DKIM signatures authentication results
 - Reload admin extensions on update
 - SieveClient quoted string parsing failed
 - Invalid Attachments (PDF)
-  [#466](https://github.com/nextgen-networks/snappymail/issues/466)
+  [#466](https://github.com/the-djmaze/snappymail/issues/466)
 - Email HTML images rendering issue
-  [#564](https://github.com/nextgen-networks/snappymail/issues/564)
+  [#564](https://github.com/the-djmaze/snappymail/issues/564)
 - "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
-  [#780](https://github.com/nextgen-networks/snappymail/issues/780)
+  [#780](https://github.com/the-djmaze/snappymail/issues/780)
 
 ### Removed
 - Some unused plugin hooks to improve Action handling speed
@@ -1751,18 +1751,18 @@
 - Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
 - SnappyMail\Imap\Sync now matches folders based on JMAP role
 - Added the new imapsync.php command line script for
-  [#744](https://github.com/nextgen-networks/snappymail/issues/744)
+  [#744](https://github.com/the-djmaze/snappymail/issues/744)
 - Added manual setting for 12/24h clock
-  [#760](https://github.com/nextgen-networks/snappymail/issues/760)
+  [#760](https://github.com/the-djmaze/snappymail/issues/760)
 - Add options to mark the message I'm viewing as unread and return to the inbox
-  [#766](https://github.com/nextgen-networks/snappymail/issues/766)
+  [#766](https://github.com/the-djmaze/snappymail/issues/766)
 
 ### Fixed
 - Extension menu shows only some available extensions
-  [#778](https://github.com/nextgen-networks/snappymail/issues/778)
-- New solution for [#423](https://github.com/nextgen-networks/snappymail/issues/423) due to [#774](https://github.com/nextgen-networks/snappymail/issues/774)
+  [#778](https://github.com/the-djmaze/snappymail/issues/778)
+- New solution for [#423](https://github.com/the-djmaze/snappymail/issues/423) due to [#774](https://github.com/the-djmaze/snappymail/issues/774)
 - Avatars extension error on smartphone
-  [#764](https://github.com/nextgen-networks/snappymail/issues/764)
+  [#764](https://github.com/the-djmaze/snappymail/issues/764)
 - Don't fetch Unread count for main account
 - CSS .e-checkbox.material-design invisible on show/hide
 
@@ -1771,33 +1771,33 @@
 
 ### Added
 - Show the number of unread mails on all mail addresses/accounts
-  [#437](https://github.com/nextgen-networks/snappymail/issues/437)
+  [#437](https://github.com/the-djmaze/snappymail/issues/437)
 - Show OpenSSL version in Admin => About
 
 ### Changed
 - Redirect to login page instead of "invalid token" popup
-  [#752](https://github.com/nextgen-networks/snappymail/issues/752)
+  [#752](https://github.com/the-djmaze/snappymail/issues/752)
 - Make all dialogs fit in mobile view
 - Changed some Plugin hooks for better handling:
 	* json.action-pre-call => json.before-{actionname}
 	* json.action-post-call => json.after-{actionname}
 - Cleaner accounts list in systemdropdown
 - Multiple imapConnect handling for new import mail feature
-  [#744](https://github.com/nextgen-networks/snappymail/issues/744)
+  [#744](https://github.com/the-djmaze/snappymail/issues/744)
 
 ### Fixed
 - Loosing HTML signature in account identity under settings
-  [#750](https://github.com/nextgen-networks/snappymail/issues/750)
+  [#750](https://github.com/the-djmaze/snappymail/issues/750)
 - Plugin configuration did not load anymore when type was SELECTION
-  [#753](https://github.com/nextgen-networks/snappymail/pull/753) by @cm-schl
+  [#753](https://github.com/the-djmaze/snappymail/pull/753) by @cm-schl
 - Nextcloud Default theme shows gray text on gray background
-  [#754](https://github.com/nextgen-networks/snappymail/issues/754)
+  [#754](https://github.com/the-djmaze/snappymail/issues/754)
 - Only run JSON hooks when $sAction is set
-  [#755](https://github.com/nextgen-networks/snappymail/issues/755)
+  [#755](https://github.com/the-djmaze/snappymail/issues/755)
 - Unsupported SASL mechanism OAUTHBEARER
-  [#756](https://github.com/nextgen-networks/snappymail/issues/756)
-  [#758](https://github.com/nextgen-networks/snappymail/issues/758)
-  [#759](https://github.com/nextgen-networks/snappymail/issues/759)
+  [#756](https://github.com/the-djmaze/snappymail/issues/756)
+  [#758](https://github.com/the-djmaze/snappymail/issues/758)
+  [#759](https://github.com/the-djmaze/snappymail/issues/759)
 - border-box issue with .buttonCompose
 
 ### Removed
@@ -1808,15 +1808,15 @@
 
 ### Changed
 - Scroll bar with the mobile version in "Advanced search" screen
-  [#712](https://github.com/nextgen-networks/snappymail/issues/712)
+  [#712](https://github.com/the-djmaze/snappymail/issues/712)
 
 ### Fixed
 - Undefined property: MailSo\Mail\FolderCollection::$capabilities
 - PHP 8.2 Creation of dynamic property is deprecated
 - Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
-  [#745](https://github.com/nextgen-networks/snappymail/issues/745)
-  [#746](https://github.com/nextgen-networks/snappymail/issues/746)
-  [#748](https://github.com/nextgen-networks/snappymail/issues/748)
+  [#745](https://github.com/the-djmaze/snappymail/issues/745)
+  [#746](https://github.com/the-djmaze/snappymail/issues/746)
+  [#748](https://github.com/the-djmaze/snappymail/issues/748)
 - Admin domain test undefined matched domain should say email@example matched domain
 
 
@@ -1824,15 +1824,15 @@
 
 ### Changed
 - Narrow MessageList wraps star icon
-  [#737](https://github.com/nextgen-networks/snappymail/issues/737)
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
 - Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
-  [#745](https://github.com/nextgen-networks/snappymail/issues/745)
+  [#745](https://github.com/the-djmaze/snappymail/issues/745)
 - No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
 - Update Chinese translation by @mayswind
 
 ### Fixed
 - PluginProperty DefaultValue contained array while it should not
-  [#741](https://github.com/nextgen-networks/snappymail/issues/741)
+  [#741](https://github.com/the-djmaze/snappymail/issues/741)
 
 ### Removed
 - IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
@@ -1843,7 +1843,7 @@
 ### Added
 - Support plugin minified .min.js and .min.css
 - ZIP Download multiple emails
-  [#717](https://github.com/nextgen-networks/snappymail/issues/717)
+  [#717](https://github.com/the-djmaze/snappymail/issues/717)
 
 ### Changed
 - Replaced some data-bind="click: function(){} with object functions to prevent eval()
@@ -1852,12 +1852,12 @@
 ### Fixed
 - Settings Themes style due to border-box change
 - "Remember me" failed due to v2.22.4 Session token change
-  [#719](https://github.com/nextgen-networks/snappymail/issues/719)
-  [#731](https://github.com/nextgen-networks/snappymail/issues/731)
+  [#719](https://github.com/the-djmaze/snappymail/issues/719)
+  [#731](https://github.com/the-djmaze/snappymail/issues/731)
 
 ### Removed
 - Vacation filter: Button to add recipients (+)
-  [#728](https://github.com/nextgen-networks/snappymail/issues/728)
+  [#728](https://github.com/the-djmaze/snappymail/issues/728)
 
 
 ## 2.22.4 – 2022-11-28
@@ -1865,19 +1865,19 @@
 ### Changed
 - Contacts dialog layout using flex
 - Session token is related to the user agent string
-  [#713](https://github.com/nextgen-networks/snappymail/issues/713)
+  [#713](https://github.com/the-djmaze/snappymail/issues/713)
 - Better browser cache handling for avatars plugin
-  [#714](https://github.com/nextgen-networks/snappymail/issues/714)
+  [#714](https://github.com/the-djmaze/snappymail/issues/714)
 - Force HTML editor when set as default when replying to message
-  [#355](https://github.com/nextgen-networks/snappymail/issues/355)
+  [#355](https://github.com/the-djmaze/snappymail/issues/355)
 
 ### Fixed
 - Contact Error - object Object
-  [#716](https://github.com/nextgen-networks/snappymail/issues/716)
+  [#716](https://github.com/the-djmaze/snappymail/issues/716)
 - Unable to move messages to different folder by drag and drop
-  [#710](https://github.com/nextgen-networks/snappymail/issues/710)
+  [#710](https://github.com/the-djmaze/snappymail/issues/710)
 - v2.22.3 unknown error
-  [#709https://github.com/nextgen-networks/snappymail/issues/709)
+  [#709https://github.com/the-djmaze/snappymail/issues/709)
 
 
 ## 2.22.3 – 2022-11-25
@@ -1887,71 +1887,71 @@
 
 ### Changed
 - Improved cPanel integration
-  [#697](https://github.com/nextgen-networks/snappymail/issues/697)
+  [#697](https://github.com/the-djmaze/snappymail/issues/697)
 - Update to OpenPGP.js v5.5.0
 
 ### Fixed
 - drag & drop folder expansion
-  [#707](https://github.com/nextgen-networks/snappymail/issues/707)
+  [#707](https://github.com/the-djmaze/snappymail/issues/707)
 - Save selected messages as .eml in Nextcloud failed
-  [#704](https://github.com/nextgen-networks/snappymail/issues/704)
+  [#704](https://github.com/the-djmaze/snappymail/issues/704)
 
 
 ## 2.22.2 – 2022-11-24
 
 ### Added
 - Support cPanel
-  [#697](https://github.com/nextgen-networks/snappymail/issues/697)
+  [#697](https://github.com/the-djmaze/snappymail/issues/697)
 
 
 ## 2.22.1 – 2022-11-23
 
 ### Added
 - AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
-  [#115](https://github.com/nextgen-networks/snappymail/issues/115)
+  [#115](https://github.com/the-djmaze/snappymail/issues/115)
 
 ### Changed
 - All the attachment zone is not clickable, even if the cursor is a hand
-  [#691](https://github.com/nextgen-networks/snappymail/issues/691)
+  [#691](https://github.com/the-djmaze/snappymail/issues/691)
 - Different approach for "update button duplicated in admin panel"
-  [#677](https://github.com/nextgen-networks/snappymail/issues/677)
+  [#677](https://github.com/the-djmaze/snappymail/issues/677)
 - Better drag & drop solution for leftPanel
 
 ### Fixed
 - The page does not change after batch deletion
-  [#684](https://github.com/nextgen-networks/snappymail/issues/684)
+  [#684](https://github.com/the-djmaze/snappymail/issues/684)
 - Prevent domain uppercase issues found in
-  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
 - Login invalid response: VXNlcm5hbWU6CG
-  [#693](https://github.com/nextgen-networks/snappymail/issues/693)
+  [#693](https://github.com/the-djmaze/snappymail/issues/693)
 
 
 ## 2.21.4 – 2022-11-22
 
 ### Added
 - Added domain matcher test for
-  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
 - Download all Attachments of selected Emails
-  [#361](https://github.com/nextgen-networks/snappymail/issues/361)
+  [#361](https://github.com/the-djmaze/snappymail/issues/361)
 
 ### Changed
 - Log current shortcuts scope for
-  [#690](https://github.com/nextgen-networks/snappymail/issues/690)
+  [#690](https://github.com/the-djmaze/snappymail/issues/690)
 - CSS everything to be box-sizing: border-box;
 - Make messageview a bit larger so that it is the same height as the messagelist
 - Cleanup and rearrange some fontastic glyphs
 - Also show From email address by default
-  [#683](https://github.com/nextgen-networks/snappymail/issues/683)
+  [#683](https://github.com/the-djmaze/snappymail/issues/683)
 
 ### Fixed
 - Contact.display() returns [object Object]
 - When left panel disabled and drag messages, show it
 - Issue with admin domain connection type settings selectbox
-  [#689](https://github.com/nextgen-networks/snappymail/issues/689)
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
 - Mobile View on cellphones: automatic scrolling not working near the visual keyboard
-  [#686](https://github.com/nextgen-networks/snappymail/issues/686)
+  [#686](https://github.com/the-djmaze/snappymail/issues/686)
 - Unable to separate runtime from installation
-  [#685](https://github.com/nextgen-networks/snappymail/issues/685)
+  [#685](https://github.com/the-djmaze/snappymail/issues/685)
 
 ### Removed
 - Removed inline parameter of checkbox and select components
@@ -1964,18 +1964,18 @@
 
 ### Changed
 - Increase visible reading area for small screens
-  [#672](https://github.com/nextgen-networks/snappymail/issues/672)
+  [#672](https://github.com/the-djmaze/snappymail/issues/672)
 - Improved message spam score detailed view
 - Improved DAV connection logging
 
 ### Fixed
 - Handling attachments MIME type / content-type
 - Message responsive resizing width/height of elements
-  [#678](https://github.com/nextgen-networks/snappymail/issues/678)
+  [#678](https://github.com/the-djmaze/snappymail/issues/678)
 - Focus on textarea when creating a new plain text email
-  [#501](https://github.com/nextgen-networks/snappymail/issues/501)
+  [#501](https://github.com/the-djmaze/snappymail/issues/501)
 - CardDav remove photos of my contacts when synchronizing
-  [#679](https://github.com/nextgen-networks/snappymail/issues/679)
+  [#679](https://github.com/the-djmaze/snappymail/issues/679)
 
 ### Removed
 - \MailSo\Mime\Enumerations\MimeType
@@ -1983,21 +1983,21 @@
 ### Nextcloud
 - Use fontastic in Nextcloud Files selector dialog
 - Firefox < 98 dialogs
-  [#673](https://github.com/nextgen-networks/snappymail/issues/673)
+  [#673](https://github.com/the-djmaze/snappymail/issues/673)
 
 ## 2.21.2 – 2022-11-15
 
 ### Added
 - Allow browser Spellchecker
-  [#574](https://github.com/nextgen-networks/snappymail/issues/574)
+  [#574](https://github.com/the-djmaze/snappymail/issues/574)
 - Decode MIME charset of .EML attachments
-  [#662](https://github.com/nextgen-networks/snappymail/issues/662)
+  [#662](https://github.com/the-djmaze/snappymail/issues/662)
 
 ### Changed
 - Increase message visible text area
-  [#672](https://github.com/nextgen-networks/snappymail/issues/672)
+  [#672](https://github.com/the-djmaze/snappymail/issues/672)
 - When copy/paste image use the raw data instead of clipboard HTML
-  [#654](https://github.com/nextgen-networks/snappymail/issues/654)
+  [#654](https://github.com/the-djmaze/snappymail/issues/654)
 - When application.ini debug.enable is true, also debug js and css
 - JavaScript rl.setWindowTitle() renamed to rl.setTitle()
 
@@ -2006,28 +2006,28 @@
 
 ### Nextcloud
 - Workaround Nextcloud calendar crashes
-  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
-  [#661](https://github.com/nextgen-networks/snappymail/issues/661)
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#661](https://github.com/the-djmaze/snappymail/issues/661)
 - Added share public/internal file link
-  [#569](https://github.com/nextgen-networks/snappymail/issues/569)
+  [#569](https://github.com/the-djmaze/snappymail/issues/569)
 
 
 ## 2.21.1 – 2022-11-13
 
 ### Fixed
 - Crypt crashes when Sodium not installed
-  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
-  [#657](https://github.com/nextgen-networks/snappymail/issues/657)
-  [#663](https://github.com/nextgen-networks/snappymail/issues/663)
-  [#664](https://github.com/nextgen-networks/snappymail/issues/664)
-  [#668](https://github.com/nextgen-networks/snappymail/issues/668)
-  [#669](https://github.com/nextgen-networks/snappymail/issues/669)
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+  [#657](https://github.com/the-djmaze/snappymail/issues/657)
+  [#663](https://github.com/the-djmaze/snappymail/issues/663)
+  [#664](https://github.com/the-djmaze/snappymail/issues/664)
+  [#668](https://github.com/the-djmaze/snappymail/issues/668)
+  [#669](https://github.com/the-djmaze/snappymail/issues/669)
 - Personalised favicon not working - default Snappymail favicon showing
-  [#665](https://github.com/nextgen-networks/snappymail/issues/665)
+  [#665](https://github.com/the-djmaze/snappymail/issues/665)
 
 ### Nextcloud
 - v23 ContentSecurityPolicy versions issue
-  [#666](https://github.com/nextgen-networks/snappymail/issues/666)
+  [#666](https://github.com/the-djmaze/snappymail/issues/666)
 
 
 ## 2.21.0 – 2022-11-11
@@ -2035,11 +2035,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/nextgen-networks/snappymail/issues/643)
+  [#643](https://github.com/the-djmaze/snappymail/issues/643)
 - Allow an account name/label
-  [#571](https://github.com/nextgen-networks/snappymail/issues/571)
+  [#571](https://github.com/the-djmaze/snappymail/issues/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -2050,13 +2050,13 @@
   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](https://github.com/nextgen-networks/snappymail/issues/638)
+  [#638](https://github.com/the-djmaze/snappymail/issues/638)
 
 ### Fixed
 - ldap-identities-plugin
-  [#647](https://github.com/nextgen-networks/snappymail/pull/647) by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -2067,7 +2067,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/nextgen-networks/snappymail/issues/642)
+  [#642](https://github.com/the-djmaze/snappymail/issues/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -2075,8 +2075,8 @@
 
 ### Nextcloud
 - Improved workaround for Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -2087,8 +2087,8 @@
 
 ### Nextcloud
 - Workaround Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -2096,7 +2096,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -2104,24 +2104,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/nextgen-networks/snappymail/issues/635)
+  [#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/nextgen-networks/snappymail/issues/625)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -2129,11 +2129,11 @@
 ### Fixed
 - pgpDecrypt() using MailVelope the decrypt message was not green
 - Shift + F in search bar resulted in forwarding message
-  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -2150,11 +2150,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
 - Update readme
-  [#617](https://github.com/nextgen-networks/snappymail/pull/617) by @cm-schl
+  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
 
 
 ## 2.20.0 – 2022-11-03
@@ -2172,7 +2172,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -2184,17 +2184,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -2205,11 +2205,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
@@ -2230,11 +2230,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/nextgen-networks/snappymail/issues/643)
+  [#643](https://github.com/the-djmaze/snappymail/issues/643)
 - Allow an account name/label
-  [#571](https://github.com/nextgen-networks/snappymail/issues/571)
+  [#571](https://github.com/the-djmaze/snappymail/issues/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -2245,13 +2245,13 @@
   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](https://github.com/nextgen-networks/snappymail/issues/638)
+  [#638](https://github.com/the-djmaze/snappymail/issues/638)
 
 ### Fixed
 - ldap-identities-plugin
-  [#647](https://github.com/nextgen-networks/snappymail/pull/647) by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/nextgen-networks/snappymail/issues/641)
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -2262,7 +2262,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/nextgen-networks/snappymail/issues/642)
+  [#642](https://github.com/the-djmaze/snappymail/issues/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -2270,8 +2270,8 @@
 
 ### Nextcloud
 - Improved workaround for Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -2282,8 +2282,8 @@
 
 ### Nextcloud
 - Workaround Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -2291,7 +2291,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -2299,24 +2299,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/nextgen-networks/snappymail/issues/635)
+  [#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/nextgen-networks/snappymail/issues/625)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -2324,11 +2324,11 @@
 ### Fixed
 - pgpDecrypt() using MailVelope the decrypt message was not green
 - Shift + F in search bar resulted in forwarding message
-  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -2345,11 +2345,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
 - Update readme
-  [#617](https://github.com/nextgen-networks/snappymail/pull/617) by @cm-schl
+  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
 
 
 ## 2.20.0 – 2022-11-03
@@ -2367,7 +2367,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -2379,17 +2379,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -2400,11 +2400,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
diff --git a/build/deb.php b/build/deb.php
index f866360d3..714f659b8 100755
--- a/build/deb.php
+++ b/build/deb.php
@@ -53,7 +53,7 @@ passthru('mv '
 
 passthru('rm -dfr '.escapeshellarg(DEB_DEST_DIR));
 
-// https://github.com/nextgen-networks/snappymail/issues/185#issuecomment-1059420588
+// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
 $cwd = getcwd();
 chdir($TARGET_DIR);
 passthru('dpkg-scanpackages . /dev/null > '.escapeshellarg($TARGET_DIR . 'Packages'));
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 4f1131805..57b1f3d26 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -308,16 +308,16 @@ export const
 			// Not supported by <template> element
 //			.replace(/<!doctype[^>]*>/gi, '')
 //			.replace(/<\?xml[^>]*\?>/gi, '')
-			// https://github.com/nextgen-networks/snappymail/issues/1860
+			// https://github.com/the-djmaze/snappymail/issues/1860
 			.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
 			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
 //			.replace(/<\/?(html|head)[^>]*>/gi, '')
-			// Fix Reddit https://github.com/nextgen-networks/snappymail/issues/540
+			// Fix Reddit https://github.com/the-djmaze/snappymail/issues/540
 			.replace(/<span class="preview-text"[\s\S]+?<\/span>/, '')
-			// https://github.com/nextgen-networks/snappymail/issues/900
+			// https://github.com/the-djmaze/snappymail/issues/900
 			.replace(/\u2028/g,' ')
-			// https://github.com/nextgen-networks/snappymail/issues/1415
+			// https://github.com/the-djmaze/snappymail/issues/1415
 			.replace(/<br>\s*<\/p>/gi,'</p>')
 			.trim();
 		html = '';
@@ -343,7 +343,7 @@ export const
 			}
 		});
 
-		// https://github.com/nextgen-networks/snappymail/issues/1125
+		// https://github.com/the-djmaze/snappymail/issues/1125
 		tmpl.content.querySelectorAll(keepTagContent).forEach(oElement => replaceWithChildren(oElement));
 
 		tmpl.content.querySelectorAll(
@@ -359,7 +359,7 @@ export const
 		});
 */
 
-		// https://github.com/nextgen-networks/snappymail/issues/1641
+		// https://github.com/the-djmaze/snappymail/issues/1641
 		let body = tmpl.content.querySelector('.mail-body');
 		[...tmpl.content.querySelectorAll('.mail-body + .mail-body')]
 			.forEach(oElement => body.append(...oElement.childNodes));
@@ -626,7 +626,7 @@ export const
 					setAttribute('data-x-style-broken-urls', JSON.stringify(urls_broken));
 				}
 /*
-				// https://github.com/nextgen-networks/snappymail/issues/1082
+				// https://github.com/the-djmaze/snappymail/issues/1082
 				if (11 > pInt(oStyle.fontSize)) {
 					oStyle.removeProperty('font-size');
 				}
@@ -775,7 +775,7 @@ export const
 		plain = plain.toString()
 			.replace(/\r/g, '')
 			.replace(/^>[> ]>+/gm, ([match]) => (match ? match.replace(/[ ]+/g, '') : match))
-			// https://github.com/nextgen-networks/snappymail/issues/900
+			// https://github.com/the-djmaze/snappymail/issues/900
 			.replace(/\u2028/g,' ');
 
 		let bIn = false,
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 7d5a8eb4e..503cd793b 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -56,7 +56,7 @@ loadAccountsAndIdentities = () => {
 			);
 
 			// Invoke "Update Identity" pop up right after login
-			// https://github.com/nextgen-networks/snappymail/issues/1689
+			// https://github.com/the-djmaze/snappymail/issues/1689
 			const main = IdentityUserStore.main();
 			main && !main.exists() && setTimeout(()=>editIdentity(main), 1000);
 		}
@@ -69,7 +69,7 @@ loadAccountsAndIdentities = () => {
  */
 download = (link, name = "") => {
 	console.log('download: '+link);
-	// Firefox 98 issue https://github.com/nextgen-networks/snappymail/issues/301
+	// Firefox 98 issue https://github.com/the-djmaze/snappymail/issues/301
 	if (ThemeStore.isMobile() || /firefox/i.test(navigator.userAgent)) {
 		open(link, '_blank');
 		focus();
diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js
index 44ca6f759..c4c6e364f 100644
--- a/dev/Component/EmailAddresses.js
+++ b/dev/Component/EmailAddresses.js
@@ -143,7 +143,7 @@ export class EmailAddressesComponent {
 								datalist.append(new Option(item));
 								chars = Math.max(chars, item.length);
 							});
-							// https://github.com/nextgen-networks/snappymail/issues/368 and #513
+							// https://github.com/the-djmaze/snappymail/issues/368 and #513
 							chars *= 8;
 							if (input.clientWidth < chars) {
 								input.style.width = chars + 'px';
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 3e87d0a2f..b1e50fcad 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -38,13 +38,13 @@ class SquireUI
 		const
 			clr = createElement('input'),
 			doClr = name => input => {
-				// https://github.com/nextgen-networks/snappymail/issues/826
+				// https://github.com/the-djmaze/snappymail/issues/826
 				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
 				clr.style.width = input.offsetWidth + 'px';
 
 				clr.value = '';
 				clr.onchange = () => squire.setStyle({[name]:clr.value});
-				// Chrome 110+ https://github.com/nextgen-networks/snappymail/issues/1199
+				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
 //				clr.oninput = () => squire.setStyle({[name]:clr.value});
 				setTimeout(()=>clr.click(),1);
 			},
@@ -263,7 +263,7 @@ class SquireUI
 
 		clr.type = 'color';
 		toolbar.append(clr);
-		// Chrome https://github.com/nextgen-networks/snappymail/issues/1199
+		// Chrome https://github.com/the-djmaze/snappymail/issues/1199
 		let clrid = 'squire-colors',
 			colorlist = doc.getElementById(clrid),
 			add = hex => colorlist.append(new Option(hex));
diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index 6142b0205..228b4c502 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -438,8 +438,8 @@ export class FolderModel extends AbstractModel {
 /*
 			{
 				// TODO: make this optional in Settings
-				// https://github.com/nextgen-networks/snappymail/issues/457
-				// https://github.com/nextgen-networks/snappymail/issues/567
+				// https://github.com/the-djmaze/snappymail/issues/457
+				// https://github.com/the-djmaze/snappymail/issues/567
 				const
 					unread = this.unreadEmails(),
 					type = this.type();
diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js
index a71c8d8fb..f05af9915 100644
--- a/dev/Remote/AbstractFetch.js
+++ b/dev/Remote/AbstractFetch.js
@@ -47,7 +47,7 @@ fetchJSON = (action, sUrl, params, timeout, jsonCallback) => {
 			params.Action = action;
 		}
 	}
-	// Don't abort, read https://github.com/nextgen-networks/snappymail/issues/487
+	// Don't abort, read https://github.com/the-djmaze/snappymail/issues/487
 //	abort(action, 0, 1);
 	const controller = new AbortController(),
 		signal = controller.signal;
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 1a54dfdc5..337f65240 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -77,7 +77,7 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		 */
 		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
 		/**
-		 * https://github.com/nextgen-networks/snappymail/issues/973
+		 * https://github.com/the-djmaze/snappymail/issues/973
 		Remote.request('GetStoredPGPKeys', (iError, data) => {
 			console.dir([iError, data]);
 		});
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index 56cd11ce9..fddf66882 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -10,7 +10,7 @@ let __themeTimer = 0;
 export const
 	// Also see Styles/_Values.less @maxMobileWidth
 	isMobile = matchMedia('(max-width: 799px)'),
-	// https://github.com/nextgen-networks/snappymail/issues/1150
+	// https://github.com/the-djmaze/snappymail/issues/1150
 //	isSmall = matchMedia('(max-width: 1400px)'),
 
 	ThemeStore = {
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index bd5285027..8afda5478 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -508,7 +508,7 @@ MessagelistUserStore.moveMessages = (
 		} else {
 			MessagelistUserStore.isIncomplete(true);
 
-			// Select next email https://github.com/nextgen-networks/snappymail/issues/968
+			// Select next email https://github.com/the-djmaze/snappymail/issues/968
 			if (currentMessage && 1 == messages.length && SettingsUserStore.showNextMessage()) {
 				let next = MessagelistUserStore.indexOf(currentMessage) + 1;
 				if (0 < next && (next = MessagelistUserStore()[next])) {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index a22d0a2c2..8df8433ee 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -79,7 +79,7 @@ dialog:not(.animate) {
 }
 
 /**
- * https://github.com/nextgen-networks/snappymail/issues/686
+ * https://github.com/the-djmaze/snappymail/issues/686
  */
 @media screen and (max-width: @maxMobileWidth) {
 	dialog {
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index f9c1f3086..d920dfd90 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -17,7 +17,7 @@
 	width: 100%;
 }
 
-/* https://github.com/nextgen-networks/snappymail/issues/1427 */
+/* https://github.com/the-djmaze/snappymail/issues/1427 */
 #V-MailFolderList .e-checkbox {
 	margin: 0 4px;
 	width: calc(100% - 8px);
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index d1955c250..d768ef88f 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -968,7 +968,7 @@ export class ComposePopupView extends AbstractViewPopup {
 				// no default
 			}
 
-			// https://github.com/nextgen-networks/snappymail/issues/491
+			// https://github.com/the-djmaze/snappymail/issues/491
 			tpl.innerHTML = oLastMessage.bodyAsHTML();
 			tpl.content.querySelectorAll('img').forEach(img => {
 				img.src || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index f99339e0f..764655acc 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -269,7 +269,7 @@ export class DomainPopupView extends AbstractViewPopup {
 
 	testConnectionCommand() {
 		this.clearTesting();
-		// https://github.com/nextgen-networks/snappymail/issues/477
+		// https://github.com/the-djmaze/snappymail/issues/477
 		AskPopupView.credentials('IMAP', 'GLOBAL/TEST').then(credentials => {
 			if (credentials) {
 				this.testing(true);
diff --git a/examples/eml/tnef.eml b/examples/eml/tnef.eml
index 9432fc4ce..7709e9ada 100644
--- a/examples/eml/tnef.eml
+++ b/examples/eml/tnef.eml
@@ -10,7 +10,7 @@ Content-Type: text/plain; charset=us-ascii; format=flowed
 Test message body with example TNEF part from
 https://github.com/Yeraze/ytnef
 
-https://github.com/nextgen-networks/snappymail/discussions/1012
+https://github.com/the-djmaze/snappymail/discussions/1012
 
 --=-2UbcDuksJBAwUNBNW7UD
 Content-Type: application/vnd.ms-tnef
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 94316c469..a3d442e96 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
 VERSION=2.38.2
-RUN wget https://github.com/nextgen-networks/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
+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 && \
     find /app/code/snappymail -type d -exec chmod 755 {} \; && \
diff --git a/integrations/nextcloud/snappymail/INSTALL b/integrations/nextcloud/snappymail/INSTALL
index c83f134f5..2e42a4f67 100755
--- a/integrations/nextcloud/snappymail/INSTALL
+++ b/integrations/nextcloud/snappymail/INSTALL
@@ -17,4 +17,4 @@ In the SnappyMail admin prompt, the default login is "admin" and the default pas
 This is it, you are now free to configure SnappyMail as you wish. One important point is the Domains section when you will set up the IMAP/SMTP parameters that shall be associated with the email adresses of your users.
 
 STUCK IN MAINTENANCE:
-https://github.com/nextgen-networks/snappymail/issues/929
+https://github.com/the-djmaze/snappymail/issues/929
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 34b4c04b5..b1a67e0b1 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -25,20 +25,20 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
-		<admin>https://github.com/nextgen-networks/snappymail/wiki/Admin-Manual</admin>
-		<developer>https://github.com/nextgen-networks/snappymail/wiki/Developer-Documentation</developer>
-		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
+		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
+		<admin>https://github.com/the-djmaze/snappymail/wiki/Admin-Manual</admin>
+		<developer>https://github.com/the-djmaze/snappymail/wiki/Developer-Documentation</developer>
+		<website>https://github.com/the-djmaze/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
-	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/nextcloud</repository>
-	<bugs>https://github.com/nextgen-networks/snappymail/issues</bugs>
+	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
+	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud</repository>
+	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="32" />
 		<lib>mbstring</lib>
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
index 4cc69ad29..37613d383 100644
--- a/integrations/nextcloud/snappymail/css/embed.css
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -84,7 +84,7 @@ body > header ul {
 
 /**
  * Firefox < 98
- * https://github.com/nextgen-networks/snappymail/issues/673
+ * https://github.com/the-djmaze/snappymail/issues/673
  */
 #rl-app dialog.polyfill {
 	margin-top: 50px;
@@ -93,7 +93,7 @@ body > header ul {
 
 /**
  * hampoelz
- * https://github.com/nextgen-networks/snappymail/issues/96#issuecomment-1279783076
+ * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
  */
 
 .messageList {
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
index cd81d6b13..6f00cedfe 100644
--- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -48,7 +48,7 @@ class InstallStep implements IRepairStep
 		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
 //		$app_dir = \rtrim(APP_INDEX_ROOT_PATH, '\\/');
 
-		// https://github.com/nextgen-networks/snappymail/issues/790#issuecomment-1366527884
+		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
 		if (!\file_exists($app_dir . '/.htaccess') && \file_exists($app_dir . '/_htaccess')) {
 			\rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
 		}
@@ -125,7 +125,7 @@ class InstallStep implements IRepairStep
 		// check if admins provided additional/custom initial config file
 		// https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#setting-a-single-configuration-value
 		// ex: php occ config:app:set snappymail custom_config_file --value="/path/to/config.php"
-		// https://github.com/nextgen-networks/snappymail/pull/1197
+		// https://github.com/the-djmaze/snappymail/pull/1197
 		try {
 			$customConfigFile = $this->config->getAppValue(Application::APP_ID, 'custom_config_file');
 			if ($customConfigFile) {
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 2fe372a6a..528f5917d 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -82,7 +82,7 @@ class SnappyMailHelper
 				$aCredentials = static::getLoginCredentials();
 /*
 				// NC25+ workaround for Impersonate plugin
-				// https://github.com/nextgen-networks/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
 				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
 				require \OC::$SERVERROOT . '/version.php';
 //				\OC\SystemConfig
@@ -128,7 +128,7 @@ class SnappyMailHelper
 			if ($handle) {
 				\header_remove('Content-Security-Policy');
 				\RainLoop\Service::Handle();
-				// https://github.com/nextgen-networks/snappymail/issues/1069
+				// https://github.com/the-djmaze/snappymail/issues/1069
 				exit;
 //				return new SnappyMailResponse();
 			}
diff --git a/integrations/owncloud/snappymail/CHANGELOG.md b/integrations/owncloud/snappymail/CHANGELOG.md
index e857c6c3e..4d0457f06 100644
--- a/integrations/owncloud/snappymail/CHANGELOG.md
+++ b/integrations/owncloud/snappymail/CHANGELOG.md
@@ -5,16 +5,16 @@
 
 ## Changed
 - A lot of MessageList sorting improvements
-  [#796](https://github.com/nextgen-networks/snappymail/pull/796)
+  [#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/nextgen-networks/snappymail/pull/790)
+  [#790](https://github.com/the-djmaze/snappymail/pull/790)
 - Searching on Nextcloud search failed
-  [#787](https://github.com/nextgen-networks/snappymail/pull/787)
+  [#787](https://github.com/the-djmaze/snappymail/pull/787)
 
 
 ## 2.24.3 – 2022-12-28
@@ -24,32 +24,32 @@
 
 ## Fixed
 - F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
-  [#800](https://github.com/nextgen-networks/snappymail/pull/800)
+  [#800](https://github.com/the-djmaze/snappymail/pull/800)
 - Switching accounts does not work anymore with 2.24.2
-  [#802](https://github.com/nextgen-networks/snappymail/pull/802)
+  [#802](https://github.com/the-djmaze/snappymail/pull/802)
 
 
 ## 2.24.2 – 2022-12-27
 
 ### Changed
 - Disable sorting when viewing message thread
-  [#445](https://github.com/nextgen-networks/snappymail/pull/445)
+  [#445](https://github.com/the-djmaze/snappymail/pull/445)
 - Update Chinese translation by @mayswind
-  [#794](https://github.com/nextgen-networks/snappymail/pull/794)
+  [#794](https://github.com/the-djmaze/snappymail/pull/794)
 - No need to call IMAP EXAMINE when current folder already SELECT
 - Thread view now has tree indentation
 
 ### Fixed
 - Nextcloud failed on Integrity check
-  [#790](https://github.com/nextgen-networks/snappymail/pull/790)
+  [#790](https://github.com/the-djmaze/snappymail/pull/790)
 - Deleting message fails with message "Cannot move message" on hMailServer
-  [#793](https://github.com/nextgen-networks/snappymail/pull/793)
+  [#793](https://github.com/the-djmaze/snappymail/pull/793)
 - List messages per day feature is enabled by default and breaks sorting
-  [#796](https://github.com/nextgen-networks/snappymail/pull/796)
+  [#796](https://github.com/the-djmaze/snappymail/pull/796)
 - Custom page login not working for first time due to smctoken security
-  [#798](https://github.com/nextgen-networks/snappymail/pull/798)
+  [#798](https://github.com/the-djmaze/snappymail/pull/798)
 - Message list is always empty due to wrong implementation of RFC 8474
-  [#799](https://github.com/nextgen-networks/snappymail/pull/799)
+  [#799](https://github.com/the-djmaze/snappymail/pull/799)
 
 
 ## 2.24.1 – 2022-12-23
@@ -58,15 +58,15 @@
 - Intl.DateTimeFormat() into toLocaleString() for iOS < 14
 - Cleanup locale date/time handling
 - Make MessageList per day optional
-  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
 
 ### Fixed
 - Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization #792
-  [#792](https://github.com/nextgen-networks/snappymail/pull/792)
+  [#792](https://github.com/the-djmaze/snappymail/pull/792)
 - Attachments in mails in 2.24 not loading in reply/forward #789
-  [#789](https://github.com/nextgen-networks/snappymail/pull/789)
+  [#789](https://github.com/the-djmaze/snappymail/pull/789)
 - Rollback #280 due to complications
-  [#280](https://github.com/nextgen-networks/snappymail/pull/280)
+  [#280](https://github.com/the-djmaze/snappymail/pull/280)
 
 
 ## 2.24.0 – 2022-12-22
@@ -79,24 +79,24 @@
 
 ### Changed
 - MessageList now grouped/split per day
-  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
 - Account switcher still shown when allow_additional_accounts is set to Off
-  [#280](https://github.com/nextgen-networks/snappymail/pull/280)
+  [#280](https://github.com/the-djmaze/snappymail/pull/280)
 - PHP classes use typed properties
 - Speedup Contacts Suggestions handling
 - Check SMTP SIZE
-  [#779](https://github.com/nextgen-networks/snappymail/pull/779)
+  [#779](https://github.com/the-djmaze/snappymail/pull/779)
 
 ### Fixed
 - Handle multiple DKIM signatures authentication results
 - Reload admin extensions on update
 - SieveClient quoted string parsing failed
 - Invalid Attachments (PDF)
-  [#466](https://github.com/nextgen-networks/snappymail/pull/466)
+  [#466](https://github.com/the-djmaze/snappymail/pull/466)
 - Email HTML images rendering issue
-  [#564](https://github.com/nextgen-networks/snappymail/pull/564)
+  [#564](https://github.com/the-djmaze/snappymail/pull/564)
 - "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
-  [#780](https://github.com/nextgen-networks/snappymail/pull/780)
+  [#780](https://github.com/the-djmaze/snappymail/pull/780)
 
 ### Removed
 - Some unused plugin hooks to improve Action handling speed
@@ -111,16 +111,16 @@
 - Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
 - SnappyMail\Imap\Sync now matches folders based on JMAP role
 - Added the new imapsync.php command line script for
-  [#744](https://github.com/nextgen-networks/snappymail/pull/744)
+  [#744](https://github.com/the-djmaze/snappymail/pull/744)
 - Added manual setting for 12/24h clock
-  [#760](https://github.com/nextgen-networks/snappymail/pull/760)
+  [#760](https://github.com/the-djmaze/snappymail/pull/760)
 - Add options to mark the message I'm viewing as unread and return to the inbox #766
 
 ### Fixed
 - Extension menu shows only some available extensions #778
-- New solution for [#423](https://github.com/nextgen-networks/snappymail/pull/423) due to [#774](https://github.com/nextgen-networks/snappymail/pull/774)
+- New solution for [#423](https://github.com/the-djmaze/snappymail/pull/423) due to [#774](https://github.com/the-djmaze/snappymail/pull/774)
 - Avatars extension error on smartphone
-  [#764](https://github.com/nextgen-networks/snappymail/pull/764)
+  [#764](https://github.com/the-djmaze/snappymail/pull/764)
 - Don't fetch Unread count for main account
 - CSS .e-checkbox.material-design invisible on show/hide
 
@@ -129,33 +129,33 @@
 
 ### Added
 - Show the number of unread mails on all mail addresses/accounts
-  [#437](https://github.com/nextgen-networks/snappymail/pull/437)
+  [#437](https://github.com/the-djmaze/snappymail/pull/437)
 - Show OpenSSL version in Admin => About
 
 ### Changed
 - Redirect to login page instead of "invalid token" popup
-  [#752](https://github.com/nextgen-networks/snappymail/pull/752)
+  [#752](https://github.com/the-djmaze/snappymail/pull/752)
 - Make all dialogs fit in mobile view
 - Changed some Plugin hooks for better handling:
 	* json.action-pre-call => json.before-{actionname}
 	* json.action-post-call => json.after-{actionname}
 - Cleaner accounts list in systemdropdown
 - Multiple imapConnect handling for new import mail feature
-  [#744](https://github.com/nextgen-networks/snappymail/pull/744)
+  [#744](https://github.com/the-djmaze/snappymail/pull/744)
 
 ### Fixed
 - Loosing HTML signature in account identity under settings
-  [#750](https://github.com/nextgen-networks/snappymail/pull/750)
+  [#750](https://github.com/the-djmaze/snappymail/pull/750)
 - Plugin configuration did not load anymore when type was SELECTION by @cm-schl
-  [#753](https://github.com/nextgen-networks/snappymail/pull/753)
+  [#753](https://github.com/the-djmaze/snappymail/pull/753)
 - Nextcloud Default theme shows gray text on gray background
-  [#754](https://github.com/nextgen-networks/snappymail/pull/754)
+  [#754](https://github.com/the-djmaze/snappymail/pull/754)
 - Only run JSON hooks when $sAction is set
-  [#755](https://github.com/nextgen-networks/snappymail/pull/755)
+  [#755](https://github.com/the-djmaze/snappymail/pull/755)
 - Unsupported SASL mechanism OAUTHBEARER
-  [#756](https://github.com/nextgen-networks/snappymail/pull/756)
-  [#758](https://github.com/nextgen-networks/snappymail/pull/758)
-  [#759](https://github.com/nextgen-networks/snappymail/pull/759)
+  [#756](https://github.com/the-djmaze/snappymail/pull/756)
+  [#758](https://github.com/the-djmaze/snappymail/pull/758)
+  [#759](https://github.com/the-djmaze/snappymail/pull/759)
 - border-box issue with .buttonCompose
 
 ### Removed
@@ -166,15 +166,15 @@
 
 ### Changed
 - Scroll bar with the mobile version in "Advanced search" screen
-  [#712](https://github.com/nextgen-networks/snappymail/pull/712)
+  [#712](https://github.com/the-djmaze/snappymail/pull/712)
 
 ### Fixed
 - Undefined property: MailSo\Mail\FolderCollection::$capabilities
 - PHP 8.2 Creation of dynamic property is deprecated
 - Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
-  [#745](https://github.com/nextgen-networks/snappymail/pull/745)
-  [#746](https://github.com/nextgen-networks/snappymail/pull/746)
-  [#748](https://github.com/nextgen-networks/snappymail/pull/748)
+  [#745](https://github.com/the-djmaze/snappymail/pull/745)
+  [#746](https://github.com/the-djmaze/snappymail/pull/746)
+  [#748](https://github.com/the-djmaze/snappymail/pull/748)
 - Admin domain test undefined matched domain should say email@example matched domain
 
 
@@ -182,15 +182,15 @@
 
 ### Changed
 - Narrow MessageList wraps star icon
-  [#737](https://github.com/nextgen-networks/snappymail/pull/737)
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
 - Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
-  [#745](https://github.com/nextgen-networks/snappymail/pull/745)
+  [#745](https://github.com/the-djmaze/snappymail/pull/745)
 - No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
 - Update Chinese translation by @mayswind
 
 ### Fixed
 - PluginProperty DefaultValue contained array while it should not
-  [#741](https://github.com/nextgen-networks/snappymail/pull/741)
+  [#741](https://github.com/the-djmaze/snappymail/pull/741)
 
 ### Removed
 - IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
@@ -201,7 +201,7 @@
 ### Added
 - Support plugin minified .min.js and .min.css
 - ZIP Download multiple emails
-  [#717](https://github.com/nextgen-networks/snappymail/pull/717)
+  [#717](https://github.com/the-djmaze/snappymail/pull/717)
 
 ### Changed
 - Replaced some data-bind="click: function(){} with object functions to prevent eval()
@@ -210,12 +210,12 @@
 ### Fixed
 - Settings Themes style due to border-box change
 - "Remember me" failed due to v2.22.4 Session token change
-  [#719](https://github.com/nextgen-networks/snappymail/pull/719)
-  [#731](https://github.com/nextgen-networks/snappymail/pull/731)
+  [#719](https://github.com/the-djmaze/snappymail/pull/719)
+  [#731](https://github.com/the-djmaze/snappymail/pull/731)
 
 ### Removed
 - Vacation filter: Button to add recipients (+)
-  [#728](https://github.com/nextgen-networks/snappymail/pull/728)
+  [#728](https://github.com/the-djmaze/snappymail/pull/728)
 
 
 ## 2.22.4 – 2022-11-28
@@ -223,19 +223,19 @@
 ### Changed
 - Contacts dialog layout using flex
 - Session token is related to the user agent string
-  [#713](https://github.com/nextgen-networks/snappymail/pull/713)
+  [#713](https://github.com/the-djmaze/snappymail/pull/713)
 - Better browser cache handling for avatars plugin
-  [#714](https://github.com/nextgen-networks/snappymail/pull/714)
+  [#714](https://github.com/the-djmaze/snappymail/pull/714)
 - Force HTML editor when set as default when replying to message
-  [#355](https://github.com/nextgen-networks/snappymail/pull/355)
+  [#355](https://github.com/the-djmaze/snappymail/pull/355)
 
 ### Fixed
 - Contact Error - object Object
-  [#716](https://github.com/nextgen-networks/snappymail/pull/716)
+  [#716](https://github.com/the-djmaze/snappymail/pull/716)
 - Unable to move messages to different folder by drag and drop
-  [#710](https://github.com/nextgen-networks/snappymail/pull/710)
+  [#710](https://github.com/the-djmaze/snappymail/pull/710)
 - v2.22.3 unknown error
-  [#709https://github.com/nextgen-networks/snappymail/pull/709)
+  [#709https://github.com/the-djmaze/snappymail/pull/709)
 
 
 ## 2.22.3 – 2022-11-25
@@ -245,14 +245,14 @@
 
 ### Changed
 - Improved cPanel integration
-  [#697](https://github.com/nextgen-networks/snappymail/pull/697)
+  [#697](https://github.com/the-djmaze/snappymail/pull/697)
 - Update to OpenPGP.js v5.5.0
 
 ### Fixed
 - drag & drop folder expansion
-  [#707](https://github.com/nextgen-networks/snappymail/pull/707)
+  [#707](https://github.com/the-djmaze/snappymail/pull/707)
 - Save selected messages as .eml in Nextcloud failed
-  [#704](https://github.com/nextgen-networks/snappymail/pull/704)
+  [#704](https://github.com/the-djmaze/snappymail/pull/704)
 
 
 ## 2.22.2 – 2022-11-24
@@ -265,50 +265,50 @@
 
 ### Added
 - AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
-  [#115](https://github.com/nextgen-networks/snappymail/pull/115)
+  [#115](https://github.com/the-djmaze/snappymail/pull/115)
 
 ### Changed
 - All the attachment zone is not clickable, even if the cursor is a hand
-  [#691](https://github.com/nextgen-networks/snappymail/pull/691)
+  [#691](https://github.com/the-djmaze/snappymail/pull/691)
 - Different approach for "update button duplicated in admin panel"
-  [#677](https://github.com/nextgen-networks/snappymail/pull/677)
+  [#677](https://github.com/the-djmaze/snappymail/pull/677)
 - Better drag & drop solution for leftPanel
 
 ### Fixed
 - The page does not change after batch deletion
-  [#684](https://github.com/nextgen-networks/snappymail/pull/684)
+  [#684](https://github.com/the-djmaze/snappymail/pull/684)
 - Prevent domain uppercase issues found in
-  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
 - Login invalid response: VXNlcm5hbWU6CG
-  [#693](https://github.com/nextgen-networks/snappymail/pull/693)
+  [#693](https://github.com/the-djmaze/snappymail/pull/693)
 
 
 ## 2.21.4 – 2022-11-22
 
 ### Added
 - Added domain matcher test for
-  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
 - Download all Attachments of selected Emails
-  [#361](https://github.com/nextgen-networks/snappymail/pull/361)
+  [#361](https://github.com/the-djmaze/snappymail/pull/361)
 
 ### Changed
 - Log current shortcuts scope for
-  [#690](https://github.com/nextgen-networks/snappymail/pull/690)
+  [#690](https://github.com/the-djmaze/snappymail/pull/690)
 - CSS everything to be box-sizing: border-box;
 - Make messageview a bit larger so that it is the same height as the messagelist
 - Cleanup and rearrange some fontastic glyphs
 - Also show From email address by default
-  [#683](https://github.com/nextgen-networks/snappymail/pull/683)
+  [#683](https://github.com/the-djmaze/snappymail/pull/683)
 
 ### Fixed
 - Contact.display() returns [object Object]
 - When left panel disabled and drag messages, show it
 - Issue with admin domain connection type settings selectbox
-  [#689](https://github.com/nextgen-networks/snappymail/pull/689)
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
 - Mobile View on cellphones: automatic scrolling not working near the visual keyboard
-  [#686](https://github.com/nextgen-networks/snappymail/pull/686)
+  [#686](https://github.com/the-djmaze/snappymail/pull/686)
 - Unable to separate runtime from installation
-  [#685](https://github.com/nextgen-networks/snappymail/pull/685)
+  [#685](https://github.com/the-djmaze/snappymail/pull/685)
 
 ### Removed
 - Removed inline parameter of checkbox and select components
@@ -321,18 +321,18 @@
 
 ### Changed
 - Increase visible reading area for small screens
-  [#672](https://github.com/nextgen-networks/snappymail/pull/672)
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
 - Improved message spam score detailed view
 - Improved DAV connection logging
 
 ### Fixed
 - Handling attachments MIME type / content-type
 - Message responsive resizing width/height of elements
-  [#678](https://github.com/nextgen-networks/snappymail/pull/678)
+  [#678](https://github.com/the-djmaze/snappymail/pull/678)
 - Focus on textarea when creating a new plain text email
-  [#501](https://github.com/nextgen-networks/snappymail/pull/501)
+  [#501](https://github.com/the-djmaze/snappymail/pull/501)
 - CardDav remove photos of my contacts when synchronizing
-  [#679](https://github.com/nextgen-networks/snappymail/pull/679)
+  [#679](https://github.com/the-djmaze/snappymail/pull/679)
 
 ### Removed
 - \MailSo\Mime\Enumerations\MimeType
@@ -340,21 +340,21 @@
 ### Nextcloud
 - Use fontastic in Nextcloud Files selector dialog
 - Firefox < 98 dialogs
-  [#673](https://github.com/nextgen-networks/snappymail/pull/673)
+  [#673](https://github.com/the-djmaze/snappymail/pull/673)
 
 ## 2.21.2 – 2022-11-15
 
 ### Added
 - Allow browser Spellchecker
-  [#574](https://github.com/nextgen-networks/snappymail/pull/574)
+  [#574](https://github.com/the-djmaze/snappymail/pull/574)
 - Decode MIME charset of .EML attachments
-  [#662](https://github.com/nextgen-networks/snappymail/pull/662)
+  [#662](https://github.com/the-djmaze/snappymail/pull/662)
 
 ### Changed
 - Increase message visible text area
-  [#672](https://github.com/nextgen-networks/snappymail/pull/672)
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
 - When copy/paste image use the raw data instead of clipboard HTML
-  [#654](https://github.com/nextgen-networks/snappymail/pull/654)
+  [#654](https://github.com/the-djmaze/snappymail/pull/654)
 - When application.ini debug.enable is true, also debug js and css
 - JavaScript rl.setWindowTitle() renamed to rl.setTitle()
 
@@ -363,28 +363,28 @@
 
 ### Nextcloud
 - Workaround Nextcloud calendar crashes
-  [#622](https://github.com/nextgen-networks/snappymail/pull/622)
-  [#661](https://github.com/nextgen-networks/snappymail/pull/661)
+  [#622](https://github.com/the-djmaze/snappymail/pull/622)
+  [#661](https://github.com/the-djmaze/snappymail/pull/661)
 - Added share public/internal file link
-  [#569](https://github.com/nextgen-networks/snappymail/pull/569)
+  [#569](https://github.com/the-djmaze/snappymail/pull/569)
 
 
 ## 2.21.1 – 2022-11-13
 
 ### Fixed
 - Crypt crashes when Sodium not installed
-  [#641](https://github.com/nextgen-networks/snappymail/pull/641)
-  [#657](https://github.com/nextgen-networks/snappymail/pull/657)
-  [#663](https://github.com/nextgen-networks/snappymail/pull/663)
-  [#664](https://github.com/nextgen-networks/snappymail/pull/664)
-  [#668](https://github.com/nextgen-networks/snappymail/pull/668)
-  [#669](https://github.com/nextgen-networks/snappymail/pull/669)
+  [#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/nextgen-networks/snappymail/pull/665)
+  [#665](https://github.com/the-djmaze/snappymail/pull/665)
 
 ### Nextcloud
 - v23 ContentSecurityPolicy versions issue
-  [#666](https://github.com/nextgen-networks/snappymail/pull/666)
+  [#666](https://github.com/the-djmaze/snappymail/pull/666)
 
 
 ## 2.21.0 – 2022-11-11
@@ -392,11 +392,11 @@
 ### Added
 - Put messagelist top bar buttons also in dropdown
 - Allow setting additional Sec-Fetch rules, as discussed by
-  [#585](https://github.com/nextgen-networks/snappymail/pull/585)
+  [#585](https://github.com/the-djmaze/snappymail/pull/585)
 - Light/Dark favicon.svg
-  [#643](https://github.com/nextgen-networks/snappymail/pull/643)
+  [#643](https://github.com/the-djmaze/snappymail/pull/643)
 - Allow an account name/label
-  [#571](https://github.com/nextgen-networks/snappymail/pull/571)
+  [#571](https://github.com/the-djmaze/snappymail/pull/571)
 
 ### Changed
 - Moved ServiceRemoteAutoLogin to plugin/extension
@@ -407,13 +407,13 @@
   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](https://github.com/nextgen-networks/snappymail/pull/638)
+  [#638](https://github.com/the-djmaze/snappymail/pull/638)
 
 ### Fixed
 - ldap-identities-plugin by @cm-schl
-  [#647](https://github.com/nextgen-networks/snappymail/pull/647)
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
 - OpenSSL v3 ciphers issue
-  [#641](https://github.com/nextgen-networks/snappymail/pull/641)
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
 
 ### Nextcloud
 - Style PopupsNextcloudFiles view
@@ -424,7 +424,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/nextgen-networks/snappymail/pull/642)
+  [#642](https://github.com/the-djmaze/snappymail/pull/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -432,8 +432,8 @@
 
 ### Nextcloud
 - Improved workaround for Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -444,8 +444,8 @@
 
 ### Nextcloud
 - Workaround Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -453,7 +453,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -461,24 +461,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/nextgen-networks/snappymail/issues/635)
+  [#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/nextgen-networks/snappymail/issues/625)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -486,11 +486,11 @@
 ### Fixed
 - pgpDecrypt() using MailVelope the decrypt message was not green
 - Shift + F in search bar resulted in forwarding message
-  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -507,11 +507,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
 - Update readme by @cm-schl
-  [#617](https://github.com/nextgen-networks/snappymail/issues/617)
+  [#617](https://github.com/the-djmaze/snappymail/issues/617)
 
 
 ## 2.20.0 – 2022-11-03
@@ -529,7 +529,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -541,17 +541,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -562,11 +562,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
@@ -602,7 +602,7 @@
 
 ### Fixed
 - ldap-identities-plugin by @cm-schl
-  [#647](https://github.com/nextgen-networks/snappymail/pull/647)
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
 - OpenSSL v3 ciphers issue #641
 
 ### Nextcloud
@@ -614,7 +614,7 @@
 
 ### Fixed
 - ?admin login failed
-  [#642](https://github.com/nextgen-networks/snappymail/pull/642)
+  [#642](https://github.com/the-djmaze/snappymail/pull/642)
 - Resolve PHP 8.2 Creation of dynamic property is deprecated
 
 
@@ -622,8 +622,8 @@
 
 ### Nextcloud
 - Improved workaround for Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -634,8 +634,8 @@
 
 ### Nextcloud
 - Workaround Nextcloud Content-Security-Policy bug
-  Safari [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  Edge [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  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)
 
 
@@ -643,7 +643,7 @@
 
 ### Added
 - Throw decrypt errors
-  [#632](https://github.com/nextgen-networks/snappymail/issues/632)
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
 
 ### Changed
 - Better multiple WYSIWYG registration system (not finished)
@@ -651,24 +651,24 @@
 
 ### Fixed
 - Cookie “name” has been rejected because it is already expired.
-  [#636](https://github.com/nextgen-networks/snappymail/issues/636)
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
 - Content-Security-Policy 'strict-dynamic' was missing
 
 ### Nextcloud
 - Better handling of Content-Security-Policy
-  [#631](https://github.com/nextgen-networks/snappymail/issues/631)
-  [#633](https://github.com/nextgen-networks/snappymail/issues/633)
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
 - Nextcloud 23 Error Call to undefined method useStrictDynamic()
-  [#634](https://github.com/nextgen-networks/snappymail/issues/634)
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
 - Use snappymail icon as favicon-mask.svg instead default nextcloud logo
-  [#635](https://github.com/nextgen-networks/snappymail/issues/635)
+  [#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/nextgen-networks/snappymail/issues/625)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
 
 ### Changed
 - Some CSS borders to var(--border-color)
@@ -676,11 +676,11 @@
 ### Fixed
 - pgpDecrypt() using MailVelope the decrypt message was not green
 - Shift + F in search bar resulted in forwarding message
-  [#624](https://github.com/nextgen-networks/snappymail/issues/624)
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
 
 ### Nextcloud
 - auto login mechanism not working anymore
-  [#627](https://github.com/nextgen-networks/snappymail/issues/627)
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
 
 
 ## 2.20.1 – 2022-11-04
@@ -697,11 +697,11 @@
 - Better theme integration with Nextcloud
 - Use Nextcloud 18+ IEventDispatcher
 - Solve Nextcloud 25 CSS issues
-  [#620](https://github.com/nextgen-networks/snappymail/issues/620)
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
 - PutinICS does is not working for all calendar events
-  [#622](https://github.com/nextgen-networks/snappymail/issues/622)
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
 - Update readme by @cm-schl
-  [#617](https://github.com/nextgen-networks/snappymail/issues/617)
+  [#617](https://github.com/the-djmaze/snappymail/issues/617)
 
 
 ## 2.20.0 – 2022-11-03
@@ -719,7 +719,7 @@
 
 ### Nextcloud
 - Disable Nextcloud Impersonate check due to login/logout complications
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - Improved theme integration and be compatible with Breeze Dark
 
 
@@ -731,17 +731,17 @@
 
 ### Fixed
 - Switching user (impersonate plugin) keeps old Email logged in
-  [#561](https://github.com/nextgen-networks/snappymail/issues/561)
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
 - PGP Decryption / Encryption Failures
-  [#600](https://github.com/nextgen-networks/snappymail/issues/600)
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
 - Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
-  [#601](https://github.com/nextgen-networks/snappymail/issues/601)
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
 - Cannot access admin panel
-  [#602](https://github.com/nextgen-networks/snappymail/issues/602)
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
 - Wont show my emails
-  [#604](https://github.com/nextgen-networks/snappymail/issues/604)
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
 - Return type of MailSo\Base\StreamFilters\LineEndings::filter
-  [#610](https://github.com/nextgen-networks/snappymail/issues/610)
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
 - Create .pgp directory was missing
 
 ### Security
@@ -752,11 +752,11 @@
 ### Added
 - Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
 - Filter scripts UI let user understand which filter is active
-  [#590](https://github.com/nextgen-networks/snappymail/issues/590)
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
 
 ### Fixed
 - Method 'GetRequest' not found in \MailSo\Base\Http
-  [#585](https://github.com/nextgen-networks/snappymail/issues/585)
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
 
 ### Changed
 - Base Domain setup enhancements
diff --git a/integrations/owncloud/snappymail/appinfo/info.xml b/integrations/owncloud/snappymail/appinfo/info.xml
index ea38d765f..84ce9cb7f 100644
--- a/integrations/owncloud/snappymail/appinfo/info.xml
+++ b/integrations/owncloud/snappymail/appinfo/info.xml
@@ -22,18 +22,18 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
-		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
+		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
+		<website>https://github.com/the-djmaze/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
-	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/owncloud</repository>
-	<bugs>https://github.com/nextgen-networks/snappymail/issues</bugs>
+	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
+	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/owncloud</repository>
+	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="64" />
 		<lib>mbstring</lib>
diff --git a/integrations/owncloud/snappymail/css/embed.css b/integrations/owncloud/snappymail/css/embed.css
index 434c1781d..150a27fe9 100644
--- a/integrations/owncloud/snappymail/css/embed.css
+++ b/integrations/owncloud/snappymail/css/embed.css
@@ -80,7 +80,7 @@ body > header ul {
 
 /**
  * Firefox < 98
- * https://github.com/nextgen-networks/snappymail/issues/673
+ * https://github.com/the-djmaze/snappymail/issues/673
  */
 #rl-app dialog.polyfill {
 	margin-top: 50px;
@@ -89,7 +89,7 @@ body > header ul {
 
 /**
  * hampoelz
- * https://github.com/nextgen-networks/snappymail/issues/96#issuecomment-1279783076
+ * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
  */
 
 .messageList {
diff --git a/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
index 453648527..8835da06c 100644
--- a/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -30,7 +30,7 @@ class SnappyMailHelper
 		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
 		require_once $app_dir . '/index.php';
 
-		// https://github.com/nextgen-networks/snappymail/issues/790#issuecomment-1366527884
+		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
 		if (!file_exists($app_dir . '/.htaccess') && file_exists($app_dir . '/_htaccess')) {
 			rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
 			if (!file_exists(APP_VERSION_ROOT_PATH . '/app/.htaccess') && file_exists(APP_VERSION_ROOT_PATH . '/app/_htaccess')) {
@@ -122,7 +122,7 @@ class SnappyMailHelper
 				$aCredentials = static::getLoginCredentials();
 /*
 				// NC25+ workaround for Impersonate plugin
-				// https://github.com/nextgen-networks/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
 				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
 				require \OC::$SERVERROOT . '/version.php';
 //				\OC\SystemConfig
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 61cba8f47..c3fcc7ab5 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -153,7 +153,7 @@ sub script_snappymail_files
 local ($d, $ver, $opts, $upgrade) = @_;
 local @files = ( { 'name' => "source",
 	           'file' => "snappymail-$ver.tar.gz",
-	           'url' => "https://github.com/nextgen-networks/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
+	           'url' => "https://github.com/the-djmaze/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
 	    );
 return @files;
 }
diff --git a/package.json b/package.json
index 708c088c0..889872ef9 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     }
   ],
   "bugs": {
-    "url": "https://github.com/nextgen-networks/snappymail/issues"
+    "url": "https://github.com/the-djmaze/snappymail/issues"
   },
   "keywords": [
     "webmail",
diff --git a/plugins/attachments-force-open/index.php b/plugins/attachments-force-open/index.php
index 11dd2a30b..4110b7894 100644
--- a/plugins/attachments-force-open/index.php
+++ b/plugins/attachments-force-open/index.php
@@ -5,7 +5,7 @@ class AttachmentsForceOpenPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME     = 'Attachments force open',
 		AUTHOR   = 'SnappyMail',
-		URL      = 'https://github.com/nextgen-networks/snappymail/pull/1489',
+		URL      = 'https://github.com/the-djmaze/snappymail/pull/1489',
 		VERSION  = '0.1',
 		RELEASE  = '2024-03-15',
 		REQUIRED = '2.14.0',
diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php
index 5fea19cb2..ee2458948 100644
--- a/plugins/auto-domain-grab/index.php
+++ b/plugins/auto-domain-grab/index.php
@@ -7,7 +7,7 @@
  * be set to to 'example.com'.
  *
  * Based on:
- * https://github.com/nextgen-networks/snappymail/blob/master/plugins/override-smtp-credentials/index.php
+ * https://github.com/the-djmaze/snappymail/blob/master/plugins/override-smtp-credentials/index.php
  *
  */
 
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index eeb87cae0..417fdfd1b 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -27,7 +27,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		if ($identicon && \is_file(__DIR__ . "/{$identicon}.js")) {
 			$this->addJs("{$identicon}.js");
 		}
-		// https://github.com/nextgen-networks/snappymail/issues/714
+		// https://github.com/the-djmaze/snappymail/issues/714
 		if ($this->Config()->Get('plugin', 'service', true)
 //		 || !$this->Config()->Get('plugin', 'delay', true)
 		 || $this->Config()->Get('plugin', 'gravatar', false)
diff --git a/plugins/compact-composer/index.php b/plugins/compact-composer/index.php
index fac781d72..c9a1be1f5 100644
--- a/plugins/compact-composer/index.php
+++ b/plugins/compact-composer/index.php
@@ -5,7 +5,7 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Compact Composer',
 		AUTHOR = 'Sergey Mosin',
-		URL = 'https://github.com/nextgen-networks/snappymail/pull/1466',
+		URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
 		VERSION = '1.0.6',
 		RELEASE = '2024-08-08',
 		REQUIRED = '2.34.0',
diff --git a/plugins/compact-composer/js/CompactComposer.js b/plugins/compact-composer/js/CompactComposer.js
index 791e77f0f..15ff25d03 100644
--- a/plugins/compact-composer/js/CompactComposer.js
+++ b/plugins/compact-composer/js/CompactComposer.js
@@ -306,7 +306,7 @@
 
 			const clr = this.makeClr();
 			const doClr = name => input => {
-				// https://github.com/nextgen-networks/snappymail/issues/826
+				// https://github.com/the-djmaze/snappymail/issues/826
 				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
 				clr.style.width = input.offsetWidth + 'px';
 
@@ -324,7 +324,7 @@
 							console.error('invalid name:', name);
 					}
 				};
-				// Chrome 110+ https://github.com/nextgen-networks/snappymail/issues/1199
+				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
 //				clr.oninput = () => squire.setStyle({[name]:clr.value});
 				setTimeout(() => clr.click(), 1);
 			};
@@ -653,7 +653,7 @@
 			/**@type {HTMLInputElement} clr*/
 			const clr = createElement('input');
 			clr.type = 'color';
-			// Chrome https://github.com/nextgen-networks/snappymail/issues/1199
+			// Chrome https://github.com/the-djmaze/snappymail/issues/1199
 			let clrid = 'squire-colors',
 				colorlist = doc.getElementById(clrid),
 				add = hex => colorlist.append(new Option(hex));
diff --git a/plugins/demo-account/index.php b/plugins/demo-account/index.php
index 0f198645d..74a8cc675 100644
--- a/plugins/demo-account/index.php
+++ b/plugins/demo-account/index.php
@@ -61,7 +61,7 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$aActionParams['Password'] = $this->Config()->Get('plugin', 'password');
 		}
 		else if ('DoFolderCreate' === $sMethodName || 'DoFolderRename' === $sMethodName) {
-			// Block spam https://github.com/nextgen-networks/snappymail/issues/371
+			// Block spam https://github.com/the-djmaze/snappymail/issues/371
 			$latin = transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $aActionParams['folder']);
 			if (false !== \strpos($latin, 'nigger')) {
 				\error_log("blocked {$sMethodName} {$aActionParams['folder']}");
diff --git a/plugins/ldap-mail-accounts/LdapMailAccounts.php b/plugins/ldap-mail-accounts/LdapMailAccounts.php
index 40e8ea58a..5dc0c4eb6 100644
--- a/plugins/ldap-mail-accounts/LdapMailAccounts.php
+++ b/plugins/ldap-mail-accounts/LdapMailAccounts.php
@@ -132,7 +132,7 @@ class LdapMailAccounts
 			return false; // exceptions are only thrown from the handle error function that does logging already
 		}
 
-		//Basing on https://github.com/nextgen-networks/snappymail/issues/616
+		//Basing on https://github.com/the-djmaze/snappymail/issues/616
 
 		$oActions = \RainLoop\Api::Actions();
 
@@ -192,7 +192,7 @@ class LdapMailAccounts
 		//When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
 		//On a password change using ldap (or when the password has been forgotten by the user) this makes us some problems. Therefore overwrite
 		//the .cryptkey file in order to always accept the actual ldap password of the user. This has side effects on pgp keys! 
-		//See https://github.com/nextgen-networks/snappymail/issues/1570#issuecomment-2085528061
+		//See https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061
 		if ($this->config->bool_overwrite_cryptkey) {
 			if (!$oActions->StorageProvider()->Put($oAccount, StorageType::ROOT, '.cryptkey', "")) {
 				$this->logger->Write("Could not overwrite the .cryptkey file!", \LOG_WARNING, self::LOG_KEY);
diff --git a/plugins/ldap-mail-accounts/index.php b/plugins/ldap-mail-accounts/index.php
index bbcba639e..bc53ad4f4 100644
--- a/plugins/ldap-mail-accounts/index.php
+++ b/plugins/ldap-mail-accounts/index.php
@@ -101,7 +101,7 @@ class LdapMailAccountsPlugin extends AbstractPlugin
 			->SetDescription("SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file \".cryptkey\". When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
 				\nOn a password change using ldap (or when the password has been forgotten by the user) this makes problems and asks the user to insert the old password. Therefore activating this option overwrites the .cryptkey file on login in order to always accept the actual ldap password of the user.
 				\nATTENTION: This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore!
-				\nSee https://github.com/nextgen-networks/snappymail/issues/1570#issuecomment-2085528061")
+				\nSee https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061")
 			->SetDefaultValue(false),
 		]);
 
diff --git a/plugins/login-cpanel/index.php b/plugins/login-cpanel/index.php
index 2eb66b72a..9bc5ebf7a 100644
--- a/plugins/login-cpanel/index.php
+++ b/plugins/login-cpanel/index.php
@@ -58,7 +58,7 @@ class LogincPanelPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function FilterLoginCredentials(&$sEmail, &$sImapUser, &$sPassword, &$sSmtpUser)
 	{
-		// cPanel https://github.com/nextgen-networks/snappymail/issues/697
+		// cPanel https://github.com/the-djmaze/snappymail/issues/697
 //		 && !empty($_ENV['CPANEL'])
 		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
 			if (empty($_ENV['REMOTE_TEMP_USER'])) {
diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php
index ca4f4e6b1..a6b8d3f9d 100644
--- a/plugins/login-gmail/index.php
+++ b/plugins/login-gmail/index.php
@@ -148,7 +148,7 @@ class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#gmail'),
+				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#gmail'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php
index c372dd8ab..62050f429 100644
--- a/plugins/login-o365/index.php
+++ b/plugins/login-o365/index.php
@@ -166,7 +166,7 @@ class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#o365'),
+				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#o365'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
index d95871875..ab1550571 100644
--- a/plugins/login-remote/index.php
+++ b/plugins/login-remote/index.php
@@ -58,7 +58,7 @@ class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
-		// cPanel https://github.com/nextgen-networks/snappymail/issues/697
+		// cPanel https://github.com/the-djmaze/snappymail/issues/697
 //		 && !empty($_ENV['CPANEL'])
 		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
 			if (empty($_ENV['REMOTE_TEMP_USER'])) {
diff --git a/plugins/login-virtuser/index.php b/plugins/login-virtuser/index.php
index 615b9cb6e..88207baec 100644
--- a/plugins/login-virtuser/index.php
+++ b/plugins/login-virtuser/index.php
@@ -5,7 +5,7 @@ class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Virtuser Login',
 		AUTHOR = 'v20z',
-		URL     = 'https://github.com/nextgen-networks/snappymail/issues/1691',
+		URL     = 'https://github.com/the-djmaze/snappymail/issues/1691',
 		VERSION = '0.2',
 		RELEASE = '2024-09-20',
 		REQUIRED = '2.36.1',
diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
index 7389b8bcf..5c2ab7662 100644
--- a/plugins/nextcloud/js/composer.js
+++ b/plugins/nextcloud/js/composer.js
@@ -35,7 +35,7 @@
 					});
 					if (urls.length) {
 						// TODO: other editors and text/plain
-						// https://github.com/nextgen-networks/snappymail/issues/981
+						// https://github.com/the-djmaze/snappymail/issues/981
 						view.oEditor.editor.squire.insertHTML(urls.join("<br>"));
 					}
 				});
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index 184411493..f5154b745 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -27,7 +27,7 @@
 				}
 			}
 /*
-			// https://github.com/nextgen-networks/snappymail/issues/592
+			// https://github.com/the-djmaze/snappymail/issues/592
 			if (cfg.CalDAV) {
 				const attachmentsPlace = template.content.querySelector('.attachmentsPlace');
 				attachmentsPlace.after(Element.fromHTML(`
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index cc7129406..24aa1f226 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -113,7 +113,7 @@ const
 				}
 				elemList.push(elem);
 			}
-			// https://github.com/nextgen-networks/snappymail/issues/1177
+			// https://github.com/the-djmaze/snappymail/issues/1177
 //			elemList.sort((a, b) => a.isFile != b.isFile ? (a.isFile ? 1 : -1) : a.name.localeCompare(b.name));
 			return Promise.resolve(elemList);
 		});
@@ -122,7 +122,7 @@ const
 	buildTree = (view, parent, items, path) => {
 		if (items.length) {
 			try {
-				// https://github.com/nextgen-networks/snappymail/issues/1109
+				// https://github.com/the-djmaze/snappymail/issues/1109
 				let collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
 				items.sort((a, b) => collator.compare(a.name, b.name));
 			} catch (e) {
diff --git a/plugins/search-filters/index.php b/plugins/search-filters/index.php
index bf4fbc16e..090f31141 100644
--- a/plugins/search-filters/index.php
+++ b/plugins/search-filters/index.php
@@ -5,7 +5,7 @@ class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public const
 		NAME = 'Search Filters',
 		AUTHOR = 'AbdoBnHesham',
-		URL    = 'https://github.com/nextgen-networks/snappymail/pull/1673',
+		URL    = 'https://github.com/the-djmaze/snappymail/pull/1673',
 		VERSION = '0.2',
 		RELEASE = '2024-06-28',
 		REQUIRED = '2.36.3',
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index 24b3be045..aa71747c2 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -25,7 +25,7 @@
 		}
 	});
 
-	// https://github.com/nextgen-networks/snappymail/issues/349
+	// https://github.com/the-djmaze/snappymail/issues/349
 	addEventListener('sm-show-screen', e => {
 		if (!e.detail.startsWith('settings') && rl.settings.get('SetupTwoFactor')) {
 			e.preventDefault();
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index f27f408b1..74bb1cc25 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -41,9 +41,9 @@ abstract class DateTimeHelper
 			return 0;
 		}
 
-		// Strip invalid data after zone, https://github.com/nextgen-networks/snappymail/issues/1554
+		// Strip invalid data after zone, https://github.com/the-djmaze/snappymail/issues/1554
 		$sDateTime = \preg_replace('/\s+\([a-zA-Z0-9]+\)$/', '', $sDateTime);
-		// https://github.com/nextgen-networks/snappymail/issues/1694#issuecomment-2270983942
+		// https://github.com/the-djmaze/snappymail/issues/1694#issuecomment-2270983942
 		// Strip day-of-week
 		$sDateTime = \preg_replace('/^[^,]+,/', '', $sDateTime);
 		// Add optional seconds
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index f3053058f..bf3dc8981 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -219,7 +219,7 @@ class BodyStructure implements \JsonSerializable
 		/**
 		 * Still no text found?
 		 * Look in attachments as it could be an X-Mms-Message
-		 * https://github.com/nextgen-networks/snappymail/issues/1294
+		 * https://github.com/the-djmaze/snappymail/issues/1294
 		 */
 		if (!$aParts) {
 			$gParts = $this->SearchByCallback(fn($oItem) => $oItem->isText());
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index 2e13eb923..7210e6add 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -83,7 +83,7 @@ trait Folders
 //		$this->FolderCheck();
 
 		// Will this workaround solve Dovecot issue?
-		// https://github.com/nextgen-networks/snappymail/issues/124
+		// https://github.com/the-djmaze/snappymail/issues/124
 		try {
 			$this->FolderRename($sFolderName, "{$sFolderName}-dummy");
 			$this->FolderRename("{$sFolderName}-dummy", $sFolderName);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
index d0e81d675..6f8e74db9 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
@@ -315,7 +315,7 @@ class SearchCriterias
 							}
 							break;
 
-						// https://github.com/nextgen-networks/snappymail/issues/625
+						// https://github.com/the-djmaze/snappymail/issues/625
 						case 'READ':
 						case 'UNREAD':
 							$aCriteriasResult[] = \str_replace('READ', 'SEEN', $sName);
@@ -369,7 +369,7 @@ class SearchCriterias
 
 	public static function escapeSearchString(\MailSo\Imap\ImapClient $oImapClient, string $sSearch) : string
 	{
-		// https://github.com/nextgen-networks/snappymail/issues/836
+		// https://github.com/the-djmaze/snappymail/issues/836
 //		return $oImapClient->EscapeString($sSearch);
 //		return \MailSo\Base\Utils::IsAscii($sSearch) || $oImapClient->hasCapability('QQMail'))
 		return (\MailSo\Base\Utils::IsAscii($sSearch) || !$oImapClient->hasCapability('LITERAL+'))
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
index 1155a1cda..34a257717 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
@@ -39,8 +39,8 @@ trait ResponseParser
 
 	/**
 	 * A bug in the parser converts folder names that start with '[' into arrays.
-	 * https://github.com/nextgen-networks/snappymail/issues/1
-	 * https://github.com/nextgen-networks/snappymail/issues/70
+	 * https://github.com/the-djmaze/snappymail/issues/1
+	 * https://github.com/the-djmaze/snappymail/issues/70
 	 * The fix RainLoop implemented isn't correct either.
 	 * This one should as RFC 3501 only mentions:
 	 *
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
index 5d2b08ece..1fcba3997 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
@@ -123,7 +123,7 @@ trait Status
 				if (\is_string($value)) {
 					$this->MAILBOXID = \base64_encode($value);
 				} else {
-					// Cyrus bug https://github.com/nextgen-networks/snappymail/issues/1640
+					// Cyrus bug https://github.com/the-djmaze/snappymail/issues/1640
 					\error_log("{$this->FullName} invalid MAILBOXID value. Disable the OBJECTID capability.");
 				}
 			} else {
@@ -172,7 +172,7 @@ trait Status
 							$oResponse->ResponseList[3][$i+1]
 						);
 					} else {
-						// https://github.com/nextgen-networks/snappymail/issues/1640
+						// https://github.com/the-djmaze/snappymail/issues/1640
 						\error_log("{$this->FullName} STATUS missing value for {$oResponse->ResponseList[3][$i]}");
 					}
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 290d7d289..fa8c9cf2e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -249,7 +249,7 @@ class Message implements \JsonSerializable
 						$oMessage->sSpamResult = "{$value[1]} / {$required[1]}";
 					}
 				}
-				// https://github.com/nextgen-networks/snappymail/issues/1228
+				// https://github.com/the-djmaze/snappymail/issues/1228
 				else if (\preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $spam, $value)
 				  || \preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $oHeaders->ValueByName(MimeHeader::X_SPAM_INFO), $value)
 				) {
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
index 6ea17527a..3da957592 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
@@ -41,7 +41,7 @@ class ConnectSettings implements \JsonSerializable
 	public bool $lowerLogin = true;
 	public string $stripLogin = '';
 	public array $SASLMechanisms = [
-		// https://github.com/nextgen-networks/snappymail/issues/182
+		// https://github.com/the-djmaze/snappymail/issues/182
 		'SCRAM-SHA3-512',
 		'SCRAM-SHA-512',
 		'SCRAM-SHA-256',
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index f2236e838..a0a1cd595 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -187,7 +187,7 @@ class SieveClient extends \MailSo\Net\NetClient
 			try {
 				$this->sendRequestWithCheck('LOGOUT');
 			} catch (\Throwable $e) {
-				// https://github.com/nextgen-networks/snappymail/issues/1455
+				// https://github.com/the-djmaze/snappymail/issues/1455
 				$this->writeLogException($e, \LOG_WARNING, false);
 			}
 			$this->bIsLoggined = false;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
index 27e9a8484..de25b99cd 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
@@ -24,7 +24,7 @@ class Settings extends \MailSo\Net\ConnectSettings
 	public bool
 		$setSender = false,
 		$usePhpMail = false,
-		// https://github.com/nextgen-networks/snappymail/issues/1038
+		// https://github.com/the-djmaze/snappymail/issues/1038
 		$authPlainLine = false,
 		$viewErrors = false;
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 08ec748d3..4ca6cf8e2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -162,7 +162,7 @@ class SmtpClient extends \MailSo\Net\NetClient
 		$SASL = \SnappyMail\SASL::factory($type);
 
 		if ($this->Settings->authPlainLine && $SASL instanceof \SnappyMail\SASL\Plain) {
-			// https://github.com/nextgen-networks/snappymail/issues/1038
+			// https://github.com/the-djmaze/snappymail/issues/1038
 			try
 			{
 				$sRequest = $SASL->authenticate($sLogin, $sPassword);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 121cff1cd..4e78236e9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -337,7 +337,7 @@ trait Accounts
 	 */
 	public function DoAccountsAndIdentities(): array
 	{
-		// https://github.com/nextgen-networks/snappymail/issues/571
+		// https://github.com/the-djmaze/snappymail/issues/571
 		return $this->DefaultResponse(array(
 			'Accounts' => \array_values(\array_map(function($value){
 					return [
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index 4c25151d5..a88d37116 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -66,7 +66,7 @@ trait Folders
 					}
 				}
 			} catch (\Throwable $e) {
-				// https://github.com/nextgen-networks/snappymail/issues/1438
+				// https://github.com/the-djmaze/snappymail/issues/1438
 				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
 				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
@@ -78,7 +78,7 @@ trait Folders
 					}
 				}
 			} catch (\Throwable $e) {
-				// https://github.com/nextgen-networks/snappymail/issues/1438
+				// https://github.com/the-djmaze/snappymail/issues/1438
 				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
 				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 540d2c4ee..8b04bbdad 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -1151,7 +1151,7 @@ trait Messages
 			}
 		}
 /*
-		// OpenPGP https://github.com/nextgen-networks/snappymail/issues/1587
+		// OpenPGP https://github.com/the-djmaze/snappymail/issues/1587
 		$sPublicKey = $this->GetActionParam('publicKey', '');
 		if ($sPublicKey) {
 			$oMessage->Attachments()->append(
@@ -1199,7 +1199,7 @@ trait Messages
 		if ($sFingerprint) {
 			$GPG = $this->GnuPG();
 /*
-			// https://github.com/nextgen-networks/snappymail/issues/1587
+			// https://github.com/the-djmaze/snappymail/issues/1587
 			if ($this->GetActionParam('attachPublicKey', false)) {
 				$sPublicKey = $GPG->export($sFingerprint);
 				$oMessage->Attachments()->append(
@@ -1269,7 +1269,7 @@ trait Messages
 				}
 			}
 /*
-			// https://github.com/nextgen-networks/snappymail/issues/1587
+			// https://github.com/the-djmaze/snappymail/issues/1587
 			if ($sCertificate && $this->GetActionParam('attachCertificate', false)) {
 				$oMessage->Attachments()->append(
 					new \MailSo\Mime\Attachment(
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index 161dbc75a..ef73f9c7f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -125,7 +125,7 @@ trait Raw
 			if (!\is_resource($rResource)) {
 				return false;
 			}
-			// https://github.com/nextgen-networks/snappymail/issues/144
+			// https://github.com/the-djmaze/snappymail/issues/144
 			if ('.pdf' === \substr($sFileNameIn,-4)) {
 				$sContentTypeOut = 'application/pdf'; // application/octet-stream
 			} else {
@@ -174,7 +174,7 @@ trait Raw
 					$sFileName = $self->clearFileName($sFileName, $sContentType, $sMimeIndex);
 
 					if ('.pdf' === \substr($sFileName, -4)) {
-						// https://github.com/nextgen-networks/snappymail/issues/144
+						// https://github.com/the-djmaze/snappymail/issues/144
 						$sContentType = 'application/pdf';
 					} else {
 						$sContentType = $sContentTypeIn
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index 0179eb587..be26a590e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -259,7 +259,7 @@ trait UserAuth
 			if ($aData) {
 				/**
 				 * Server side control/kickout of logged in sessions
-				 * https://github.com/nextgen-networks/snappymail/issues/151
+				 * https://github.com/the-djmaze/snappymail/issues/151
 				 */
 				$sToken = Utils::GetSessionToken(false);
 				if (!$sToken) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
index 6ddab4af5..8de393fe7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
@@ -65,7 +65,7 @@ abstract class Base
 			if ($oSettings->sslCa) {
 				$options[\PDO::MYSQL_ATTR_SSL_CA] = $oSettings->sslCa;
 			}
-			// PHP 8.0 https://github.com/nextgen-networks/snappymail/issues/1205
+			// PHP 8.0 https://github.com/the-djmaze/snappymail/issues/1205
 			if (\defined('PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT')) {
 				$options[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $oSettings->sslVerify;
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 0e8694e9f..52104cf80 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -136,7 +136,7 @@ abstract class Service
 		}
 
 		if ($bIndex) {
-			// https://github.com/nextgen-networks/snappymail/issues/1024
+			// https://github.com/the-djmaze/snappymail/issues/1024
 			$oHttp->ServerNoCache();
 
 			if (!$bAdmin) {
@@ -195,7 +195,7 @@ abstract class Service
 				))
 			);
 
-			// https://github.com/nextgen-networks/snappymail/issues/1024
+			// https://github.com/the-djmaze/snappymail/issues/1024
 //			$oActions->verifyCacheByKey($sCacheFileName);
 
 			if ($oConfig->Get('cache', 'system_data', true)) {
@@ -237,7 +237,7 @@ abstract class Service
 			$sScriptHash = 'sha256-'.\base64_encode(\hash('sha256', $script[1], true));
 			static::setCSP(null, $sScriptHash);
 */
-			// https://github.com/nextgen-networks/snappymail/issues/1024
+			// https://github.com/the-djmaze/snappymail/issues/1024
 //			$oActions->cacheByKey($sCacheFileName);
 
 			echo $sResult;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index 2a23ab05d..c72d127f0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -125,7 +125,7 @@ class Utils
 		return self::WebPath() . 'snappymail/v/' . APP_VERSION . '/';
 		/**
 		 * TODO: solve this to support other paths.
-		 * https://github.com/nextgen-networks/snappymail/issues/685
+		 * https://github.com/the-djmaze/snappymail/issues/685
 		 */
 //		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
index cefe292d1..ebe056ae1 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
@@ -118,7 +118,7 @@ class Cookies
 		static::init();
 		$sPath = static::$DefaultPath;
 		$sPath = $sPath && \strlen($sPath) ? $sPath : '/';
-		// https://github.com/nextgen-networks/snappymail/issues/451
+		// https://github.com/the-djmaze/snappymail/issues/451
 		// The 4K browser limit is for the entire cookie, including name, value, expiry date etc.
 		$iMaxSize = 4000 - \strlen($sPath . $sName);
 /*
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
index eee9cd46d..122d51ae6 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
@@ -79,7 +79,7 @@ abstract class Base
 		$gpgconf = static::findBinary('gpgconf');
 		if ($gpgconf) {
 			$cmd = $gpgconf . ' --kill gpg-agent';
-			// https://github.com/nextgen-networks/snappymail/issues/1560#issuecomment-2144817883
+			// https://github.com/the-djmaze/snappymail/issues/1560#issuecomment-2144817883
 //			if (\version_compare($this->version, '2.4.0', '<')) {
 				$cmd .= ' ' . \escapeshellarg($this->options['homedir']);
 //			}
@@ -402,7 +402,7 @@ abstract class Base
 	protected function setInput(&$input) : void
 	{
 		if (\is_resource($input)) {
-			// https://github.com/nextgen-networks/snappymail/issues/331
+			// https://github.com/the-djmaze/snappymail/issues/331
 			// $meta['stream_type'] == MEMORY or $meta['wrapper_data'] == MailSo\Base\StreamWrappers\Literal
 			$meta = \stream_get_meta_data($input);
 			if (!\in_array($meta['stream_type'], ['STDIO', 'TEMP'])) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
index 46cb8b7ec..f3921112f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
@@ -78,7 +78,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 
 	/**
 	 * TODO: parse result
-	 * https://github.com/nextgen-networks/snappymail/issues/89
+	 * https://github.com/the-djmaze/snappymail/issues/89
 	 */
 	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
@@ -137,7 +137,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 */
 	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
@@ -146,7 +146,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 	 */
 	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
index a81631bc6..bc66c7291 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
@@ -65,7 +65,7 @@ class SMIME extends Base
 
 	/**
 	 * TODO: parse result
-	 * https://github.com/nextgen-networks/snappymail/issues/89
+	 * https://github.com/the-djmaze/snappymail/issues/89
 	 */
 	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
@@ -134,7 +134,7 @@ class SMIME extends Base
 	 */
 	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
@@ -143,7 +143,7 @@ class SMIME extends Base
 	 */
 	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
 	{
-		// TODO: https://github.com/nextgen-networks/snappymail/issues/89
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
index 71f841725..bf514fa20 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
@@ -28,7 +28,7 @@ class IMagick extends \Imagick implements \SnappyMail\Image
 
 	public static function createFromStream($fp)
 	{
-		// https://github.com/nextgen-networks/snappymail/issues/1201
+		// https://github.com/the-djmaze/snappymail/issues/1201
 		$data = \stream_get_contents($fp);
 		return static::createFromString($data);
 /*
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
index 9a2c81721..e6d25e6bd 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
@@ -104,9 +104,9 @@ abstract class Integrity
 			'json'     => function_exists('json_decode'),
 			'libxml'   => function_exists('libxml_use_internal_errors'),
 			'dom'      => class_exists('DOMDocument'),
-			// https://github.com/nextgen-networks/snappymail/issues/1392
+			// https://github.com/the-djmaze/snappymail/issues/1392
 			'fileinfo' => extension_loaded('fileinfo')
-			// https://github.com/nextgen-networks/snappymail/issues/392
+			// https://github.com/the-djmaze/snappymail/issues/392
 		//	'phar'     => class_exists('PharData')
 		);
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
index a32f90dc8..2f0441fcb 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
@@ -15,7 +15,7 @@ class Login extends \SnappyMail\SASL
 		?string $challenge = null) : string
 	{
 		// $challenge should be 'VXNlcm5hbWU6', but broken on some systems
-		// See https://github.com/nextgen-networks/snappymail/issues/693
+		// See https://github.com/the-djmaze/snappymail/issues/693
 		if ($challenge && !\str_starts_with($this->decode($challenge), 'Username:')) {
 			throw new \Exception("Invalid response: {$this->decode($challenge)}");
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
index 7722cefb8..8091c155a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
@@ -21,7 +21,7 @@ class Scram extends \SnappyMail\SASL
 	function __construct(string $algo)
 	{
 		if (\stripos($algo, '-PLUS')) {
-			// https://github.com/nextgen-networks/snappymail/issues/182
+			// https://github.com/the-djmaze/snappymail/issues/182
 			throw new \Exception("SASL SCRAM channel binding unsupported: {$algo}");
 		}
 		$algo = \str_replace('sha-', 'sha', \strtolower($algo));
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 0a8626baa..b83ea9345 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -40,9 +40,9 @@
 						<br />
 					</span>
 					<br />
-					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
+					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
 					<a class="btn" data-bind="visible: coreUpdatable, click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
-					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
 				</div>
 				<div data-bind="visible: 'up-to-date' === statusType()">
 					<i style="color: green">✔</i>
@@ -78,7 +78,7 @@
 			<h3>PHP</h3>
 			<div data-bind="hidden: php64" class="alert">
 				<i class="fontastic" style="color:red">⚠</i>
-				PHP is running in 32bit mode. <a href="https://github.com/nextgen-networks/snappymail/issues/830#issuecomment-1372112793">read here</a>
+				PHP is running in 32bit mode. <a href="https://github.com/the-djmaze/snappymail/issues/830#issuecomment-1372112793">read here</a>
 			</div>
 
 			<table class="table table-hover table-bordered"><thead><tr>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index e5b68f2bd..e31f81108 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -9,8 +9,8 @@
 	<div class="alert alert-error span8" style="margin-top: 10px;">
 		<h4 data-i18n="TAB_GENERAL/ALERT_WARNING"></h4>
 		<div data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></div>
-		<a href="https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions#secure-data-folder"
-			target="_blank"><strong>https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions</strong></a>
+		<a href="https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#secure-data-folder"
+			target="_blank"><strong>https://github.com/the-djmaze/snappymail/wiki/Installation-instructions</strong></a>
 	</div>
 </div>
 <div class="form-horizontal">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 86780f5c7..b78891e18 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -93,7 +93,7 @@
 
 				<h4>
 					<span data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></span>
-					<a style="margin-left:0.5em" href="https://github.com/nextgen-networks/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
+					<a style="margin-left:0.5em" href="https://github.com/the-djmaze/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
 				</h4>
 
 				<div data-bind="foreach: imapCapabilities" style="columns: 16em auto">
diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
index 9f6a4a39c..4159a4a2d 100644
--- a/snappymail/v/0.0.0/cpanel.php
+++ b/snappymail/v/0.0.0/cpanel.php
@@ -1,6 +1,6 @@
 <?php
 
-// cPanel https://github.com/nextgen-networks/snappymail/issues/697
+// cPanel https://github.com/the-djmaze/snappymail/issues/697
 if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-cpanel')) {
 	$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
 	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 5f17eb322..947d7a800 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -128,7 +128,7 @@ if (isset($_SERVER['HTTPS']) && !headers_sent()) {
 	header('Strict-Transport-Security: max-age=31536000');
 }
 
-// cPanel https://github.com/nextgen-networks/snappymail/issues/697
+// cPanel https://github.com/the-djmaze/snappymail/issues/697
 if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
 	require __DIR__ . '/cpanel.php';
 }

From a6492d7b0f3af4350b0fc09691700493f6c29eba Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Fri, 20 Feb 2026 12:06:20 +0000
Subject: [PATCH 17/17] Update repository URLs to nextgen-networks while
 preserving issue/pull links

Replaced references to the-djmaze/snappymail with nextgen-networks/snappymail/
across the repository, excluding README files.

Per user request:
- README files are left untouched.
- Links containing /issues/ and /pull/ are left as they are (pointing to the-djmaze).
- All other links, including those to /releases/, /wiki/, /discussions/,
  /blob/, /tree/, and bare repo URLs, are updated to point to the
  new nextgen-networks repository.
- Bare web URLs include a trailing slash.
- .git and git:// URLs are updated to the new organization.
- Screenshots and raw content links are updated.

Co-authored-by: nextgen-networks <21206978+nextgen-networks@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md               |  2 +-
 CHANGELOG.md                                       |  8 ++++----
 cli/release.php                                    |  2 +-
 examples/eml/tnef.eml                              |  2 +-
 integrations/cloudron/Dockerfile                   |  2 +-
 integrations/nextcloud/snappymail/appinfo/info.xml | 14 +++++++-------
 integrations/owncloud/snappymail/appinfo/info.xml  | 10 +++++-----
 integrations/virtualmin/snappymail.pl              |  2 +-
 plugins/auto-domain-grab/index.php                 |  2 +-
 plugins/login-gmail/index.php                      |  2 +-
 plugins/login-o365/index.php                       |  2 +-
 .../templates/Views/Admin/AdminSettingsAbout.html  |  4 ++--
 .../Views/Admin/AdminSettingsGeneral.html          |  4 ++--
 .../app/templates/Views/Admin/PopupsDomain.html    |  2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 998692964..9c16abc7e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
 - Mode: [e.g. standalone, nextcloud, cyberpanel, docker]
 
 **Debug/logging information**
-[Read here how to log](https://github.com/the-djmaze/snappymail/wiki/FAQ#how-do-i-enable-logging)
+[Read here how to log](https://github.com/nextgen-networks/snappymail/wiki/FAQ#how-do-i-enable-logging)
 - [ ] I've placed them here (few lines) or as attachments (many lines)
 
 **Additional context**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d31a1b771..0809a39c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,7 +72,7 @@
 
 ### Fixed
 - mXSS exploit found by SonarSource
-  [CVE-2024-45800](https://github.com/the-djmaze/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
+  [CVE-2024-45800](https://github.com/nextgen-networks/snappymail/security/advisories/GHSA-2rq7-79vp-ffxm)
 - Call to a member function Email() on null
   [#1706](https://github.com/the-djmaze/snappymail/issues/1706)
 - IMAP capabilities via IMAP Proxy
@@ -202,7 +202,7 @@
 
 ### Added
 - Customize private key passphrase expiration interval
-  [#1545](https://github.com/the-djmaze/snappymail/discussions/1545)
+  [#1545](https://github.com/nextgen-networks/snappymail/discussions/1545)
 - AdvancedSearch support for filtering mails before a given date
   [#1606](https://github.com/the-djmaze/snappymail/pull/1606) by @codiflow
 - Control valid spam and virus headers
@@ -411,9 +411,9 @@
   [#1458](https://github.com/the-djmaze/snappymail/issues/1458)
 - Automatically verify PGP and S/MIME signed messages
 - TNEFDecoder for
-  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
+  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
 - RTF to HTML converter for
-  [#1012](https://github.com/the-djmaze/snappymail/discussions/1012)
+  [#1012](https://github.com/nextgen-networks/snappymail/discussions/1012)
 - Polyfill for PHP ctype
   [#1250](https://github.com/the-djmaze/snappymail/issues/1250)
 
diff --git a/cli/release.php b/cli/release.php
index 0094a083d..5a0e12b07 100755
--- a/cli/release.php
+++ b/cli/release.php
@@ -269,7 +269,7 @@ if (isset($options['sign'])) {
 	if (isset($options['debian'])) {
 		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var);
-		// https://github.com/nextgen-networks/snappymail/issues/185#issuecomment-1059420588
+		// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
 		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' '
 			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);
diff --git a/examples/eml/tnef.eml b/examples/eml/tnef.eml
index 7709e9ada..9432fc4ce 100644
--- a/examples/eml/tnef.eml
+++ b/examples/eml/tnef.eml
@@ -10,7 +10,7 @@ Content-Type: text/plain; charset=us-ascii; format=flowed
 Test message body with example TNEF part from
 https://github.com/Yeraze/ytnef
 
-https://github.com/the-djmaze/snappymail/discussions/1012
+https://github.com/nextgen-networks/snappymail/discussions/1012
 
 --=-2UbcDuksJBAwUNBNW7UD
 Content-Type: application/vnd.ms-tnef
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index a3d442e96..94316c469 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
 VERSION=2.38.2
-RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
+RUN wget https://github.com/nextgen-networks/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
     find /app/code/snappymail -type d -exec chmod 755 {} \; && \
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index b1a67e0b1..44e402778 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -25,19 +25,19 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
-		<admin>https://github.com/the-djmaze/snappymail/wiki/Admin-Manual</admin>
-		<developer>https://github.com/the-djmaze/snappymail/wiki/Developer-Documentation</developer>
-		<website>https://github.com/the-djmaze/snappymail/wiki</website>
+		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
+		<admin>https://github.com/nextgen-networks/snappymail/wiki/Admin-Manual</admin>
+		<developer>https://github.com/nextgen-networks/snappymail/wiki/Developer-Documentation</developer>
+		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
-	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud</repository>
+	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
+	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/nextcloud</repository>
 	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="32" />
diff --git a/integrations/owncloud/snappymail/appinfo/info.xml b/integrations/owncloud/snappymail/appinfo/info.xml
index 84ce9cb7f..1b9092eb8 100644
--- a/integrations/owncloud/snappymail/appinfo/info.xml
+++ b/integrations/owncloud/snappymail/appinfo/info.xml
@@ -22,17 +22,17 @@ There, click on the link to go to the SnappyMail admin panel.
 	]]></description>
 	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
-		<website>https://github.com/the-djmaze/snappymail/wiki</website>
+		<user>https://github.com/nextgen-networks/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
+		<website>https://github.com/nextgen-networks/snappymail/wiki</website>
 	</documentation>
 	<category>integration</category>
 	<category>office</category>
 	<category>search</category>
 	<category>social</category>
-	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
+	<screenshot>https://raw.githubusercontent.com/nextgen-networks/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
 	<website>https://snappymail.eu</website>
-	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
-	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/owncloud</repository>
+	<discussion>https://github.com/nextgen-networks/snappymail/discussions</discussion>
+	<repository>https://github.com/nextgen-networks/snappymail/tree/master/integrations/owncloud</repository>
 	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
 		<php min-version="7.4" min-int-size="64" />
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index c3fcc7ab5..61cba8f47 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -153,7 +153,7 @@ sub script_snappymail_files
 local ($d, $ver, $opts, $upgrade) = @_;
 local @files = ( { 'name' => "source",
 	           'file' => "snappymail-$ver.tar.gz",
-	           'url' => "https://github.com/the-djmaze/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
+	           'url' => "https://github.com/nextgen-networks/snappymail/releases/download/v${ver}/snappymail-${ver}.tar.gz" },
 	    );
 return @files;
 }
diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php
index ee2458948..5fea19cb2 100644
--- a/plugins/auto-domain-grab/index.php
+++ b/plugins/auto-domain-grab/index.php
@@ -7,7 +7,7 @@
  * be set to to 'example.com'.
  *
  * Based on:
- * https://github.com/the-djmaze/snappymail/blob/master/plugins/override-smtp-credentials/index.php
+ * https://github.com/nextgen-networks/snappymail/blob/master/plugins/override-smtp-credentials/index.php
  *
  */
 
diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php
index a6b8d3f9d..ca4f4e6b1 100644
--- a/plugins/login-gmail/index.php
+++ b/plugins/login-gmail/index.php
@@ -148,7 +148,7 @@ class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#gmail'),
+				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#gmail'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php
index 62050f429..c372dd8ab 100644
--- a/plugins/login-o365/index.php
+++ b/plugins/login-o365/index.php
@@ -166,7 +166,7 @@ class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetLabel('Client ID')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
 				->SetAllowedInJs()
-				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#o365'),
+				->SetDescription('https://github.com/nextgen-networks/snappymail/wiki/FAQ#o365'),
 			\RainLoop\Plugins\Property::NewInstance('client_secret')
 				->SetLabel('Client Secret')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index b83ea9345..749bb035b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -40,9 +40,9 @@
 						<br />
 					</span>
 					<br />
-					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
+					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
 					<a class="btn" data-bind="visible: coreUpdatable, click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
-					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" href="https://github.com/nextgen-networks/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
 				</div>
 				<div data-bind="visible: 'up-to-date' === statusType()">
 					<i style="color: green">✔</i>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index e31f81108..e5b68f2bd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -9,8 +9,8 @@
 	<div class="alert alert-error span8" style="margin-top: 10px;">
 		<h4 data-i18n="TAB_GENERAL/ALERT_WARNING"></h4>
 		<div data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></div>
-		<a href="https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#secure-data-folder"
-			target="_blank"><strong>https://github.com/the-djmaze/snappymail/wiki/Installation-instructions</strong></a>
+		<a href="https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions#secure-data-folder"
+			target="_blank"><strong>https://github.com/nextgen-networks/snappymail/wiki/Installation-instructions</strong></a>
 	</div>
 </div>
 <div class="form-horizontal">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index b78891e18..86780f5c7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -93,7 +93,7 @@
 
 				<h4>
 					<span data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></span>
-					<a style="margin-left:0.5em" href="https://github.com/the-djmaze/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
+					<a style="margin-left:0.5em" href="https://github.com/nextgen-networks/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
 				</h4>
 
 				<div data-bind="foreach: imapCapabilities" style="columns: 16em auto">