diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 1b46005..2e25a29 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -74,7 +74,7 @@ class MailHandler < ActionMailer::Base
   cattr_accessor :ignored_emails_headers
   @@ignored_emails_headers = {
     'X-Auto-Response-Suppress' => 'oof',
-    'Auto-Submitted' => /^auto-/
+    'Auto-Submitted' => /^auto-(replied|generated)/
   }
 
   # Processes incoming emails
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 507ca1e..6c3aefc 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -637,8 +637,7 @@ class MailHandlerTest < ActiveSupport::TestCase
       "X-Auto-Response-Suppress: OOF",
       "Auto-Submitted: auto-replied",
       "Auto-Submitted: Auto-Replied",
-      "Auto-Submitted: auto-generated",
-      "Auto-Submitted: auto-forwarded"
+      "Auto-Submitted: auto-generated"
     ].each do |header|
       raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
       raw = header + "\n" + raw
@@ -649,6 +648,19 @@ class MailHandlerTest < ActiveSupport::TestCase
     end
   end
 
+  test "should not ignore Auto-Submitted headers not defined in RFC3834" do
+    [
+      "Auto-Submitted: auto-forwarded"
+    ].each do |header|
+      raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
+      raw = header + "\n" + raw
+
+      assert_difference 'Issue.count', 1 do
+        assert_not_nil MailHandler.receive(raw), "email with #{header} header was ignored"
+      end
+    end
+  end
+
   def test_add_issue_should_send_email_notification
     Setting.notified_events = ['issue_added']
     ActionMailer::Base.deliveries.clear