diff --git a/configuration.nix b/configuration.nix
index cc60c5c..95f2896 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -70,7 +70,7 @@
   mailserver = {
     enable = true;
     fqdn = "mail.htw.stura-dresden.de";
-    domains = [ "htw.stura-dresden.de" ];
+    domains = [ "htw.stura-dresden.de" "mail.htw.stura-dresden.de" ];
     ldap = {
       enable = true;
       bind = {
@@ -78,11 +78,11 @@
         passwordFile = "/var/lib/dovecot_ldap_passwd";
       };
       dovecot = {
-      	userFilter = "(&(objectClass=posixAccount)(cn=%u))";
-      	passFilter = "(&(objectClass=posixAccount)(cn=%u))";
+      	#userFilter = "(&(objectClass=posixAccount)(cn=%u))";
+      	#passFilter = "(&(objectClass=posixAccount)(cn=%u))";
       };
       postfix = {
-      	filter = "(&(objectClass=posixUser)(cn=%s))";
+      	#filter = "(&(objectClass=posixUser)(cn=%s))";
       };
       searchBase = "dc=auth,dc=htw,dc=stura-dresden,dc=de";
       uris = [
@@ -91,13 +91,45 @@
     };
 
     certificateScheme = "acme-nginx";
+   enableImap = true;
+    enableImapSsl = true;
+    enableManageSieve = false;
+    enableSubmission = true;
+    enableSubmissionSsl = true;
+    extraVirtualAliases = {};
+    lmtpSaveToDetailMailbox = "no"; # DOS potential
+    mailboxes = {
+      Drafts = {
+        auto = "subscribe";
+        specialUse = "Drafts";
+      };
+      Sent = {
+        auto = "subscribe";
+        specialUse = "Sent";
+      };
+      Spam = {
+        auto = "subscribe";
+        specialUse = "Junk";
+      };
+      Trash = {
+        auto = "subscribe";
+        specialUse = "Trash";
+      };
+    };
+    maxConnectionsPerUser = 10;
+    messageSizeLimit = 10 * 1000 * 1024; # 10 MiB
+
   };
 
+  services.dovecot2.mailLocation = lib.mkForce "maildir:/var/vmail/%n";
+  services.postfix.relayHost = "141.56.51.14";
+
+
   virtualisation.docker.enable = true;
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "cert@stura.htw-dresden.de";
 
-  networking.firewall.allowedTCPPorts = [ 80 443 389 9000 ];
+  networking.firewall.allowedTCPPorts = [ 25 80 443 597 9000 ];
 
   system.stateVersion = "24.11";