1 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index f9b3658ae7..7d27321610 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -9,9 +9,11 @@ module Erb # :nodoc:
         view_base_path = File.join("app/views", class_path, file_name)
         empty_directory view_base_path
 
-        formats.each do |format|
-          layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
-          template filename_with_extensions(:layout, format), layout_path
+        if self.behavior == :invoke
+          formats.each do |format|
+            layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
+            template filename_with_extensions(:layout, format), layout_path
+          end
         end
 
         actions.each do |action|