Backported r9687 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9688 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 113a773378ecb30d9ef9ef709cc231830fab1444..d18394cdd3942d59e39a97af75d559fbd6ce5e88 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -395,7 +395,8 @@ class Mailer < ActionMailer::Base
             'X-Redmine-Host' => Setting.host_name,
             'X-Redmine-Site' => Setting.app_title,
             'X-Auto-Response-Suppress' => 'OOF',
-            'Auto-Submitted' => 'auto-generated'
+            'Auto-Submitted' => 'auto-generated',
+            'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
   end
 
   # Appends a Redmine header field (name is prepended with 'X-Redmine-')

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 5607d1636ef7455ef1b08270a4d0ce5b2e872272..19e173c965b56319fa4f1ceb042ce1687f01bf38 100644 (file)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -166,6 +166,7 @@ class MailerTest < ActiveSupport::TestCase
     assert_not_nil mail
     assert_equal 'OOF', mail.header_string('X-Auto-Response-Suppress')
     assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
+    assert_equal '<redmine.example.net>', mail.header_string('List-Id')
   end
 
   def test_email_headers_should_include_sender