diff --git a/src/supermarket/app/mailers/application_mailer.rb b/src/supermarket/app/mailers/application_mailer.rb
index 47cdc622f..4e969edc3 100644
--- a/src/supermarket/app/mailers/application_mailer.rb
+++ b/src/supermarket/app/mailers/application_mailer.rb
@@ -1,3 +1,8 @@
 class ApplicationMailer < ActionMailer::Base
   layout "mailer"
+
+  def auto_reply_headers_off
+    headers("Auto-Submitted" => "auto-generated")
+    headers("X-Auto-Response-Suppress" => "OOF")
+  end
 end
diff --git a/src/supermarket/app/mailers/collaborator_mailer.rb b/src/supermarket/app/mailers/collaborator_mailer.rb
index 988f9b772..c1f807517 100644
--- a/src/supermarket/app/mailers/collaborator_mailer.rb
+++ b/src/supermarket/app/mailers/collaborator_mailer.rb
@@ -9,6 +9,8 @@ def added_email(collaborator)
     @resource = collaborator.resourceable
     @to = collaborator.user.email
 
+    auto_reply_headers_off
+
     mail(to: @to, subject: "You have been added as a collaborator to the #{@resource.name} #{@resource.class.name}")
   end
 end
diff --git a/src/supermarket/app/mailers/cookbook_mailer.rb b/src/supermarket/app/mailers/cookbook_mailer.rb
index 69f34c20c..640b2ebae 100644
--- a/src/supermarket/app/mailers/cookbook_mailer.rb
+++ b/src/supermarket/app/mailers/cookbook_mailer.rb
@@ -14,6 +14,8 @@ def follower_notification_email(cookbook_version, user)
     @email_preference = user.email_preference_for("New cookbook version")
     @to = user.email
 
+    auto_reply_headers_off
+
     mail(to: @to, subject: "A new version of the #{@cookbook_version.name} cookbook has been released")
   end
 
@@ -29,6 +31,8 @@ def cookbook_deleted_email(name, user)
     @email_preference = user.email_preference_for("Cookbook deleted")
     @to = user.email
 
+    auto_reply_headers_off
+
     mail(to: @to, subject: "The #{name} cookbook has been deleted")
   end
 
@@ -52,6 +56,8 @@ def cookbook_deprecated_email(cookbook, replacement_cookbook, user)
       subject += " in favor of the #{@replacement_cookbook.name} cookbook"
     end
 
+    auto_reply_headers_off
+
     mail(to: @to, subject: subject)
   end