Merged r13784 (#14699).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 8be6f83fd791c5a850875e5cb756722968a305c4..f59dadc5751b040f78fa08dacf3422025ac922ab 100644 (file)
--- 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',