4 files changed, 17 insertions, 35 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 6539451bea..d7bbbbd78c 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -30,34 +30,14 @@ require 'action_view'
 module ActionMailer
   extend ::ActiveSupport::Autoload
 
-  eager_autoload do
-    autoload :AdvAttrAccessor
-    autoload :DeprecatedBody
-    autoload :Base
-    autoload :DeliveryMethod
-    autoload :MailHelper
-    autoload :Part
-    autoload :PartContainer
-    autoload :Quoting
-    autoload :TestHelper
-    autoload :Utils
-  end
+  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
-
-  eager_autoload do
-    autoload :Format, 'action_mailer/vendor/text_format'
-  end
-end
-
-module Net
-  extend ActiveSupport::Autoload
-
-  eager_autoload do
-    autoload :SMTP
-  end
-end
-
-require 'action_mailer/vendor/tmail'
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index b2c355c7ae..de78e87fb4 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,4 +1,7 @@
 require 'active_support/core_ext/class'
+require 'action_mailer/part'
+require 'action_mailer/vendor/text_format'
+require 'action_mailer/vendor/tmail'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
diff --git a/actionmailer/lib/action_mailer/delivery_method.rb b/actionmailer/lib/action_mailer/delivery_method.rb
index 29a51afdc3..4f7d3afc3c 100644
--- a/actionmailer/lib/action_mailer/delivery_method.rb
+++ b/actionmailer/lib/action_mailer/delivery_method.rb
@@ -1,7 +1,7 @@
-require "active_support/core_ext/class"
+require 'active_support/core_ext/class'
+
 module ActionMailer
   module DeliveryMethod
-
     autoload :File,     'action_mailer/delivery_method/file'
     autoload :Sendmail, 'action_mailer/delivery_method/sendmail'
     autoload :Smtp,     'action_mailer/delivery_method/smtp'
@@ -52,6 +52,5 @@ module ActionMailer
       superclass_delegating_accessor :settings
       self.settings = {}
     end
-    
   end
 end
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
index 95c117c9e0..f81d64af36 100644
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
@@ -1,8 +1,9 @@
+require 'net/smtp'
+
 module ActionMailer
   module DeliveryMethod
     # A delivery method implementation which sends via smtp.
     class Smtp < Method
-
       self.settings = {
         :address              => "localhost",
         :port                 => 25,
@@ -26,6 +27,5 @@ module ActionMailer
         end
       end
     end
-
   end
 end