4 files changed, 36 insertions, 32 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 23f04a11ba..12e781b6c3 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -25,32 +25,34 @@ actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
 $:.unshift(actionpack_path) if File.directory?(actionpack_path)
 require 'action_controller'
 require 'action_view'
+require 'active_support/autoload'
 
 module ActionMailer
-  def self.load_all!
-    [Base, Part, ::Text::Format, ::Net::SMTP]
-  end
-
-  autoload :AdvAttrAccessor, 'action_mailer/adv_attr_accessor'
-  autoload :DeprecatedBody, 'action_mailer/deprecated_body'
-  autoload :Base, 'action_mailer/base'
-  autoload :DeliveryMethod, 'action_mailer/delivery_method'
-  autoload :Part, 'action_mailer/part'
-  autoload :PartContainer, 'action_mailer/part_container'
-  autoload :Quoting, 'action_mailer/quoting'
-  autoload :TestCase, 'action_mailer/test_case'
-  autoload :TestHelper, 'action_mailer/test_helper'
-  autoload :Utils, 'action_mailer/utils'
+  extend ::ActiveSupport::Autoload
+
+  autoload :AdvAttrAccessor
+  autoload :DeprecatedBody
+  autoload :Base
+  autoload :DeliveryMethod
+  autoload :MailHelper
+  autoload :Part
+  autoload :PartContainer
+  autoload :Quoting
+  autoload :TestHelper
+  autoload :Utils
 end
 
 module Text
+  extend ActiveSupport::Autoload
+
   autoload :Format, 'action_mailer/vendor/text_format'
 end
 
 module Net
-  autoload :SMTP, 'net/smtp'
+  extend ActiveSupport::Autoload
+
+  autoload :SMTP
 end
 
-autoload :MailHelper, 'action_mailer/mail_helper'
 
 require 'action_mailer/vendor/tmail'
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 7b952c462f..b5239ac0cd 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -258,7 +258,7 @@ module ActionMailer #:nodoc:
     include AbstractController::Layouts
 
     include AbstractController::Helpers
-    helper MailHelper
+    helper ActionMailer::MailHelper
 
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb
index 587ae37ffa..6c8cdf4450 100644
--- a/actionmailer/lib/action_mailer/delivery_method/file.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/file.rb
@@ -6,7 +6,7 @@ module ActionMailer
     # A delivery method implementation which writes all mails to a file.
     class File < Method
       self.settings = {
-        :location       => defined?(Rails) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
+        :location       => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
       }
 
       def perform_delivery(mail)
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 351b966abe..9aa178cdef 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,17 +1,19 @@
-module MailHelper
-  # Uses Text::Format to take the text and format it, indented two spaces for
-  # each line, and wrapped at 72 columns.
-  def block_format(text)
-    formatted = text.split(/\n\r\n/).collect { |paragraph| 
-      Text::Format.new(
-        :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
-      ).format
-    }.join("\n")
+module ActionMailer
+  module MailHelper
+    # Uses Text::Format to take the text and format it, indented two spaces for
+    # each line, and wrapped at 72 columns.
+    def block_format(text)
+      formatted = text.split(/\n\r\n/).collect { |paragraph|
+        Text::Format.new(
+          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
+        ).format
+      }.join("\n")
     
-    # Make list points stand on their own line
-    formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-    formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      # Make list points stand on their own line
+      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
 
-    formatted
+      formatted
+    end
   end
-end
+end
+\ No newline at end of file