1 files changed, 10 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index d4e2b1c756..8e9890378a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -15,12 +15,22 @@ Rails.application.configure do
   # Enable/disable caching. By default caching is disabled.
   if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
+
+    <%- unless options.skip_action_mailer? -%>
+    config.action_mailer.perform_caching = false
+    <%- end -%>
+
     config.cache_store = :memory_store
     config.public_file_server.headers = {
       'Cache-Control' => 'public, max-age=172800'
     }
   else
     config.action_controller.perform_caching = false
+
+    <%- unless options.skip_action_mailer? -%>
+    config.action_mailer.perform_caching = false
+    <%- end -%>
+
     config.cache_store = :null_store
   end
   <%- unless options.skip_action_mailer? -%>