diff --git a/modules/mail.nix b/modules/mail.nix
index 2cd49f5..7a48656 100644
--- a/modules/mail.nix
+++ b/modules/mail.nix
@@ -1,82 +1,90 @@
 { config, pkgs, ... }:
-    let
-        hostname  = "mail.test.stramke.com";
-        domain = "test.stramke.com";
-    in {
-        networking.firewall.allowedTCPPorts = [ 25 587 143 11334];
-        users.users.postfix.extraGroups = ["rspamd"]; # doesn't seem to work
-        services = {
-            postfix = {
-                enable = true; 
-                hostname = "${hostname}";
-                domain = "${domain}";
-                relayHost = "";
-                origin = "${domain}";
-                destination = ["${hostname}" "${domain}" "localhost"];
-                config = {
-                    smtpd_recipient_restrictions = [
-                       "reject_unauth_destination"
-                       "permit_sasl_authenticated"
-                       "permit_mynetworks"
-                    ];
-                    smtpd_sasl_auth_enable = true;
-                    smtpd_sasl_path = "/var/lib/postfix/auth";
+let
+  hostname = "mail.test.stramke.com";
+  domain = "test.stramke.com";
+in
+{
+  networking.firewall.allowedTCPPorts = [ 25 587 143 ];
+  services = {
+    postfix = {
+      enable = true;
+      hostname = "${hostname}";
+      domain = "${domain}";
+      relayHost = "";
+      origin = "${domain}";
+      destination = [ "${hostname}" "${domain}" "localhost" ];
+      config = {
+        smtpd_recipient_restrictions = [
+          "reject_unauth_destination"
+          "permit_sasl_authenticated"
+          "permit_mynetworks"
+        ];
+        smtpd_sasl_auth_enable = true;
+        smtpd_sasl_path = "/var/lib/postfix/auth";
 
-                    # put in opendkim (port 8891) and rspamd (port 11334) as mail filter
-                    smtpd_milters = ["inet:localhost:8891" "/run/rspamd/rspamd.sock"];
-                    non_smtpd_milters = "$smtpd_milters";
-                    milter_default_action = "accept";
-                };
-            };
-            dovecot2 = {
-                enable = true;
-                enableImap = true;
-                enableQuota = false;
-                mailboxes = {
-                        Spam = {
-                          auto = "create";
-                          specialUse = "Junk";
-                        };
-                        Sent = {
-                          auto = "create";
-                          specialUse = "Sent";
-                        };
-                        Drafts = {
-                          auto = "create";
-                          specialUse = "Drafts";
-                        };
-                        Trash = {
-                          auto = "create";
-                          specialUse = "Trash";
-                        };
-                      };
-                extraConfig = ''
-                    mail_location = maildir:/var/spool/mail/%u
-                    auth_mechanisms = plain login
-                    disable_plaintext_auth = no
-                    userdb {
-                        driver = passwd
-                        args = blocking=no
-                    }
-                    service auth {
-                         unix_listener /var/lib/postfix/auth {
-                           group = postfix
-                           mode = 0660
-                           user = postfix
-                        }
-                        
-                    }
-                '';
-            };
-            rspamd = {
-                enable = true;
-            };
-            opendkim = {
-                enable = true;
-                selector = "default";
-                domains = "csl:${domain}";
-                socket = "inet:8891";
-            };
+        # put in opendkim (port 8891) and rspamd (port 11333) as mail filter
+        smtpd_milters = [ "inet:localhost:8891" "inet:localhost:11333" ];
+        non_smtpd_milters = "$smtpd_milters";
+        milter_default_action = "accept";
+      };
+    };
+    dovecot2 = {
+      enable = true;
+      enableImap = true;
+      enableQuota = false;
+      mailboxes = {
+        Spam = {
+          auto = "create";
+          specialUse = "Junk";
         };
-    }
+        Sent = {
+          auto = "create";
+          specialUse = "Sent";
+        };
+        Drafts = {
+          auto = "create";
+          specialUse = "Drafts";
+        };
+        Trash = {
+          auto = "create";
+          specialUse = "Trash";
+        };
+      };
+      extraConfig = ''
+        mail_location = maildir:/var/spool/mail/%u
+        auth_mechanisms = plain login
+        disable_plaintext_auth = no
+        userdb {
+            driver = passwd
+            args = blocking=no
+        }
+        service auth {
+             unix_listener /var/lib/postfix/auth {
+               group = postfix
+               mode = 0660
+               user = postfix
+            }
+                        
+        }
+      '';
+    };
+    rspamd = {
+      enable = true;
+      workers = {
+        normal = {
+          bindSockets = [ "*:11333" ]; # interface for the mailfilter
+        };
+        controller = {
+          bindSockets = [ "*:11334" ]; # webinterface
+        };
+      };
+    };
+    opendkim = {
+      enable = true;
+      selector = "default";
+      domains = "csl:${domain}";
+      socket = "inet:8891";
+    };
+  };
+}