mainly fixes

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 6a291c444748eacd3dbafd6d1e4dcf202aa37cf3..d3d1056e3d336bf6746591ff58f5caab6d977e7d 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -1225,8 +1225,7 @@ warn
 
 warn
   !hosts = +iank_trusted
-  # They dont send spam, but needed this because
-  # smarthosts connect with residential ips and thus get flagged as spam.
+  # Smarthosts connect with residential ips and thus get flagged as spam if we do a spam check.
   !authenticated = plain_server:login_server
   condition = ${if < {$message_size}{5000K}}
   spam = Debian-exim:true
@@ -1237,6 +1236,7 @@ warn
   add_header = X-Spam_action: $spam_action
 
 warn
+  !hosts = +iank_trusted
   !authenticated = plain_server:login_server
   condition = ${if def:malware_name}
   remove_header = Subject: