diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 113a773..d18394c 100644
--- 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 5607d16..19e173c 100644
--- 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