diff --git a/nix-system-configs/modules/system/mail-server.nix b/nix-system-configs/modules/system/mail-server.nix
index 5f23077..4419ab6 100644
--- a/nix-system-configs/modules/system/mail-server.nix
+++ b/nix-system-configs/modules/system/mail-server.nix
@@ -98,7 +98,7 @@ in {
               protocol = "smtp";
               tls.implicit = true;
               # Also trust proxy for SMTPS
-              proxy.trusted-networks = ["10.1.1.250/31"];
+              proxy.trusted-networks = ["10.1.1.250/32"];
             };
             imaps = {
               bind = "[::]:993";
diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix
index 76bf4ed..4bf7731 100644
--- a/nix-system-configs/modules/system/traefik.nix
+++ b/nix-system-configs/modules/system/traefik.nix
@@ -517,14 +517,17 @@ in {
 
           # Mail TCP services
           mail-smtp.loadBalancer = {
+                  proxyProtocol = { version = 2; }; # Add this line
             servers = [{address = "10.1.1.15:25";}];
           };
 
           mail-smtps.loadBalancer = {
+                  proxyProtocol = { version = 2; }; # Add this line
             servers = [{address = "10.1.1.15:465";}];
           };
 
           mail-imaps.loadBalancer = {
+                  proxyProtocol = { version = 2; }; # Add this line
             servers = [{address = "10.1.1.15:993";}];
           };
         };