0
@@ -11,9 +11,12 @@ module ActionMailer
0
       md = /^([^\.]+)\.([^\.]+\.[^\.]+)\.(erb|rhtml|rxml)$/.match(method_name)
0
       layout << ".#{md.captures[1]}" if md && md.captures[1]
0
       layout << ".#{md.captures[2]}" if md && md.captures[2]
0
-      layout << ".rhtml" if Rails::VERSION::MAJOR < 2
0
+
0
       if File.exists?(File.join(layouts_path, layout))
0
         body[:content_for_layout] = render_message_without_layouts(method_name, body)
0
+        
0
+        # TODO: extract content_for blocks and somehow put them in body[:content_for_...]
0
+        
0
         initialize_layout_template_class(body).render(:file => "/#{layout}")
0
       else
0
         render_message_without_layouts(method_name, body)
0
@@ -22,11 +25,11 @@ module ActionMailer
0
     
0
     def initialize_layout_template_class(assigns)
0
       # for Rails 2.1 (and greater), we have to process view paths first!
0
-      if Rails::VERSION::MAJOR >= 2 and Rails::VERSION::MINOR >= 1
0
-        ActionView::TemplateFinder.process_view_paths(layouts_path)
0
-      end
0
+      ActionView::TemplateFinder.process_view_paths(layouts_path)
0
+      
0
       returning(template = ActionView::Base.new(layouts_path, assigns, self)) do
0
         template.extend self.class.master_helper_module
0
+        template.extend ActionView::Helpers::CaptureHelper
0
       end
0
     end
0