From a3d4b63261c2e54ace2a0de6cda67cba704bf5d9 2014-12-21 19:46:33
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2014-12-21 19:46:33
Subject: [PATCH] Don't overwrite headers that were already set (#14699).

git-svn-id: http://svn.redmine.org/redmine/trunk@13784 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8be6f83..f59dadc 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -370,7 +370,7 @@ class Mailer < ActionMailer::Base
   end
 
   def mail(headers={}, &block)
-    headers.merge! 'X-Mailer' => 'Redmine',
+    headers.reverse_merge! 'X-Mailer' => 'Redmine',
             'X-Redmine-Host' => Setting.host_name,
             'X-Redmine-Site' => Setting.app_title,
             'X-Auto-Response-Suppress' => 'OOF',