2 files changed, 12 insertions, 12 deletions
diff --git a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
index 3ff4f03972..dc1202d7c8 100644
--- a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
@@ -11,12 +11,8 @@ class MailerGenerator < Rails::Generator::NamedBase
       m.directory File.join('test/fixtures', file_path)
 
       # Mailer class and unit test.
-      m.template "mailer.rb",    File.join('app/models',
-                                           class_path,
-                                           "#{file_name}.rb")
-      m.template "unit_test.rb", File.join('test/unit',
-                                           class_path,
-                                           "#{file_name}_test.rb")
+      m.template "mailer.rb",    File.join('app/models', class_path, "#{file_name}.rb")
+      m.template "unit_test.rb", File.join('test/unit', class_path, "#{file_name}_test.rb")
 
       # View template and fixture for each action.
       actions.each do |action|
diff --git a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
index 127495fcbb..0c7e6bebaf 100644
--- a/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb
@@ -1,13 +1,17 @@
 class <%= class_name %> < ActionMailer::Base
+  
+  # change to your domain name
+  default_url_options[:host] = 'example.com'
 <% for action in actions -%>
 
   def <%= action %>(sent_at = Time.now)
-    @subject    = '<%= class_name %>#<%= action %>'
-    @body       = {}
-    @recipients = ''
-    @from       = ''
-    @sent_on    = sent_at
-    @headers    = {}
+    subject    '<%= class_name %>#<%= action %>'
+    recipients ''
+    from       ''
+    sent_on    sent_at
+    
+    body       :greeting => 'Hi,'
   end
 <% end -%>
+
 end