diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index fa996ad..8d3c44e 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -74,7 +74,8 @@ class MailHandler < ActionMailer::Base
   cattr_accessor :ignored_emails_headers
   @@ignored_emails_headers = {
     'X-Auto-Response-Suppress' => 'oof',
-    'Auto-Submitted' => /\Aauto-(replied|generated)/
+    'Auto-Submitted' => /\Aauto-(replied|generated)/,
+    'X-Autoreply' => 'yes'
   }
 
   # Processes incoming emails
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index afa698a..3c14dc8 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -620,7 +620,8 @@ class MailHandlerTest < ActiveSupport::TestCase
       "X-Auto-Response-Suppress: OOF",
       "Auto-Submitted: auto-replied",
       "Auto-Submitted: Auto-Replied",
-      "Auto-Submitted: auto-generated"
+      "Auto-Submitted: auto-generated",
+      'X-Autoreply: yes'
     ].each do |header|
       raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
       raw = header + "\n" + raw