Make resent-sender header optional (#2384)

postalserver · Mar 22, 2023 · c6fb8d2 · c6fb8d2
1 parent 1e3622c
commit c6fb8d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config/postal.defaults.yml b/config/postal.defaults.yml
@@ -17,6 +17,7 @@ general:
   use_local_ns_for_domains: false
   default_spam_threshold: 5.0
   default_spam_failure_threshold: 20.0
+  use_resent_sender_header: true
 
 web_server:
   bind_address: 127.0.0.1

diff --git a/lib/postal/smtp_sender.rb b/lib/postal/smtp_sender.rb
@@ -140,7 +140,11 @@ def send_message(message, force_rcpt_to = nil)
         else
           mail_from = "#{message.server.token}@#{Postal.config.dns.return_path}"
         end
-        raw_message = "Resent-Sender: #{mail_from}\r\n" + message.raw_message
+        if Postal.config.general.use_resent_sender_header
+            raw_message = "Resent-Sender: #{mail_from}\r\n" + message.raw_message
+        else
+            raw_message = message.raw_message
+        end
         tries = 0
         begin
           if @smtp_client.nil?