diff --git a/flake-module.nix b/flake-module.nix
index 6154426..7559834 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -83,9 +83,9 @@
                           cargoPatches = [
                             # Let stalwart-mail depend on our own version of the sieve crate that does not have some “loop prevention” that disables redirects to the original sender.
                             # We want to redirect to sender if we simulate alias files and not doing so barely prevents loops in my opinion.
-                            ./sieve-rs.patch
+                            ./patches/sieve-rs.patch
                           ];
-                          cargoHash = "sha256-fdOU2W/EtkBk+1VmNMkFZTGbwBTQQRelrheVFhiUqlg=";
+                          cargoHash = "sha256-gb2oFlVA/vE6DoWWW8SCFA3l7rtV2RuosPUY+6IcKNM=";
                         }
                       );
                   };
diff --git a/flake.lock b/flake.lock
index 27074b6..8d97402 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1736158044,
-        "narHash": "sha256-8JEwwVRdpuIfL9uj8eCTOBkbSzsmzy/1d0S20gdmLW8=",
+        "lastModified": 1740490964,
+        "narHash": "sha256-05mpcJZCX631rNCxJohUu+nhVOlAc3EfcNPBzOFSHMo=",
         "ref": "refs/heads/main",
-        "rev": "8e9a101e53cf5b2e9a19f93ec21f86ddb73b4ddc",
-        "revCount": 20,
+        "rev": "c37b6ec8654db4c6e3d79acaeeccb577a9fb66ce",
+        "revCount": 21,
         "type": "git",
         "url": "https://gitea.mathebau.de/fachschaft/alias_to_sieve"
       },
@@ -25,11 +25,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736012469,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "lastModified": 1740367490,
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
         "type": "github"
       },
       "original": {
@@ -88,14 +88,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1735774519,
-        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
       }
     },
     "nixpkgs-lib_2": {
@@ -112,11 +112,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1736320768,
+        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1736130662,
-        "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=",
+        "lastModified": 1740450604,
+        "narHash": "sha256-T/lqASXzCzp5lJISCUw+qwfRmImVUnhKgAhn8ymRClI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52",
+        "rev": "5961ca311c85c31fc5f51925b4356899eed36221",
         "type": "github"
       },
       "original": {
diff --git a/nixos/modules/mail.nix b/nixos/modules/mail.nix
index a481bcf..f1861a2 100644
--- a/nixos/modules/mail.nix
+++ b/nixos/modules/mail.nix
@@ -1,5 +1,5 @@
 /*
-* Building: For some reason, stalwart is not served by cache.nixos.org and thus needs to be built locally.
+* Building: We patch our version of stalwart and thus need to built it locally.
 *   Be aware that this needs some hours, about 12Gb RAM and a few Gb free space in /tmp.
 *   If you only want to deploy configuration changes and no software updates, consider building on the target VM.
 *   It has stalwart in its nix store and does not need to rebuild it.
@@ -67,8 +67,6 @@ in {
           server = {
             lookup.default.hostname = "fb04184.mathematik.tu-darmstadt.de"; # Because the DNS PTR of 130.83.2.184 is this and this should be used in SMTP EHLO.
             listener = {
-              # Do not enable JMAP until https://github.com/stalwartlabs/mail-server/issues/618 is resolved!
-              # Luckily, this bug does not apply to IMAP.
               "smtp" = {
                 bind = ["[::]:25"];
                 protocol = "smtp";
@@ -207,9 +205,6 @@ in {
       files = ["/root/.ssh/known_hosts"]; # for the backup server bragi
     };
 
-    # Update HRZ allowlist
-    # For account details see https://www-cgi.hrz.tu-darmstadt.de/mail/
-    # will stop working if no valid TUIDs are associated to our domain.
     systemd = {
       timers."mailAllowlist" = {
         wantedBy = ["timers.target"];
diff --git a/sieve-rs.patch b/patches/sieve-rs.patch
similarity index 78%
rename from sieve-rs.patch
rename to patches/sieve-rs.patch
index 697a1f3..b706d03 100644
--- a/sieve-rs.patch
+++ b/patches/sieve-rs.patch
@@ -8,7 +8,7 @@ index be36759b..b4316639 100644
  version = "0.6.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "15ac54053752c25a0e545dd1953de716abcc80b12cfe0b6c2f2c1c73759d4f45"
-+source = "git+https://gitea.mathebau.de/Gonne/sieve-rs.git#71324550504c0f84fe3e814d05cbe22f90a3b228"
++source = "git+https://gitea.mathebau.de/fachschaft/sieve-rs.git#71324550504c0f84fe3e814d05cbe22f90a3b228"
  dependencies = [
   "ahash 0.8.11",
   "bincode",
@@ -23,5 +23,5 @@ index f055474f..2b64c9ac 100644
 +
 +
 +[patch.crates-io]
-+sieve-rs = { git = 'https://gitea.mathebau.de/Gonne/sieve-rs.git' }
++sieve-rs = { git = 'https://gitea.mathebau.de/fachschaft/sieve-rs.git' }