Merge remote branch 'mainstream/master'

Conflicts:
	railties/lib/rails/railtie.rb

60 files changed, 1933 insertions, 2643 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 785bf98c55..0018a2ed5d 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.0 (pending)*
 
+* Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
+
 * The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc.  If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
 
 * Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
diff --git a/actionmailer/README b/actionmailer/README
index 0e16ea6ec6..e0e2ee436a 100644
--- a/actionmailer/README
+++ b/actionmailer/README
@@ -5,51 +5,72 @@ are used to consolidate code for sending out forgotten passwords, welcome
 wishes on signup, invoices for billing, and any other use case that requires
 a written notification to either a person or another system.
 
+Action Mailer is in essence a wrapper around Action Controller and the 
+Mail gem.  It provides a way to make emails using templates in the same
+way that Action Controller renders views using templates.
+
 Additionally, an Action Mailer class can be used to process incoming email,
 such as allowing a weblog to accept new posts from an email (which could even
 have been sent from a phone).
 
 == Sending emails
 
-The framework works by setting up all the email details, except the body,
-in methods on the service layer. Subject, recipients, sender, and timestamp
-are all set up this way. An example of such a method:
+The framework works by initializing any instance variables you want to be
+available in the email template, followed by a call to +mail+ to deliver
+the email.
+
+This can be as simple as:
 
-  def signed_up(recipient)
-    recipients recipient
-    subject    "[Signed up] Welcome #{recipient}"
-    from       "system@loudthinking.com"
-    body       :recipient => recipient
+  class Notifier < ActionMailer::Base
+    delivers_from 'system@loudthinking.com'
+  
+    def welcome(recipient)
+      @recipient = recipient
+      mail(:to => recipient,
+           :subject => "[Signed up] Welcome #{recipient}")
+    end
   end
 
 The body of the email is created by using an Action View template (regular
-ERb) that has the content of the body hash parameter available as instance variables. 
+ERb) that has the instance variables that are declared in the mailer action.
+
 So the corresponding body template for the method above could look like this:
 
   Hello there, 
 
   Mr. <%= @recipient %>
+
+  Thank you for signing up!
   
 And if the recipient was given as "david@loudthinking.com", the email 
 generated would look like this:
 
-  Date: Sun, 12 Dec 2004 00:00:00 +0100
+  Date: Mon, 25 Jan 2010 22:48:09 +1100
   From: system@loudthinking.com
   To: david@loudthinking.com
+  Message-ID: <4b5d84f9dd6a5_7380800b81ac29578@void.loudthinking.com.mail>
   Subject: [Signed up] Welcome david@loudthinking.com
+  Mime-Version: 1.0
+  Content-Type: text/plain;
+  	charset="US-ASCII";
+  Content-Transfer-Encoding: 7bit
 
   Hello there, 
 
   Mr. david@loudthinking.com
 
-You never actually call the instance methods like signed_up directly. Instead,
-you call class methods like deliver_* and create_* that are automatically
-created for each instance method. So if the signed_up method sat on
-ApplicationMailer, it would look like this:
+In previous version of rails you would call <tt>create_method_name</tt> and
+<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface, you
+simply call the method and optionally call +deliver+ on the return value.
 
-  ApplicationMailer.create_signed_up("david@loudthinking.com")  # => tmail object for testing
-  ApplicationMailer.deliver_signed_up("david@loudthinking.com") # sends the email
-  ApplicationMailer.new.signed_up("david@loudthinking.com")     # won't work!
+Calling the method returns a Mail Message object:
+
+  message = Notifier.welcome  #=> Returns a Mail::Message object
+  message.deliver             #=> delivers the email
+
+Or you can just chain the methods together like:
+
+  Notifier.welcome.deliver    # Creates the email and sends it immediately
 
 == Receiving emails
 
@@ -103,16 +124,13 @@ The Base class has the full list of configuration options. Here's an example:
 Action Mailer requires that the Action Pack is either available to be required immediately
 or is accessible as a GEM.
 
+Additionally, Action Mailer requires the Mail gem, http://github.com/mikel/mail
 
 == Bundled software
 
-* tmail 0.10.8 by Minero Aoki released under LGPL
-  Read more on http://i.loveruby.net/en/prog/tmail.html
-
 * Text::Format 0.63 by Austin Ziegler released under OpenSource
   Read more on http://www.halostatue.ca/ruby/Text__Format.html
 
-
 == Download
 
 The latest version of Action Mailer can be found at
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 6c19371514..2619d9359e 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -22,14 +22,14 @@ task :default => [ :test ]
 # Run the unit tests
 Rake::TestTask.new { |t|
   t.libs << "test"
-  t.pattern = 'test/*_test.rb'
+  t.pattern = 'test/**/*_test.rb'
   t.warning = true
 }
 
 namespace :test do
   task :isolated do
     ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
-    Dir.glob("test/*_test.rb").all? do |file|
+    Dir.glob("test/**/*_test.rb").all? do |file|
       system(ruby, '-Ilib:test', file)
     end or raise "Failures"
   end
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 96549bf29c..abbb542293 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.rubyonrails.org"
 
   s.add_dependency('actionpack', '= 3.0.pre')
-  s.add_dependency('mail', '~> 1.6.0')
+  s.add_dependency('mail', '~> 2.1.2')
+  s.add_dependency('text-format', '~> 1.0.0')
 
   s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
   s.has_rdoc = true
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 55ddbb24f4..17f63aca25 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -31,10 +31,12 @@ module ActionMailer
   extend ::ActiveSupport::Autoload
 
   autoload :AdvAttrAccessor
+  autoload :Collector
   autoload :Base
-  autoload :DeliveryMethod
-  autoload :DeprecatedBody
+  autoload :DeliveryMethods
+  autoload :DeprecatedApi
   autoload :MailHelper
+  autoload :OldApi
   autoload :Quoting
   autoload :TestCase
   autoload :TestHelper
@@ -43,5 +45,5 @@ end
 module Text
   extend ActiveSupport::Autoload
 
-  autoload :Format, 'action_mailer/vendor/text_format'
+  autoload :Format, 'text/format'
 end
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 356861b591..6246530bf0 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,6 +1,11 @@
 require 'active_support/core_ext/class'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/array/uniq_by'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
 require 'mail'
 require 'action_mailer/tmail_compat'
+require 'action_mailer/collector'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -11,46 +16,76 @@ module ActionMailer #:nodoc:
   #
   #   $ script/generate mailer Notifier
   #
-  # The generated model inherits from ActionMailer::Base. Emails are defined by creating methods within the model which are then
-  # used to set variables to be used in the mail template, to change options on the mail, or
-  # to add attachments.
+  # The generated model inherits from ActionMailer::Base. Emails are defined by creating methods
+  # within the model which are then used to set variables to be used in the mail template, to
+  # change options on the mail, or to add attachments.
   #
   # Examples:
   #
   #  class Notifier < ActionMailer::Base
-  #    def signup_notification(recipient)
-  #      recipients recipient.email_address_with_name
-  #      bcc        ["bcc@example.com", "Order Watcher <watcher@example.com>"]
-  #      from       "system@example.com"
-  #      subject    "New account information"
-  #      body       :account => recipient
+  #    default :from => 'no-reply@example.com',
+  #            :return_path => 'system@example.com'
+  # 
+  #    def welcome(recipient)
+  #      @account = recipient
+  #      mail(:to => recipient.email_address_with_name,
+  #           :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
+  #      end
   #    end
-  #  end
+  # 
+  # Within the mailer method, you have access to the following methods:
+  # 
+  # * <tt>attachments[]=</tt> - Allows you to add attachments to your email in an intuitive
+  #   manner; <tt>attachments['filename.png'] = File.read('path/to/filename.png')</tt>
+  #
+  # * <tt>headers[]=</tt> - Allows you to specify non standard headers in your email such
+  #   as <tt>headers['X-No-Spam'] = 'True'</tt>
+  #
+  # * <tt>headers(hash)</tt> - Allows you to specify multiple headers in your email such
+  #   as <tt>headers({'X-No-Spam' => 'True', 'In-Reply-To' => '1234@message.id'})</tt>
+  #
+  # * <tt>mail</tt> - Allows you to specify your email to send.
+  # 
+  # The hash passed to the mail method allows you to specify any header that a Mail::Message
+  # will accept (any valid Email header including optional fields).  Obviously if you specify
+  # the same header in the headers method and then again in the mail method, the last one
+  # will over write the first, unless you are specifying a header field that can appear more
+  # than once per RFC, in which case, both will be inserted (X-value headers for example can
+  # appear multiple times.)
+  #
+  # The mail method, if not passed a block, will inspect your views and send all the views with
+  # the same name as the method, so the above action would send the +welcome.plain.erb+ view file
+  # as well as the +welcome.html.erb+ view file in a +multipart/alternative+ email.
+  # 
+  # If you want to explicitly render only certain templates, pass a block:
+  # 
+  #   mail(:to => user.emai) do |format|
+  #     format.text
+  #     format.html
+  #   end
   #
-  # Mailer methods have the following configuration methods available.
+  # The block syntax is useful if also need to specify information specific to a part:
   #
-  # * <tt>recipients</tt> - Takes one or more email addresses. These addresses are where your email will be delivered to. Sets the <tt>To:</tt> header.
-  # * <tt>subject</tt> - The subject of your email. Sets the <tt>Subject:</tt> header.
-  # * <tt>from</tt> - Who the email you are sending is from. Sets the <tt>From:</tt> header.
-  # * <tt>cc</tt> - Takes one or more email addresses. These addresses will receive a carbon copy of your email. Sets the <tt>Cc:</tt> header.
-  # * <tt>bcc</tt> - Takes one or more email addresses. These addresses will receive a blind carbon copy of your email. Sets the <tt>Bcc:</tt> header.
-  # * <tt>reply_to</tt> - Takes one or more email addresses. These addresses will be listed as the default recipients when replying to your email. Sets the <tt>Reply-To:</tt> header.
-  # * <tt>sent_on</tt> - The date on which the message was sent. If not set, the header will be set by the delivery agent.
-  # * <tt>content_type</tt> - Specify the content type of the message. Defaults to <tt>text/plain</tt>.
-  # * <tt>headers</tt> - Specify additional headers to be set for the message, e.g. <tt>headers 'X-Mail-Count' => 107370</tt>.
+  #   mail(:to => user.emai) do |format|
+  #     format.text(:content_transfer_encoding => "base64")
+  #     format.html
+  #   end
   #
-  # When a <tt>headers 'return-path'</tt> is specified, that value will be used as the 'envelope from'
-  # address. Setting this is useful when you want delivery notifications sent to a different address than
-  # the one in <tt>from</tt>.
+  # Or even to renderize a special view:
   #
+  #   mail(:to => user.emai) do |format|
+  #     format.text
+  #     format.html { render "some_other_template" }
+  #   end
   #
   # = Mailer views
   #
-  # Like Action Controller, each mailer class has a corresponding view directory
-  # in which each method of the class looks for a template with its name.
-  # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same name as the method
-  # in your mailer model. For example, in the mailer defined above, the template at
-  # <tt>app/views/notifier/signup_notification.erb</tt> would be used to generate the email.
+  # Like Action Controller, each mailer class has a corresponding view directory in which each
+  # method of the class looks for a template with its name.
+  # 
+  # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same
+  # name as the method in your mailer model. For example, in the mailer defined above, the template at
+  # <tt>app/views/notifier/signup_notification.text.erb</tt> would be used to generate the email.
   #
   # Variables defined in the model are accessible as instance variables in the view.
   #
@@ -64,9 +99,9 @@ module ActionMailer #:nodoc:
   #   You got a new note!
   #   <%= truncate(@note.body, 25) %>
   #
-  # If you need to access the subject, from or the recipients in the view, you can do that through mailer object:
+  # If you need to access the subject, from or the recipients in the view, you can do that through message object:
   #
-  #   You got a new note from <%= mailer.from %>!
+  #   You got a new note from <%= message.from %>!
   #   <%= truncate(@note.body, 25) %>
   #
   #
@@ -106,54 +141,13 @@ module ActionMailer #:nodoc:
   # Once a mailer action and template are defined, you can deliver your message or create it and save it
   # for delivery later:
   #
-  #   Notifier.deliver_signup_notification(david) # sends the email
-  #   mail = Notifier.create_signup_notification(david)  # => a tmail object
-  #   Notifier.deliver(mail)
-  #
-  # You never instantiate your mailer class. Rather, your delivery instance
-  # methods are automatically wrapped in class methods that start with the word
-  # <tt>deliver_</tt> followed by the name of the mailer method that you would
-  # like to deliver. The <tt>signup_notification</tt> method defined above is
-  # delivered by invoking <tt>Notifier.deliver_signup_notification</tt>.
+  #   Notifier.welcome(david).deliver # sends the email
+  #   mail = Notifier.welcome(david)  # => a Mail::Message object
+  #   mail.deliver                    # sends the email
   #
+  # You never instantiate your mailer class. Rather, you just call the method on the class itself.
   #
-  # = HTML email
-  #
-  # To send mail as HTML, make sure your view (the <tt>.erb</tt> file) generates HTML and
-  # set the content type to html.
-  #
-  #   class MyMailer < ActionMailer::Base
-  #     def signup_notification(recipient)
-  #       recipients   recipient.email_address_with_name
-  #       subject      "New account information"
-  #       from         "system@example.com"
-  #       body         :account => recipient
-  #       content_type "text/html"
-  #     end
-  #   end
-  #
-  #
-  # = Multipart email
-  #
-  # You can explicitly specify multipart messages:
-  #
-  #   class ApplicationMailer < ActionMailer::Base
-  #     def signup_notification(recipient)
-  #       recipients      recipient.email_address_with_name
-  #       subject         "New account information"
-  #       from            "system@example.com"
-  #       content_type    "multipart/alternative"
-  #       body            :account => recipient
-  #
-  #       part :content_type => "text/html",
-  #         :data => render_message("signup-as-html")
-  #
-  #       part "text/plain" do |p|
-  #         p.body = render_message("signup-as-plain")
-  #         p.content_transfer_encoding = "base64"
-  #       end
-  #     end
-  #   end
+  # = Multipart Emails
   #
   # Multipart messages can also be used implicitly because Action Mailer will automatically
   # detect and use multipart templates, where each template is named after the name of the action, followed
@@ -163,13 +157,12 @@ module ActionMailer #:nodoc:
   # * signup_notification.text.plain.erb
   # * signup_notification.text.html.erb
   # * signup_notification.text.xml.builder
-  # * signup_notification.text.x-yaml.erb
+  # * signup_notification.text.yaml.erb
   #
-  # Each would be rendered and added as a separate part to the message,
-  # with the corresponding content type. The content type for the entire
-  # message is automatically set to <tt>multipart/alternative</tt>, which indicates
-  # that the email contains multiple different representations of the same email
-  # body. The same body hash is passed to each template.
+  # Each would be rendered and added as a separate part to the message, with the corresponding content
+  # type. The content type for the entire message is automatically set to <tt>multipart/alternative</tt>,
+  # which indicates that the email contains multiple different representations of the same email
+  # body. The same instance variables defined in the action are passed to all email templates.
   #
   # Implicit template rendering is not performed if any attachments or parts have been added to the email.
   # This means that you'll have to manually add each part to the email and set the content type of the email
@@ -177,32 +170,35 @@ module ActionMailer #:nodoc:
   #
   # = Attachments
   #
-  # Attachments can be added by using the +attachment+ method.
-  #
-  # Example:
+  # You can see above how to make a multipart HTML / Text email, to send attachments is just
+  # as easy:
   #
   #   class ApplicationMailer < ActionMailer::Base
-  #     # attachments
-  #     def signup_notification(recipient)
-  #       recipients      recipient.email_address_with_name
-  #       subject         "New account information"
-  #       from            "system@example.com"
-  #
-  #       attachment :content_type => "image/jpeg",
-  #         :body => File.read("an-image.jpg")
-  #
-  #       attachment "application/pdf" do |a|
-  #         a.body = generate_your_pdf_here()
-  #       end
+  #     def welcome(recipient)
+  #       attachments['free_book.pdf'] = { :data => File.read('path/to/file.pdf') }
+  #       mail(:to => recipient, :subject => "New account information")
   #     end
   #   end
+  # 
+  # Which will (if it had both a <tt>.text.erb</tt> and <tt>.html.erb</tt> tempalte in the view
+  # directory), send a complete <tt>multipart/mixed</tt> email with two parts, the first part being
+  # a <tt>multipart/alternative</tt> with the text and HTML email parts inside, and the second being
+  # a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book with the filename
+  # +free_book.pdf+.
   #
   #
   # = Configuration options
   #
   # These options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
   #
-  # * <tt>template_root</tt> - Determines the base from which template references will be made.
+  # * <tt>default</tt> - This is a class wide hash of <tt>:key => value</tt> pairs containing
+  #   default values for the specified header fields of the <tt>Mail::Message</tt>.  You can 
+  #   specify a default for any valid header for <tt>Mail::Message</tt> and it will be used if
+  #   you do not override it.  The defaults set by Action Mailer are:
+  #   * <tt>:mime_version => "1.0"</tt>
+  #   * <tt>:charset      => "utf-8",</tt>
+  #   * <tt>:content_type => "text/plain",</tt>
+  #   * <tt>:parts_order  => [ "text/plain", "text/enriched", "text/html" ]</tt>
   #
   # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
   #   Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
@@ -236,23 +232,22 @@ module ActionMailer #:nodoc:
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with <tt>delivery_method :test</tt>. Most useful
   #   for unit and functional testing.
   #
-  # * <tt>default_charset</tt> - The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
-  #   pick a different charset from inside a method with +charset+.
+  # * <tt>default_charset</tt> - This is now deprecated, use the +default+ method above to 
+  #   set the default +:charset+.
   #
-  # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You
-  #   can also pick a different content type from inside a method with +content_type+.
+  # * <tt>default_content_type</tt> - This is now deprecated, use the +default+ method above 
+  #   to set the default +:content_type+.
   #
-  # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to <tt>1.0</tt>. You
-  #   can also pick a different value from inside a method with +mime_version+.
+  # * <tt>default_mime_version</tt> - This is now deprecated, use the +default+ method above 
+  #   to set the default +:mime_version+.
   #
-  # * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates
-  #   which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
-  #   <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
-  #   and appear last in the mime encoded message. You can also pick a different order from inside a method with
-  #   +implicit_parts_order+.
+  # * <tt>default_implicit_parts_order</tt> - This is now deprecated, use the +default+ method above 
+  #   to set the default +:parts_order+.  Parts Order is used when a message is built implicitly
+  #   (i.e. multiple parts are assembled from templates which specify the content type in their
+  #   filenames) this variable controls how the parts are ordered.
   class Base < AbstractController::Base
-    include Quoting
-    extend  AdvAttrAccessor
+    include DeliveryMethods, Quoting
+    abstract!
 
     include AbstractController::Logger
     include AbstractController::Rendering
@@ -260,131 +255,34 @@ module ActionMailer #:nodoc:
     include AbstractController::Layouts
     include AbstractController::Helpers
     include AbstractController::UrlFor
+    include AbstractController::Translation
 
     helper  ActionMailer::MailHelper
-    include ActionMailer::DeprecatedBody
-
-    private_class_method :new #:nodoc:
-
-    @@raise_delivery_errors = true
-    cattr_accessor :raise_delivery_errors
-
-    @@perform_deliveries = true
-    cattr_accessor :perform_deliveries
-
-    @@deliveries = []
-    cattr_accessor :deliveries
-
-    @@default_charset = "utf-8"
-    cattr_accessor :default_charset
-
-    @@default_content_type = "text/plain"
-    cattr_accessor :default_content_type
-
-    @@default_mime_version = "1.0"
-    cattr_accessor :default_mime_version
-
-    # This specifies the order that the parts of a multipart email will be.  Usually you put
-    # text/plain at the top so someone without a MIME capable email reader can read the plain
-    # text of your email first.
-    #
-    # Any content type that is not listed here will be inserted in the order you add them to
-    # the email after the content types you list here.
-    @@default_implicit_parts_order = [ "text/plain", "text/enriched", "text/html" ]
-    cattr_accessor :default_implicit_parts_order
-
-    @@protected_instance_variables = %w(@parts @mail)
-    cattr_reader :protected_instance_variables
-
-    # Specify the BCC addresses for the message
-    adv_attr_accessor :bcc
-
-    # Specify the CC addresses for the message.
-    adv_attr_accessor :cc
 
-    # Specify the charset to use for the message. This defaults to the
-    # +default_charset+ specified for ActionMailer::Base.
-    adv_attr_accessor :charset
+    include ActionMailer::OldApi
+    include ActionMailer::DeprecatedApi
 
-    # Specify the content type for the message. This defaults to <tt>text/plain</tt>
-    # in most cases, but can be automatically set in some situations.
-    adv_attr_accessor :content_type
-
-    # Specify the from address for the message.
-    adv_attr_accessor :from
-
-    # Specify the address (if different than the "from" address) to direct
-    # replies to this message.
-    adv_attr_accessor :reply_to
-
-    # Specify additional headers to be added to the message.
-    adv_attr_accessor :headers
-
-    # Specify the order in which parts should be sorted, based on content-type.
-    # This defaults to the value for the +default_implicit_parts_order+.
-    adv_attr_accessor :implicit_parts_order
-
-    # Defaults to "1.0", but may be explicitly given if needed.
-    adv_attr_accessor :mime_version
-
-    # The recipient addresses for the message, either as a string (for a single
-    # address) or an array (for multiple addresses).
-    adv_attr_accessor :recipients
-
-    # The date on which the message was sent. If not set (the default), the
-    # header will be set by the delivery agent.
-    adv_attr_accessor :sent_on
-
-    # Specify the subject of the message.
-    adv_attr_accessor :subject
-
-    # Specify the template name to use for current message. This is the "base"
-    # template name, without the extension or directory, and may be used to
-    # have multiple mailer methods share the same template.
-    adv_attr_accessor :template
-
-    # Override the mailer name, which defaults to an inflected version of the
-    # mailer's class name. If you want to use a template in a non-standard
-    # location, you can use this to specify that location.
-    adv_attr_accessor :mailer_name
-
-    # Expose the internal mail
-    attr_reader :mail
+    private_class_method :new #:nodoc:
 
-    # Alias controller_path to mailer_name so render :partial in views work.
-    alias :controller_path :mailer_name
+    extlib_inheritable_accessor :default_params
+    self.default_params = {
+      :mime_version => "1.0",
+      :charset      => "utf-8",
+      :content_type => "text/plain",
+      :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
+    }
 
     class << self
-      attr_writer :mailer_name
-
-      delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::File, :prefix => :file
-      delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::Sendmail, :prefix => :sendmail
-      delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::Smtp, :prefix => :smtp
 
       def mailer_name
         @mailer_name ||= name.underscore
       end
+      attr_writer :mailer_name
       alias :controller_path :mailer_name
 
-      def delivery_method=(method_name)
-        @delivery_method = ActionMailer::DeliveryMethod.lookup_method(method_name)
-      end
-
-      def respond_to?(method_symbol, include_private = false) #:nodoc:
-        matches_dynamic_method?(method_symbol) || super
-      end
-
-      def method_missing(method_symbol, *parameters) #:nodoc:
-        if match = matches_dynamic_method?(method_symbol)
-          case match[1]
-            when 'create'  then new(match[2], *parameters).mail
-            when 'deliver' then new(match[2], *parameters).deliver!
-            when 'new'     then nil
-            else super
-          end
-        else
-          super
-        end
+      def default(value=nil)
+        self.default_params.merge!(value) if value
+        self.default_params
       end
 
       # Receives a raw email, parses it into an email object, decodes it,
@@ -406,26 +304,24 @@ module ActionMailer #:nodoc:
         end
       end
 
-      # Deliver the given mail object directly. This can be used to deliver
-      # a preconstructed mail object, like:
-      #
-      #   email = MyMailer.create_some_mail(parameters)
-      #   email.set_some_obscure_header "frobnicate"
-      #   MyMailer.deliver(email)
-      def deliver(mail)
-        new.deliver!(mail)
+      # Delivers a mail object.  This is actually called by the <tt>Mail::Message</tt> object
+      # itself through a call back when you call <tt>:deliver</tt> on the Mail::Message,
+      # calling +deliver_mail+ directly and passing an Mail::Message will do nothing.
+      def deliver_mail(mail) #:nodoc:
+        ActiveSupport::Notifications.instrument("action_mailer.deliver") do |payload|
+          self.set_payload_for_mail(payload, mail)
+          yield # Let Mail do the delivery actions
+        end
       end
 
-      def template_root
-        self.view_paths && self.view_paths.first
+      def respond_to?(method, *args) #:nodoc:
+        super || action_methods.include?(method.to_s)
       end
 
-      # Should template root overwrite the whole view_paths?
-      def template_root=(root)
-        self.view_paths = ActionView::Base.process_view_paths(root)
-      end
+    protected
 
       def set_payload_for_mail(payload, mail) #:nodoc:
+        payload[:mailer]     = self.name
         payload[:message_id] = mail.message_id
         payload[:subject]    = mail.subject
         payload[:to]         = mail.to
@@ -436,61 +332,16 @@ module ActionMailer #:nodoc:
         payload[:mail]       = mail.encoded
       end
 
-      private
-
-        def matches_dynamic_method?(method_name) #:nodoc:
-          method_name = method_name.to_s
-          /^(create|deliver)_([_a-z]\w*)/.match(method_name) || /^(new)$/.match(method_name)
+      def method_missing(method, *args) #:nodoc:
+        if action_methods.include?(method.to_s)
+          new(method, *args).message
+        else
+          super
         end
-    end
-
-    # Configure delivery method. Check ActionMailer::DeliveryMethod for more
-    # instructions.
-    superclass_delegating_reader :delivery_method
-    self.delivery_method = :smtp
-
-    # Add a part to a multipart message, with the given content-type. The
-    # part itself is yielded to the block so that other properties (charset,
-    # body, headers, etc.) can be set on it.
-    def part(params)
-      params = {:content_type => params} if String === params
-
-      if custom_headers = params.delete(:headers)
-        ActiveSupport::Deprecation.warn('Passing custom headers with :headers => {} is deprecated. ' <<
-                                        'Please just pass in custom headers directly.', caller[0,10])
-        params.merge!(custom_headers)
       end
-
-      part = Mail::Part.new(params)
-      yield part if block_given?
-      @parts << part
-    end
-
-    # Add an attachment to a multipart message. This is simply a part with the
-    # content-disposition set to "attachment".
-    def attachment(params, &block)
-      super # Run deprecation hooks
-
-      params = { :content_type => params } if String === params
-      params = { :content_disposition => "attachment",
-                 :content_transfer_encoding => "base64" }.merge(params)
-
-      part(params, &block)
     end
 
-    # Allow you to set assigns for your template:
-    #
-    #   body :greetings => "Hi"
-    #
-    # Will make @greetings available in the template to be rendered.
-    def body(object=nil)
-      returning(super) do # Run deprecation hooks
-        if object.is_a?(Hash)
-          @assigns_set = true
-          object.each { |k, v| instance_variable_set(:"@#{k}", v) }
-        end
-      end
-    end
+    attr_internal :message
 
     # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
     # will be initialized according to the named method. If not, the mailer will
@@ -498,167 +349,263 @@ module ActionMailer #:nodoc:
     # method, for instance).
     def initialize(method_name=nil, *args)
       super()
+      @_message = Mail.new
       process(method_name, *args) if method_name
     end
 
-    # Process the mailer via the given +method_name+. The body will be
-    # rendered and a new Mail object created.
-    def process(method_name, *args)
-      initialize_defaults(method_name)
-      super
-
-      # Create e-mail parts
-      create_parts
-
-      # Set the subject if not set yet
-      @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name],
-                                    :default => method_name.humanize)
-
-      # Build the mail object itself
-      create_mail
-    end
-
-    # Delivers a Mail object. By default, it delivers the cached mail
-    # object (from the <tt>create!</tt> method). If no cached mail object exists, and
-    # no alternate has been given as the parameter, this will fail.
-    def deliver!(mail = @mail)
-      raise "no mail object available for delivery!" unless mail
-
-      ActiveSupport::Notifications.instrument("action_mailer.deliver",
-        :template => template, :mailer => self.class.name) do |payload|
-
-        self.class.set_payload_for_mail(payload, mail)
-
-        begin
-          self.delivery_method.perform_delivery(mail) if perform_deliveries
-        rescue Exception => e # Net::SMTP errors or sendmail pipe errors
-          raise e if raise_delivery_errors
-        end
+    # Allows you to pass random and unusual headers to the new +Mail::Message+ object
+    # which will add them to itself.
+    # 
+    #   headers['X-Special-Domain-Specific-Header'] = "SecretValue"
+    # 
+    # You can also pass a hash into headers of header field names and values, which
+    # will then be set on the Mail::Message object:
+    # 
+    #   headers 'X-Special-Domain-Specific-Header' => "SecretValue",
+    #           'In-Reply-To' => incoming.message_id
+    # 
+    # The resulting Mail::Message will have the following in it's header:
+    # 
+    #   X-Special-Domain-Specific-Header: SecretValue
+    def headers(args=nil)
+      if args
+        @_message.headers(args)
+      else
+        @_message
       end
-
-      mail
     end
 
-    private
+    # Allows you to add attachments to an email, like so:
+    # 
+    #  mail.attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
+    # 
+    # If you do this, then Mail will take the file name and work out the mime type
+    # set the Content-Type, Content-Disposition, Content-Transfer-Encoding and 
+    # base64 encode the contents of the attachment all for you.
+    # 
+    # You can also specify overrides if you want by passing a hash instead of a string:
+    # 
+    #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
+    #                                      :content => File.read('/path/to/filename.jpg')}
+    # 
+    # If you want to use a different encoding than Base64, you can pass an encoding in,
+    # but then it is up to you to pass in the content pre-encoded, and don't expect
+    # Mail to know how to decode this data:
+    # 
+    #  file_content = SpecialEncode(File.read('/path/to/filename.jpg'))
+    #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
+    #                                      :encoding => 'SpecialEncoding',
+    #                                      :content => file_content }
+    # 
+    # You can also search for specific attachments:
+    # 
+    #  # By Filename
+    #  mail.attachments['filename.jpg']   #=> Mail::Part object or nil
+    #  
+    #  # or by index
+    #  mail.attachments[0]                #=> Mail::Part (first attachment)
+    #  
+    def attachments
+      @_message.attachments
+    end
 
-      # Render a message but does not set it as mail body. Useful for rendering
-      # data for part and attachments.
-      #
-      # Examples:
-      #
-      #   render_message "special_message"
-      #   render_message :template => "special_message"
-      #   render_message :inline => "<%= 'Hi!' %>"
-      def render_message(object)
-        case object
-        when String
-          render_to_body(:template => object)
-        else
-          render_to_body(object)
-        end
+    # The main method that creates the message and renders the email templates. There are
+    # two ways to call this method, with a block, or without a block.
+    # 
+    # Both methods accept a headers hash. This hash allows you to specify the most used headers
+    # in an email message, these are:
+    # 
+    # * <tt>:subject</tt> - The subject of the message, if this is omitted, ActionMailer will
+    #   ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of
+    #   <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the
+    #   humanized version of the <tt>action_name</tt>
+    # * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array
+    #   of addresses.
+    # * <tt>:from</tt> - Who the message is from
+    # * <tt>:cc</tt> - Who you would like to Carbon-Copy on this email, can be a string of addresses,
+    #   or an array of addresses.
+    # * <tt>:bcc</tt> - Who you would like to Blind-Carbon-Copy on this email, can be a string of
+    #   addresses, or an array of addresses.
+    # * <tt>:reply_to</tt> - Who to set the Reply-To header of the email to.
+    # * <tt>:date</tt> - The date to say the email was sent on.
+    # 
+    # You can set default values for any of the above headers (except :date) by using the <tt>default</tt> 
+    # class method:
+    # 
+    #  class Notifier < ActionMailer::Base
+    #    self.default :from => 'no-reply@test.lindsaar.net',
+    #                 :bcc => 'email_logger@test.lindsaar.net',
+    #                 :reply_to => 'bounces@test.lindsaar.net'
+    #  end
+    # 
+    # If you need other headers not listed above, use the <tt>headers['name'] = value</tt> method.
+    #
+    # When a <tt>:return_path</tt> is specified as header, that value will be used as the 'envelope from'
+    # address for the Mail message.  Setting this is useful when you want delivery notifications
+    # sent to a different address than the one in <tt>:from</tt>.  Mail will actually use the 
+    # <tt>:return_path</tt> in preference to the <tt>:sender</tt> in preference to the <tt>:from</tt>
+    # field for the 'envelope from' value.
+    #
+    # If you do not pass a block to the +mail+ method, it will find all templates in the 
+    # template path that match the method name that it is being called from, it will then
+    # create parts for each of these templates intelligently, making educated guesses
+    # on correct content type and sequence, and return a fully prepared Mail::Message
+    # ready to call <tt>:deliver</tt> on to send.
+    #
+    # If you do pass a block, you can render specific templates of your choice:
+    # 
+    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
+    #     format.text
+    #     format.html
+    #   end
+    # 
+    # You can even render text directly without using a template:
+    # 
+    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
+    #     format.text { render :text => "Hello Mikel!" }
+    #     format.html { render :text => "<h1>Hello Mikel!</h1>" }
+    #   end
+    # 
+    # Which will render a <tt>multipart/alternative</tt> email with <tt>text/plain</tt> and
+    # <tt>text/html</tt> parts.
+    #
+    # The block syntax also allows you to customize the part headers if desired:
+    #
+    #   mail(:to => 'mikel@test.lindsaar.net') do |format|
+    #     format.text(:content_transfer_encoding => "base64")
+    #     format.html
+    #   end
+    #
+    def mail(headers={}, &block)
+      # Guard flag to prevent both the old and the new API from firing
+      # Should be removed when old API is removed
+      @mail_was_called = true
+      m = @_message
+
+      # At the beginning, do not consider class default for parts order neither content_type
+      content_type = headers[:content_type]
+      parts_order  = headers[:parts_order]
+
+      # Merge defaults from class
+      headers = headers.reverse_merge(self.class.default)
+      charset = headers[:charset]
+
+      # Quote fields
+      headers[:subject] ||= default_i18n_subject
+      quote_fields!(headers, charset)
+
+      # Render the templates and blocks
+      responses, explicit_order = collect_responses_and_parts_order(headers, &block)
+      create_parts_from_responses(m, responses, charset)
+
+      # Finally setup content type and parts order
+      m.content_type = set_content_type(m, content_type, headers[:content_type])
+      m.charset      = charset
+
+      if m.multipart?
+        parts_order ||= explicit_order || headers[:parts_order]
+        m.body.set_sort_order(parts_order)
+        m.body.sort_parts!
       end
 
-      # Set up the default values for the various instance variables of this
-      # mailer. Subclasses may override this method to provide different
-      # defaults.
-      def initialize_defaults(method_name) #:nodoc:
-        @charset              ||= @@default_charset.dup
-        @content_type         ||= @@default_content_type.dup
-        @implicit_parts_order ||= @@default_implicit_parts_order.dup
-        @mime_version         ||= @@default_mime_version.dup if @@default_mime_version
+      # Set configure delivery behavior
+      wrap_delivery_behavior!(headers[:delivery_method])
 
-        @mailer_name ||= self.class.mailer_name.dup
-        @template    ||= method_name
+      # Remove headers already treated and assign all others
+      headers.except!(:subject, :to, :from, :cc, :bcc, :reply_to)
+      headers.except!(:body, :parts_order, :content_type, :charset, :delivery_method)
+      headers.each { |k, v| m[k] = v }
 
-        @parts   ||= []
-        @headers ||= {}
-        @sent_on ||= Time.now
+      m
+    end
 
-        super # Run deprecation hooks
+  protected
+
+    def set_content_type(m, user_content_type, class_default)
+      params = m.content_type_parameters || {}
+      case
+      when user_content_type.present?
+        user_content_type
+      when m.has_attachments?
+        ["multipart", "mixed", params]
+      when m.multipart?
+        ["multipart", "alternative", params]
+      else
+        m.content_type || class_default
       end
+    end
 
-      def create_parts #:nodoc:
-        super # Run deprecation hooks
-
-        if String === response_body
-          @parts.unshift create_inline_part(response_body)
-        else
-          self.class.template_root.find_all(@template, {}, @mailer_name).each do |template|
-            @parts << create_inline_part(render_to_body(:_template => template), template.mime_type)
-          end
+    def default_i18n_subject #:nodoc:
+      mailer_scope = self.class.mailer_name.gsub('/', '.')
+      I18n.t(:subject, :scope => [:actionmailer, mailer_scope, action_name], :default => action_name.humanize)
+    end
 
-          if @parts.size > 1
-            @content_type = "multipart/alternative" if @content_type !~ /^multipart/
-          end
+    # TODO: Move this into Mail
+    def quote_fields!(headers, charset) #:nodoc:
+      m = @_message
+      m.subject  ||= quote_if_necessary(headers[:subject], charset)          if headers[:subject]
+      m.to       ||= quote_address_if_necessary(headers[:to], charset)       if headers[:to]
+      m.from     ||= quote_address_if_necessary(headers[:from], charset)     if headers[:from]
+      m.cc       ||= quote_address_if_necessary(headers[:cc], charset)       if headers[:cc]
+      m.bcc      ||= quote_address_if_necessary(headers[:bcc], charset)      if headers[:bcc]
+      m.reply_to ||= quote_address_if_necessary(headers[:reply_to], charset) if headers[:reply_to]
+    end
 
-          # If this is a multipart e-mail add the mime_version if it is not
-          # already set.
-          @mime_version ||= "1.0" if !@parts.empty?
+    def collect_responses_and_parts_order(headers) #:nodoc:
+      responses, parts_order = [], nil
+
+      if block_given?
+        collector = ActionMailer::Collector.new(self) { render(action_name) }
+        yield(collector)
+        parts_order = collector.responses.map { |r| r[:content_type] }
+        responses  = collector.responses
+      elsif headers[:body]
+        responses << {
+          :body => headers[:body],
+          :content_type => self.class.default[:content_type] || "text/plain"
+        }
+      else
+        each_template do |template|
+          responses << {
+            :body => render_to_body(:_template => template),
+            :content_type => template.mime_type.to_s
+          }
         end
       end
 
-      def create_inline_part(body, mime_type=nil) #:nodoc:
-        ct = mime_type || "text/plain"
-        main_type, sub_type = split_content_type(ct.to_s)
-
-        Mail::Part.new(
-          :content_type => [main_type, sub_type, {:charset => charset}],
-          :content_disposition => "inline",
-          :body => body
-        )
-      end
-
-      def create_mail #:nodoc:
-        m = Mail.new
-
-        m.subject,     = quote_any_if_necessary(charset, subject)
-        m.to, m.from   = quote_any_address_if_necessary(charset, recipients, from)
-        m.bcc          = quote_address_if_necessary(bcc, charset) unless bcc.nil?
-        m.cc           = quote_address_if_necessary(cc, charset) unless cc.nil?
-        m.reply_to     = quote_address_if_necessary(reply_to, charset) unless reply_to.nil?
-        m.mime_version = mime_version unless mime_version.nil?
-        m.date         = sent_on.to_time rescue sent_on if sent_on
-
-        headers.each { |k, v| m[k] = v }
-
-        real_content_type, ctype_attrs = parse_content_type
-        main_type, sub_type = split_content_type(real_content_type)
-
-        if @parts.size == 1 && @parts.first.parts.empty?
-          m.content_type([main_type, sub_type, ctype_attrs])
-          m.body = @parts.first.body.encoded
-        else
-          @parts.each do |p|
-            m.add_part(p)
-          end
+      [responses, parts_order]
+    end
 
-          m.body.set_sort_order(@implicit_parts_order)
-          m.body.sort_parts!
+    def each_template(&block) #:nodoc:
+      self.class.view_paths.each do |load_paths|
+        templates = load_paths.find_all(action_name, {}, self.class.mailer_name)
+        templates = templates.uniq_by { |t| t.details[:formats] }
 
-          if real_content_type =~ /multipart/
-            ctype_attrs.delete "charset"
-            m.content_type([main_type, sub_type, ctype_attrs])
-          end
+        unless templates.empty?
+          templates.each(&block)
+          return
         end
-
-        m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii?
-        
-        @mail = m
-      end
-      
-      def split_content_type(ct) #:nodoc:
-        ct.to_s.split("/")
       end
+    end
 
-      def parse_content_type(defaults=nil) #:nodoc:
-        if @content_type.blank?
-          [ nil, {} ]
-        else
-          ctype, *attrs = @content_type.split(/;\s*/)
-          attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h }
-          [ctype, {"charset" => @charset}.merge(attrs)]
-        end
+    def create_parts_from_responses(m, responses, charset) #:nodoc:
+      if responses.size == 1 && !m.has_attachments?
+        responses[0].each { |k,v| m[k] = v }
+      elsif responses.size > 1 && m.has_attachments?
+        container = Mail::Part.new
+        container.content_type = "multipart/alternative"
+        responses.each { |r| insert_part(container, r, charset) }
+        m.add_part(container)
+      else
+        responses.each { |r| insert_part(m, r, charset) }
       end
+    end
+
+    def insert_part(container, response, charset) #:nodoc:
+      response[:charset] ||= charset
+      part = Mail::Part.new(response)
+      container.add_part(part)
+    end
 
   end
 end
diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb
new file mode 100644
index 0000000000..5431efccfe
--- /dev/null
+++ b/actionmailer/lib/action_mailer/collector.rb
@@ -0,0 +1,36 @@
+require 'abstract_controller/collector'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/array/extract_options'
+
+module ActionMailer #:nodoc:
+  class Collector
+    include AbstractController::Collector
+    attr_reader :responses
+
+    def initialize(context, &block)
+      @context = context
+      @responses = []
+      @default_render = block
+      @default_formats = context.formats
+    end
+
+    def any(*args, &block)
+      options = args.extract_options!
+      raise "You have to supply at least one format" if args.empty?
+      args.each { |type| send(type, options.dup, &block) }
+    end
+    alias :all :any
+
+    def custom(mime, options={}, &block)
+      options.reverse_merge!(:content_type => mime.to_s)
+      @context.formats = [mime.to_sym]
+      options[:body] = if block
+        block.call
+      else
+        @default_render.call
+      end
+      @responses << options
+      @context.formats = @default_formats
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/delivery_method.rb b/actionmailer/lib/action_mailer/delivery_method.rb
deleted file mode 100644
index 4f7d3afc3c..0000000000
--- a/actionmailer/lib/action_mailer/delivery_method.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-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'
-    autoload :Test,     'action_mailer/delivery_method/test'
-
-    # Creates a new DeliveryMethod object according to the given options.
-    #
-    # If no arguments are passed to this method, then a new
-    # ActionMailer::DeliveryMethod::Stmp object will be returned.
-    #
-    # If you pass a Symbol as the first argument, then a corresponding
-    # delivery method class under the ActionMailer::DeliveryMethod namespace
-    # will be created.
-    # For example:
-    #
-    #   ActionMailer::DeliveryMethod.lookup_method(:sendmail)
-    #   # => returns a new ActionMailer::DeliveryMethod::Sendmail object
-    #
-    # If the first argument is not a Symbol, then it will simply be returned:
-    #
-    #   ActionMailer::DeliveryMethod.lookup_method(MyOwnDeliveryMethod.new)
-    #   # => returns MyOwnDeliveryMethod.new
-    def self.lookup_method(delivery_method)
-      case delivery_method
-      when Symbol
-        method_name  = delivery_method.to_s.camelize
-        method_class = ActionMailer::DeliveryMethod.const_get(method_name)
-        method_class.new
-      when nil # default
-        Smtp.new
-      else
-        delivery_method
-      end
-    end
-
-    # An abstract delivery method class. There are multiple delivery method classes.
-    # See the classes under the ActionMailer::DeliveryMethod, e.g.
-    # ActionMailer::DeliveryMethod::Smtp.
-    # Smtp is the default delivery method for production
-    # while Test is used in testing.
-    #
-    # each delivery method exposes just one method
-    #
-    #   delivery_method = ActionMailer::DeliveryMethod::Smtp.new
-    #   delivery_method.perform_delivery(mail) # send the mail via smtp
-    #
-    class Method
-      superclass_delegating_accessor :settings
-      self.settings = {}
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb
deleted file mode 100644
index 571e32df49..0000000000
--- a/actionmailer/lib/action_mailer/delivery_method/file.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'tmpdir'
-
-module ActionMailer
-  module DeliveryMethod
-
-    # A delivery method implementation which writes all mails to a file.
-    class File < Method
-      self.settings = {
-        :location       => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
-      }
-
-      def perform_delivery(mail)
-        FileUtils.mkdir_p settings[:location]
-
-        mail.destinations.uniq.each do |to|
-          ::File.open(::File.join(settings[:location], to), 'a') { |f| f.write(mail) }
-        end
-      end
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/delivery_method/sendmail.rb b/actionmailer/lib/action_mailer/delivery_method/sendmail.rb
deleted file mode 100644
index db55af79f1..0000000000
--- a/actionmailer/lib/action_mailer/delivery_method/sendmail.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module ActionMailer
-  module DeliveryMethod
-
-    # A delivery method implementation which sends via sendmail.
-    class Sendmail < Method
-      self.settings = {
-        :location       => '/usr/sbin/sendmail',
-        :arguments      => '-i -t'
-      }
-
-      def perform_delivery(mail)
-        sendmail_args = settings[:arguments]
-        sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path']
-        IO.popen("#{settings[:location]} #{sendmail_args}","w+") do |sm|
-          sm.print(mail.encoded.gsub(/\r/, ''))
-          sm.flush
-        end
-      end
-    end
-
-  end
-end
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
deleted file mode 100644
index af30c498b5..0000000000
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'net/smtp'
-
-module ActionMailer
-  module DeliveryMethod
-    # A delivery method implementation which sends via smtp.
-    class Smtp < Method
-      self.settings = {
-        :address              => "localhost",
-        :port                 => 25,
-        :domain               => 'localhost.localdomain',
-        :user_name            => nil,
-        :password             => nil,
-        :authentication       => nil,
-        :enable_starttls_auto => true,
-      }
-
-      def perform_delivery(mail)
-        destinations = mail.destinations
-        sender = (mail['return-path'] && mail['return-path'].address) || mail['from']
-
-        smtp = Net::SMTP.new(settings[:address], settings[:port])
-        smtp.enable_starttls_auto if settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)
-        smtp.start(settings[:domain], settings[:user_name], settings[:password],
-                   settings[:authentication]) do |smtp|
-          smtp.sendmail(mail.encoded, sender, destinations)
-        end
-      end
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/delivery_method/test.rb b/actionmailer/lib/action_mailer/delivery_method/test.rb
deleted file mode 100644
index 6e3239d52a..0000000000
--- a/actionmailer/lib/action_mailer/delivery_method/test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module ActionMailer
-  module DeliveryMethod
-
-    # A delivery method implementation designed for testing, which just appends each record to the :deliveries array
-    class Test < Method
-      def perform_delivery(mail)
-        ActionMailer::Base.deliveries << mail
-      end
-    end
-
-  end
-end
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb
new file mode 100644
index 0000000000..f6321a240c
--- /dev/null
+++ b/actionmailer/lib/action_mailer/delivery_methods.rb
@@ -0,0 +1,90 @@
+require 'tmpdir'
+
+module ActionMailer
+  # This modules handles everything related to the delivery, from registering new
+  # delivery methods to configuring the mail object to be send.
+  module DeliveryMethods
+    extend ActiveSupport::Concern
+
+    included do
+      extlib_inheritable_accessor :delivery_methods, :delivery_method,
+                                  :instance_writer => false
+
+      # Do not make this inheritable, because we always want it to propagate
+      cattr_accessor :raise_delivery_errors
+      self.raise_delivery_errors = true
+
+      cattr_accessor :perform_deliveries
+      self.perform_deliveries = true
+
+      self.delivery_methods = {}
+      self.delivery_method  = :smtp
+
+      add_delivery_method :smtp, Mail::SMTP,
+        :address              => "localhost",
+        :port                 => 25,
+        :domain               => 'localhost.localdomain',
+        :user_name            => nil,
+        :password             => nil,
+        :authentication       => nil,
+        :enable_starttls_auto => true
+
+      add_delivery_method :file, Mail::FileDelivery,
+        :location => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
+
+      add_delivery_method :sendmail, Mail::Sendmail,
+        :location   => '/usr/sbin/sendmail',
+        :arguments  => '-i -t'
+
+      add_delivery_method :test, Mail::TestMailer
+    end
+
+    module ClassMethods
+      # Provides a list of emails that have been delivered by Mail::TestMailer
+      delegate :deliveries, :deliveries=, :to => Mail::TestMailer
+
+      # Adds a new delivery method through the given class using the given symbol
+      # as alias and the default options supplied:
+      #
+      # Example:
+      # 
+      #   add_delivery_method :sendmail, Mail::Sendmail,
+      #     :location   => '/usr/sbin/sendmail',
+      #     :arguments  => '-i -t'
+      # 
+      def add_delivery_method(symbol, klass, default_options={})
+        unless respond_to?(:"#{symbol}_settings")
+          extlib_inheritable_accessor(:"#{symbol}_settings", :instance_writer => false)
+        end
+
+        send(:"#{symbol}_settings=", default_options)
+        self.delivery_methods[symbol.to_sym] = klass
+      end
+
+      def wrap_delivery_behavior(mail, method=nil) #:nodoc:
+        method ||= self.delivery_method
+        mail.delivery_handler = self
+
+        case method
+        when NilClass
+          raise "Delivery method cannot be nil"
+        when Symbol
+          if klass = delivery_methods[method.to_sym]
+            mail.delivery_method(klass, send(:"#{method}_settings"))
+          else
+            raise "Invalid delivery method #{method.inspect}"
+          end
+        else
+          mail.delivery_method(method)
+        end
+
+        mail.perform_deliveries    = perform_deliveries
+        mail.raise_delivery_errors = raise_delivery_errors
+      end
+    end
+
+    def wrap_delivery_behavior!(*args) #:nodoc:
+      self.class.wrap_delivery_behavior(message, *args)
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb
new file mode 100644
index 0000000000..54ad18f796
--- /dev/null
+++ b/actionmailer/lib/action_mailer/deprecated_api.rb
@@ -0,0 +1,139 @@
+module ActionMailer
+  # This is the API which is deprecated and is going to be removed on Rails 3.1 release.
+  # Part of the old API will be deprecated after 3.1, for a smoother deprecation process.
+  # Chech those in OldApi instead.
+  module DeprecatedApi #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      [:charset, :content_type, :mime_version, :implicit_parts_order].each do |method|
+        class_eval <<-FILE, __FILE__, __LINE__ + 1
+          def self.default_#{method}
+            @@default_#{method}
+          end
+
+          def self.default_#{method}=(value)
+            ActiveSupport::Deprecation.warn "ActionMailer::Base.default_#{method}=value is deprecated, " <<
+              "use default :#{method} => value instead"
+            @@default_#{method} = value
+          end
+
+          @@default_#{method} = nil
+        FILE
+      end
+    end
+
+    module ClassMethods
+      # Deliver the given mail object directly. This can be used to deliver
+      # a preconstructed mail object, like:
+      #
+      #   email = MyMailer.create_some_mail(parameters)
+      #   email.set_some_obscure_header "frobnicate"
+      #   MyMailer.deliver(email)
+      def deliver(mail, show_warning=true)
+        if show_warning
+          ActiveSupport::Deprecation.warn "#{self}.deliver is deprecated, call " <<
+            "deliver in the mailer instance instead", caller[0,2]
+        end
+
+        raise "no mail object available for delivery!" unless mail
+        wrap_delivery_behavior(mail)
+        mail.deliver
+        mail
+      end
+
+      def template_root
+        self.view_paths && self.view_paths.first
+      end
+
+      def template_root=(root)
+        ActiveSupport::Deprecation.warn "template_root= is deprecated, use view_paths.unshift instead", caller[0,2]
+        self.view_paths = ActionView::Base.process_view_paths(root)
+      end
+
+      def respond_to?(method_symbol, include_private = false)
+        matches_dynamic_method?(method_symbol) || super
+      end
+
+      def method_missing(method_symbol, *parameters)
+        if match = matches_dynamic_method?(method_symbol)
+          case match[1]
+            when 'create'
+              ActiveSupport::Deprecation.warn "#{self}.create_#{match[2]} is deprecated, " <<
+                "use #{self}.#{match[2]} instead", caller[0,2]
+              new(match[2], *parameters).message
+            when 'deliver'
+              ActiveSupport::Deprecation.warn "#{self}.deliver_#{match[2]} is deprecated, " <<
+                "use #{self}.#{match[2]}.deliver instead", caller[0,2]
+              new(match[2], *parameters).message.deliver
+            else super
+          end
+        else
+          super
+        end
+      end
+
+    private
+
+      def matches_dynamic_method?(method_name)
+        method_name = method_name.to_s
+        /^(create|deliver)_([_a-z]\w*)/.match(method_name) || /^(new)$/.match(method_name)
+      end
+    end
+
+    # Delivers a Mail object. By default, it delivers the cached mail
+    # object (from the <tt>create!</tt> method). If no cached mail object exists, and
+    # no alternate has been given as the parameter, this will fail.
+    def deliver!(mail = @_message)
+      ActiveSupport::Deprecation.warn "Calling deliver in the AM::Base object is deprecated, " <<
+        "please call deliver in the Mail instance", caller[0,2]
+      self.class.deliver(mail, false)
+    end
+    alias :deliver :deliver!
+
+    def render(*args)
+      options = args.last.is_a?(Hash) ? args.last : {}
+
+      if options[:body].is_a?(Hash)
+        ActiveSupport::Deprecation.warn(':body in render deprecated. Please use instance ' <<
+                                        'variables as assigns instead', caller[0,1])
+
+        options[:body].each { |k,v| instance_variable_set(:"@#{k}", v) }
+      end
+      super
+    end
+
+    # Render a message but does not set it as mail body. Useful for rendering
+    # data for part and attachments.
+    #
+    # Examples:
+    #
+    #   render_message "special_message"
+    #   render_message :template => "special_message"
+    #   render_message :inline => "<%= 'Hi!' %>"
+    #
+    def render_message(*args)
+      ActiveSupport::Deprecation.warn "render_message is deprecated, use render instead", caller[0,2]
+      render(*args)
+    end
+
+  private
+
+    def initialize_defaults(*)
+      @charset              ||= self.class.default_charset.try(:dup)
+      @content_type         ||= self.class.default_content_type.try(:dup)
+      @implicit_parts_order ||= self.class.default_implicit_parts_order.try(:dup)
+      @mime_version         ||= self.class.default_mime_version.try(:dup)
+      super
+    end
+
+    def create_parts
+      if @body.is_a?(Hash) && !@body.empty?
+        ActiveSupport::Deprecation.warn "Giving a hash to body is deprecated, please use instance variables instead", caller[0,2]
+        @body.each { |k, v| instance_variable_set(:"@#{k}", v) }
+      end
+      super
+    end
+
+  end
+end
diff --git a/actionmailer/lib/action_mailer/deprecated_body.rb b/actionmailer/lib/action_mailer/deprecated_body.rb
deleted file mode 100644
index 5379b33a54..0000000000
--- a/actionmailer/lib/action_mailer/deprecated_body.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-module ActionMailer
-  # TODO Remove this module all together in a next release. Ensure that super
-  # hooks and @assigns_set in ActionMailer::Base are removed as well.
-  module DeprecatedBody
-    extend ActionMailer::AdvAttrAccessor
-
-    # Define the body of the message. This is either a Hash (in which case it
-    # specifies the variables to pass to the template when it is rendered),
-    # or a string, in which case it specifies the actual text of the message.
-    adv_attr_accessor :body
-
-    def initialize_defaults(method_name)
-      @body ||= {}
-    end
-
-    def attachment(params, &block)
-      if params[:body]
-        ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' <<
-                                        'please use :data instead, like attachment :data => "string"', caller[0,10])
-        params[:data] = params.delete(:body)
-      end
-    end
-
-    def create_parts
-      if String === @body && !defined?(@assigns_set)
-        ActiveSupport::Deprecation.warn('body(String) is deprecated. To set the body with a text ' <<
-                                        'call render(:text => "body")', caller[0,10])
-        self.response_body = @body
-      elsif self.response_body
-        @body = self.response_body
-      end
-    end
-
-    def render(*args)
-      options = args.last.is_a?(Hash) ? args.last : {}
-      if options[:body]
-        ActiveSupport::Deprecation.warn(':body in render deprecated. Please call body ' <<
-                                        'with a hash instead', caller[0,1])
-
-        body options.delete(:body)
-      end
-
-      super
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 701dc34431..ab5c3469b2 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -17,8 +17,13 @@ module ActionMailer
     end
 
     # Access the mailer instance.
-    def mailer #:nodoc:
-      @controller
+    def mailer
+      @_controller
+    end
+
+    # Access the message instance.
+    def message
+      @_message
     end
   end
 end
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
new file mode 100644
index 0000000000..936ceb0dd6
--- /dev/null
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -0,0 +1,248 @@
+require 'active_support/core_ext/object/try'
+
+module ActionMailer
+  module OldApi #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      extend ActionMailer::AdvAttrAccessor
+
+      @@protected_instance_variables = %w(@parts)
+      cattr_reader :protected_instance_variables
+
+      # Specify the BCC addresses for the message
+      adv_attr_accessor :bcc
+
+      # Specify the CC addresses for the message.
+      adv_attr_accessor :cc
+
+      # Specify the charset to use for the message. This defaults to the
+      # +default_charset+ specified for ActionMailer::Base.
+      adv_attr_accessor :charset
+
+      # Specify the content type for the message. This defaults to <tt>text/plain</tt>
+      # in most cases, but can be automatically set in some situations.
+      adv_attr_accessor :content_type
+
+      # Specify the from address for the message.
+      adv_attr_accessor :from
+
+      # Specify the address (if different than the "from" address) to direct
+      # replies to this message.
+      adv_attr_accessor :reply_to
+
+      # Specify additional headers to be added to the message.
+      adv_attr_accessor :headers
+
+      # Specify the order in which parts should be sorted, based on content-type.
+      # This defaults to the value for the +default_implicit_parts_order+.
+      adv_attr_accessor :implicit_parts_order
+
+      # Defaults to "1.0", but may be explicitly given if needed.
+      adv_attr_accessor :mime_version
+
+      # The recipient addresses for the message, either as a string (for a single
+      # address) or an array (for multiple addresses).
+      adv_attr_accessor :recipients
+
+      # The date on which the message was sent. If not set (the default), the
+      # header will be set by the delivery agent.
+      adv_attr_accessor :sent_on
+
+      # Specify the subject of the message.
+      adv_attr_accessor :subject
+
+      # Specify the template name to use for current message. This is the "base"
+      # template name, without the extension or directory, and may be used to
+      # have multiple mailer methods share the same template.
+      adv_attr_accessor :template
+
+      # Override the mailer name, which defaults to an inflected version of the
+      # mailer's class name. If you want to use a template in a non-standard
+      # location, you can use this to specify that location.
+      adv_attr_accessor :mailer_name
+
+      # Define the body of the message. This is either a Hash (in which case it
+      # specifies the variables to pass to the template when it is rendered),
+      # or a string, in which case it specifies the actual text of the message.
+      adv_attr_accessor :body
+
+      # Alias controller_path to mailer_name so render :partial in views work.
+      alias :controller_path :mailer_name
+    end
+
+    def process(method_name, *args)
+      initialize_defaults(method_name)
+      super
+      unless @mail_was_called
+        create_parts
+        create_mail
+      end
+      @_message
+    end
+
+    # Add a part to a multipart message, with the given content-type. The
+    # part itself is yielded to the block so that other properties (charset,
+    # body, headers, etc.) can be set on it.
+    def part(params)
+      params = {:content_type => params} if String === params
+
+      if custom_headers = params.delete(:headers)
+        params.merge!(custom_headers)
+      end
+
+      part = Mail::Part.new(params)
+
+      yield part if block_given?
+      @parts << part
+    end
+
+    # Add an attachment to a multipart message. This is simply a part with the
+    # content-disposition set to "attachment".
+    def attachment(params, &block)
+      params = { :content_type => params } if String === params
+
+      params[:content] ||= params.delete(:data) || params.delete(:body)
+
+      if params[:filename]
+        params = normalize_file_hash(params)
+      else
+        params = normalize_nonfile_hash(params)
+      end
+
+      part(params, &block)
+    end
+
+  protected
+
+    def normalize_nonfile_hash(params)
+      content_disposition = "attachment;"
+      
+      mime_type = params.delete(:mime_type)
+      
+      if content_type = params.delete(:content_type)
+        content_type = "#{mime_type || content_type};"
+      end
+
+      params[:body] = params.delete(:data) if params[:data]
+      
+      { :content_type => content_type,
+        :content_disposition => content_disposition }.merge(params)
+    end
+    
+    def normalize_file_hash(params)
+      filename = File.basename(params.delete(:filename))
+      content_disposition = "attachment; filename=\"#{File.basename(filename)}\""
+      
+      mime_type = params.delete(:mime_type)
+      
+      if (content_type = params.delete(:content_type)) && (content_type !~ /filename=/)
+        content_type = "#{mime_type || content_type}; filename=\"#{filename}\""
+      end
+      
+      params[:body] = params.delete(:data) if params[:data]
+      
+      { :content_type => content_type,
+        :content_disposition => content_disposition }.merge(params)
+    end
+    
+    def create_mail 
+      m = @_message
+
+      quote_fields!({:subject => subject, :to => recipients, :from => from,
+                    :bcc => bcc, :cc => cc, :reply_to => reply_to}, charset)
+
+      m.mime_version = mime_version    unless mime_version.nil?
+      m.date         = sent_on.to_time rescue sent_on if sent_on
+
+      @headers.each { |k, v| m[k] = v }
+
+      real_content_type, ctype_attrs = parse_content_type
+      main_type, sub_type = split_content_type(real_content_type)
+
+      if @parts.size == 1 && @parts.first.parts.empty?
+        m.content_type([main_type, sub_type, ctype_attrs])
+        m.body = @parts.first.body.encoded
+      else
+        @parts.each do |p|
+          m.add_part(p)
+        end
+
+        m.body.set_sort_order(@implicit_parts_order)
+        m.body.sort_parts!
+
+        if real_content_type =~ /multipart/
+          ctype_attrs.delete "charset"
+          m.content_type([main_type, sub_type, ctype_attrs])
+        end
+      end
+
+      wrap_delivery_behavior!
+      m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii?
+      
+      @_message
+    end
+    
+    # Set up the default values for the various instance variables of this
+    # mailer. Subclasses may override this method to provide different
+    # defaults.
+    def initialize_defaults(method_name) 
+      @charset              ||= self.class.default[:charset].try(:dup)
+      @content_type         ||= self.class.default[:content_type].try(:dup)
+      @implicit_parts_order ||= self.class.default[:parts_order].try(:dup)
+      @mime_version         ||= self.class.default[:mime_version].try(:dup)
+
+      @mailer_name   ||= self.class.mailer_name.dup
+      @template      ||= method_name
+      @mail_was_called = false
+
+      @parts   ||= []
+      @headers ||= {}
+      @sent_on ||= Time.now
+      @body ||= {}
+    end
+
+    def create_parts 
+      if String === @body
+        @parts.unshift create_inline_part(@body)
+      elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ }
+        self.class.view_paths.first.find_all(@template, {}, @mailer_name).each do |template|
+          @parts << create_inline_part(render_to_body(:_template => template), template.mime_type)
+        end
+
+        if @parts.size > 1
+          @content_type = "multipart/alternative" if @content_type !~ /^multipart/
+        end
+
+        # If this is a multipart e-mail add the mime_version if it is not
+        # already set.
+        @mime_version ||= "1.0" if !@parts.empty?
+      end
+    end
+
+    def create_inline_part(body, mime_type=nil) 
+      ct = mime_type || "text/plain"
+      main_type, sub_type = split_content_type(ct.to_s)
+
+      Mail::Part.new(
+        :content_type => [main_type, sub_type, {:charset => charset}],
+        :content_disposition => "inline",
+        :body => body
+      )
+    end
+
+    def split_content_type(ct) 
+      ct.to_s.split("/")
+    end
+
+    def parse_content_type(defaults=nil) 
+      if @content_type.blank?
+        [ nil, {} ]
+      else
+        ctype, *attrs = @content_type.split(/;\s*/)
+        attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h }
+        [ctype, {"charset" => @charset}.merge(attrs)]
+      end
+    end
+  end
+end
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index b05d21ae5d..7ed1519e36 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -3,26 +3,19 @@ require "rails"
 
 module ActionMailer
   class Railtie < Rails::Railtie
-    plugin_name :action_mailer
+    railtie_name :action_mailer
 
     require "action_mailer/railties/subscriber"
     subscriber ActionMailer::Railties::Subscriber.new
 
-    initializer "action_mailer.set_configs" do |app|
-      app.config.action_mailer.each do |k,v|
-        ActionMailer::Base.send "#{k}=", v
-      end
-    end
-
-    # TODO: ActionController::Base.logger should delegate to its own config.logger
     initializer "action_mailer.logger" do
       ActionMailer::Base.logger ||= Rails.logger
     end
 
-    initializer "action_mailer.view_paths" do |app|
-      # TODO: this should be combined with the logic for default config.action_mailer.view_paths
-      view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes)
-      ActionMailer::Base.template_root = view_path if ActionMailer::Base.view_paths.blank?
+    initializer "action_mailer.set_configs" do |app|
+      app.config.action_mailer.each do |k,v|
+        ActionMailer::Base.send "#{k}=", v
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 0ca4f5494e..7c4033a125 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -37,7 +37,7 @@ module ActionMailer
       def initialize_test_deliveries
         ActionMailer::Base.delivery_method = :test
         ActionMailer::Base.perform_deliveries = true
-        ActionMailer::Base.deliveries = []
+        ActionMailer::Base.deliveries.clear
       end
 
       def set_expected_mail
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb
index f234c0248c..3a1612442f 100644
--- a/actionmailer/lib/action_mailer/test_helper.rb
+++ b/actionmailer/lib/action_mailer/test_helper.rb
@@ -58,7 +58,6 @@ module ActionMailer
   end
 end
 
-# TODO: Deprecate this
 module Test
   module Unit
     class TestCase
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb
index 2fd25ff145..c6efdc53b6 100644
--- a/actionmailer/lib/action_mailer/tmail_compat.rb
+++ b/actionmailer/lib/action_mailer/tmail_compat.rb
@@ -2,19 +2,27 @@ module Mail
   class Message
     
     def set_content_type(*args)
-      STDERR.puts("Message#set_content_type is deprecated, please just call Message#content_type with the same arguments.\n#{caller}")
+      ActiveSupport::Deprecation.warn('Message#set_content_type is deprecated, please just call ' <<
+                                      'Message#content_type with the same arguments', caller[0,2])
       content_type(*args)
     end
     
     alias :old_transfer_encoding :transfer_encoding
     def transfer_encoding(value = nil)
       if value
-        STDERR.puts("Message#transfer_encoding is deprecated, please call Message#content_transfer_encoding with the same arguments.\n#{caller}")
+        ActiveSupport::Deprecation.warn('Message#transfer_encoding is deprecated, please call ' <<
+                                        'Message#content_transfer_encoding with the same arguments', caller[0,2])
         content_transfer_encoding(value)
       else
         old_transfer_encoding
       end
     end
     
+    def original_filename
+      ActiveSupport::Deprecation.warn('Message#original_filename is deprecated, ' <<
+                                      'please call Message#filename', caller[0,2])
+      filename
+    end
+    
   end
 end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb b/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
deleted file mode 100755
index 81cc7906d8..0000000000
--- a/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
+++ /dev/null
@@ -1,1467 +0,0 @@
-#--
-# Text::Format for Ruby
-# Version 0.63
-#
-# Copyright (c) 2002 - 2003 Austin Ziegler
-#
-# $Id: format.rb,v 1.1.1.1 2004/10/14 11:59:57 webster132 Exp $
-#
-# ==========================================================================
-# Revision History ::
-# YYYY.MM.DD  Change ID   Developer
-#             Description
-# --------------------------------------------------------------------------
-# 2002.10.18              Austin Ziegler
-#             Fixed a minor problem with tabs not being counted. Changed
-#             abbreviations from Hash to Array to better suit Ruby's
-#             capabilities. Fixed problems with the way that Array arguments
-#             are handled in calls to the major object types, excepting in
-#             Text::Format#expand and Text::Format#unexpand (these will
-#             probably need to be fixed).
-# 2002.10.30              Austin Ziegler
-#             Fixed the ordering of the <=> for binary tests. Fixed
-#             Text::Format#expand and Text::Format#unexpand to handle array
-#             arguments better.
-# 2003.01.24              Austin Ziegler
-#             Fixed a problem with Text::Format::RIGHT_FILL handling where a
-#             single word is larger than #columns. Removed Comparable
-#             capabilities (<=> doesn't make sense; == does). Added Symbol
-#             equivalents for the Hash initialization. Hash initialization has
-#             been modified so that values are set as follows (Symbols are
-#             highest priority; strings are middle; defaults are lowest):
-#                 @columns = arg[:columns] || arg['columns'] || @columns
-#             Added #hard_margins, #split_rules, #hyphenator, and #split_words.
-# 2003.02.07              Austin Ziegler
-#             Fixed the installer for proper case-sensitive handling.
-# 2003.03.28              Austin Ziegler
-#             Added the ability for a hyphenator to receive the formatter
-#             object. Fixed a bug for strings matching /\A\s*\Z/ failing
-#             entirely. Fixed a test case failing under 1.6.8.
-# 2003.04.04              Austin Ziegler
-#             Handle the case of hyphenators returning nil for first/rest.
-# 2003.09.17          Austin Ziegler
-#             Fixed a problem where #paragraphs(" ") was raising
-#             NoMethodError.
-#
-# ==========================================================================
-#++
-
-module Text #:nodoc:
-   # Text::Format for Ruby is copyright 2002 - 2005 by Austin Ziegler. It
-   # is available under Ruby's licence, the Perl Artistic licence, or the
-   # GNU GPL version 2 (or at your option, any later version). As a
-   # special exception, for use with official Rails (provided by the
-   # rubyonrails.org development team) and any project created with
-   # official Rails, the following alternative MIT-style licence may be
-   # used:
-   #
-   # == Text::Format Licence for Rails and Rails Applications
-   # Permission is hereby granted, free of charge, to any person
-   # obtaining a copy of this software and associated documentation files
-   # (the "Software"), to deal in the Software without restriction,
-   # including without limitation the rights to use, copy, modify, merge,
-   # publish, distribute, sublicense, and/or sell copies of the Software,
-   # and to permit persons to whom the Software is furnished to do so,
-   # subject to the following conditions:
-   #
-   # * The names of its contributors may not be used to endorse or
-   #   promote products derived from this software without specific prior
-   #   written permission.
-   #
-   # The above copyright notice and this permission notice shall be
-   # included in all copies or substantial portions of the Software.
-   #
-   # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   # BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   # SOFTWARE.
-   class Format
-    VERSION = '0.63'
-
-      # Local abbreviations. More can be added with Text::Format.abbreviations
-    ABBREV = [ 'Mr', 'Mrs', 'Ms', 'Jr', 'Sr' ]
-
-      # Formatting values
-    LEFT_ALIGN  = 0
-    RIGHT_ALIGN = 1
-    RIGHT_FILL  = 2
-    JUSTIFY     = 3
-
-      # Word split modes (only applies when #hard_margins is true).
-    SPLIT_FIXED                     = 1
-    SPLIT_CONTINUATION              = 2
-    SPLIT_HYPHENATION               = 4
-    SPLIT_CONTINUATION_FIXED        = SPLIT_CONTINUATION | SPLIT_FIXED
-    SPLIT_HYPHENATION_FIXED         = SPLIT_HYPHENATION | SPLIT_FIXED
-    SPLIT_HYPHENATION_CONTINUATION  = SPLIT_HYPHENATION | SPLIT_CONTINUATION
-    SPLIT_ALL                       = SPLIT_HYPHENATION | SPLIT_CONTINUATION | SPLIT_FIXED
-
-      # Words forcibly split by Text::Format will be stored as split words.
-      # This class represents a word forcibly split.
-    class SplitWord
-        # The word that was split.
-      attr_reader :word
-        # The first part of the word that was split.
-      attr_reader :first
-        # The remainder of the word that was split.
-      attr_reader :rest
-
-      def initialize(word, first, rest) #:nodoc:
-        @word = word
-        @first = first
-        @rest = rest
-      end
-    end
-
-  private
-    LEQ_RE = /[.?!]['"]?$/
-
-    def brk_re(i) #:nodoc:
-      %r/((?:\S+\s+){#{i}})(.+)/
-    end
-
-    def posint(p) #:nodoc:
-      p.to_i.abs
-    end
-
-  public
-      # Compares two Text::Format objects. All settings of the objects are
-      # compared *except* #hyphenator. Generated results (e.g., #split_words)
-      # are not compared, either.
-    def ==(o)
-      (@text          ==  o.text)           &&
-      (@columns       ==  o.columns)        &&
-      (@left_margin   ==  o.left_margin)    &&
-      (@right_margin  ==  o.right_margin)   &&
-      (@hard_margins  ==  o.hard_margins)   &&
-      (@split_rules   ==  o.split_rules)    &&
-      (@first_indent  ==  o.first_indent)   &&
-      (@body_indent   ==  o.body_indent)    &&
-      (@tag_text      ==  o.tag_text)       &&
-      (@tabstop       ==  o.tabstop)        &&
-      (@format_style  ==  o.format_style)   &&
-      (@extra_space   ==  o.extra_space)    &&
-      (@tag_paragraph ==  o.tag_paragraph)  &&
-      (@nobreak       ==  o.nobreak)        &&
-      (@abbreviations ==  o.abbreviations)  &&
-      (@nobreak_regex ==  o.nobreak_regex)
-    end
-
-      # The text to be manipulated. Note that value is optional, but if the
-      # formatting functions are called without values, this text is what will
-      # be formatted.
-      #
-      # *Default*::       <tt>[]</tt>
-      # <b>Used in</b>::  All methods
-    attr_accessor :text
-
-      # The total width of the format area. The margins, indentation, and text
-      # are formatted into this space.
-      #
-      #                             COLUMNS
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  indent  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>72</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    attr_reader :columns
-
-      # The total width of the format area. The margins, indentation, and text
-      # are formatted into this space. The value provided is silently
-      # converted to a positive integer.
-      #
-      #                             COLUMNS
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  indent  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>72</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    def columns=(c)
-      @columns = posint(c)
-    end
-
-      # The number of spaces used for the left margin.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   LEFT MARGIN  indent  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    attr_reader :left_margin
-
-      # The number of spaces used for the left margin. The value provided is
-      # silently converted to a positive integer value.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   LEFT MARGIN  indent  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    def left_margin=(left)
-      @left_margin = posint(left)
-    end
-
-      # The number of spaces used for the right margin.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  indent  text is formatted into here  RIGHT MARGIN
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    attr_reader :right_margin
-
-      # The number of spaces used for the right margin. The value provided is
-      # silently converted to a positive integer value.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  indent  text is formatted into here  RIGHT MARGIN
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>,
-      #                   <tt>#center</tt>
-    def right_margin=(r)
-      @right_margin = posint(r)
-    end
-
-      # The number of spaces to indent the first line of a paragraph.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  INDENT  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>4</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_reader :first_indent
-
-      # The number of spaces to indent the first line of a paragraph. The
-      # value provided is silently converted to a positive integer value.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  INDENT  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>4</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def first_indent=(f)
-      @first_indent = posint(f)
-    end
-
-      # The number of spaces to indent all lines after the first line of a
-      # paragraph.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  INDENT  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-  attr_reader :body_indent
-
-      # The number of spaces to indent all lines after the first line of
-      # a paragraph. The value provided is silently converted to a
-      # positive integer value.
-      #
-      #                             columns
-      #  <-------------------------------------------------------------->
-      #  <-----------><------><---------------------------><------------>
-      #   left margin  INDENT  text is formatted into here  right margin
-      #
-      # *Default*::       <tt>0</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def body_indent=(b)
-      @body_indent = posint(b)
-    end
-
-      # Normally, words larger than the format area will be placed on a line
-      # by themselves. Setting this to +true+ will force words larger than the
-      # format area to be split into one or more "words" each at most the size
-      # of the format area. The first line and the original word will be
-      # placed into <tt>#split_words</tt>. Note that this will cause the
-      # output to look *similar* to a #format_style of JUSTIFY. (Lines will be
-      # filled as much as possible.)
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :hard_margins
-
-      # An array of words split during formatting if #hard_margins is set to
-      # +true+.
-      #   #split_words << Text::Format::SplitWord.new(word, first, rest)
-    attr_reader :split_words
-
-      # The object responsible for hyphenating. It must respond to
-      # #hyphenate_to(word, size) or #hyphenate_to(word, size, formatter) and
-      # return an array of the word split into two parts; if there is a
-      # hyphenation mark to be applied, responsibility belongs to the
-      # hyphenator object. The size is the MAXIMUM size permitted, including
-      # any hyphenation marks. If the #hyphenate_to method has an arity of 3,
-      # the formatter will be provided to the method. This allows the
-      # hyphenator to make decisions about the hyphenation based on the
-      # formatting rules.
-      #
-      # *Default*::       +nil+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_reader :hyphenator
-
-      # The object responsible for hyphenating. It must respond to
-      # #hyphenate_to(word, size) and return an array of the word hyphenated
-      # into two parts. The size is the MAXIMUM size permitted, including any
-      # hyphenation marks.
-      #
-      # *Default*::       +nil+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def hyphenator=(h)
-      raise ArgumentError, "#{h.inspect} is not a valid hyphenator." unless h.respond_to?(:hyphenate_to)
-      arity = h.method(:hyphenate_to).arity
-      raise ArgumentError, "#{h.inspect} must have exactly two or three arguments." unless [2, 3].include?(arity)
-      @hyphenator = h
-      @hyphenator_arity = arity
-    end
-
-      # Specifies the split mode; used only when #hard_margins is set to
-      # +true+. Allowable values are:
-      # [+SPLIT_FIXED+]         The word will be split at the number of
-      #                         characters needed, with no marking at all.
-      #      repre
-      #      senta
-      #      ion
-      # [+SPLIT_CONTINUATION+]  The word will be split at the number of
-      #                         characters needed, with a C-style continuation
-      #                         character. If a word is the only item on a
-      #                         line and it cannot be split into an
-      #                         appropriate size, SPLIT_FIXED will be used.
-      #       repr\
-      #       esen\
-      #       tati\
-      #       on
-      # [+SPLIT_HYPHENATION+]   The word will be split according to the
-      #                         hyphenator specified in #hyphenator. If there
-      #                         is no #hyphenator specified, works like
-      #                         SPLIT_CONTINUATION. The example is using
-      #                         TeX::Hyphen. If a word is the only item on a
-      #                         line and it cannot be split into an
-      #                         appropriate size, SPLIT_CONTINUATION mode will
-      #                         be used.
-      #       rep-
-      #       re-
-      #       sen-
-      #       ta-
-      #       tion
-      #
-      # *Default*::       <tt>Text::Format::SPLIT_FIXED</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_reader :split_rules
-
-      # Specifies the split mode; used only when #hard_margins is set to
-      # +true+. Allowable values are:
-      # [+SPLIT_FIXED+]         The word will be split at the number of
-      #                         characters needed, with no marking at all.
-      #      repre
-      #      senta
-      #      ion
-      # [+SPLIT_CONTINUATION+]  The word will be split at the number of
-      #                         characters needed, with a C-style continuation
-      #                         character.
-      #       repr\
-      #       esen\
-      #       tati\
-      #       on
-      # [+SPLIT_HYPHENATION+]   The word will be split according to the
-      #                         hyphenator specified in #hyphenator. If there
-      #                         is no #hyphenator specified, works like
-      #                         SPLIT_CONTINUATION. The example is using
-      #                         TeX::Hyphen as the #hyphenator.
-      #       rep-
-      #       re-
-      #       sen-
-      #       ta-
-      #       tion
-      #
-      # These values can be bitwise ORed together (e.g., <tt>SPLIT_FIXED |
-      # SPLIT_CONTINUATION</tt>) to provide fallback split methods. In the
-      # example given, an attempt will be made to split the word using the
-      # rules of SPLIT_CONTINUATION; if there is not enough room, the word
-      # will be split with the rules of SPLIT_FIXED. These combinations are
-      # also available as the following values:
-      # * +SPLIT_CONTINUATION_FIXED+
-      # * +SPLIT_HYPHENATION_FIXED+
-      # * +SPLIT_HYPHENATION_CONTINUATION+
-      # * +SPLIT_ALL+
-      #
-      # *Default*::       <tt>Text::Format::SPLIT_FIXED</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def split_rules=(s)
-      raise ArgumentError, "Invalid value provided for split_rules." if ((s < SPLIT_FIXED) || (s > SPLIT_ALL))
-      @split_rules = s
-    end
-
-      # Indicates whether sentence terminators should be followed by a single
-      # space (+false+), or two spaces (+true+).
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :extra_space
-
-      # Defines the current abbreviations as an array. This is only used if
-      # extra_space is turned on.
-      #
-      # If one is abbreviating "President" as "Pres." (abbreviations =
-      # ["Pres"]), then the results of formatting will be as illustrated in
-      # the table below:
-      #
-      #       extra_space  |  include?        |  !include?
-      #         true       |  Pres. Lincoln   |  Pres.  Lincoln
-      #         false      |  Pres. Lincoln   |  Pres. Lincoln
-      #
-      # *Default*::       <tt>{}</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :abbreviations
-
-      # Indicates whether the formatting of paragraphs should be done with
-      # tagged paragraphs. Useful only with <tt>#tag_text</tt>.
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :tag_paragraph
-
-      # The array of text to be placed before each paragraph when
-      # <tt>#tag_paragraph</tt> is +true+. When <tt>#format()</tt> is called,
-      # only the first element of the array is used. When <tt>#paragraphs</tt>
-      # is called, then each entry in the array will be used once, with
-      # corresponding paragraphs. If the tag elements are exhausted before the
-      # text is exhausted, then the remaining paragraphs will not be tagged.
-      # Regardless of indentation settings, a blank line will be inserted
-      # between all paragraphs when <tt>#tag_paragraph</tt> is +true+.
-      #
-      # *Default*::       <tt>[]</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :tag_text
-
-      # Indicates whether or not the non-breaking space feature should be
-      # used.
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :nobreak
-
-      # A hash which holds the regular expressions on which spaces should not
-      # be broken. The hash is set up such that the key is the first word and
-      # the value is the second word.
-      #
-      # For example, if +nobreak_regex+ contains the following hash:
-      #
-      #   { '^Mrs?\.$' => '\S+$', '^\S+$' => '^(?:S|J)r\.$'}
-      #
-      # Then "Mr. Jones", "Mrs. Jones", and "Jones Jr." would not be broken.
-      # If this simple matching algorithm indicates that there should not be a
-      # break at the current end of line, then a backtrack is done until there
-      # are two words on which line breaking is permitted. If two such words
-      # are not found, then the end of the line will be broken *regardless*.
-      # If there is a single word on the current line, then no backtrack is
-      # done and the word is stuck on the end.
-      #
-      # *Default*::       <tt>{}</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_accessor :nobreak_regex
-
-      # Indicates the number of spaces that a single tab represents.
-      #
-      # *Default*::       <tt>8</tt>
-      # <b>Used in</b>::  <tt>#expand</tt>, <tt>#unexpand</tt>,
-      #                   <tt>#paragraphs</tt>
-    attr_reader :tabstop
-
-      # Indicates the number of spaces that a single tab represents.
-      #
-      # *Default*::       <tt>8</tt>
-      # <b>Used in</b>::  <tt>#expand</tt>, <tt>#unexpand</tt>,
-      #                   <tt>#paragraphs</tt>
-    def tabstop=(t)
-      @tabstop = posint(t)
-    end
-
-      # Specifies the format style. Allowable values are:
-      # [+LEFT_ALIGN+]    Left justified, ragged right.
-      #      |A paragraph that is|
-      #      |left aligned.|
-      # [+RIGHT_ALIGN+]   Right justified, ragged left.
-      #      |A paragraph that is|
-      #      |     right aligned.|
-      # [+RIGHT_FILL+]    Left justified, right ragged, filled to width by
-      #                   spaces. (Essentially the same as +LEFT_ALIGN+ except
-      #                   that lines are padded on the right.)
-      #      |A paragraph that is|
-      #      |left aligned.      |
-      # [+JUSTIFY+]       Fully justified, words filled to width by spaces,
-      #                   except the last line.
-      #      |A paragraph  that|
-      #      |is     justified.|
-      #
-      # *Default*::       <tt>Text::Format::LEFT_ALIGN</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    attr_reader :format_style
-
-      # Specifies the format style. Allowable values are:
-      # [+LEFT_ALIGN+]    Left justified, ragged right.
-      #      |A paragraph that is|
-      #      |left aligned.|
-      # [+RIGHT_ALIGN+]   Right justified, ragged left.
-      #      |A paragraph that is|
-      #      |     right aligned.|
-      # [+RIGHT_FILL+]    Left justified, right ragged, filled to width by
-      #                   spaces. (Essentially the same as +LEFT_ALIGN+ except
-      #                   that lines are padded on the right.)
-      #      |A paragraph that is|
-      #      |left aligned.      |
-      # [+JUSTIFY+]       Fully justified, words filled to width by spaces.
-      #      |A paragraph  that|
-      #      |is     justified.|
-      #
-      # *Default*::       <tt>Text::Format::LEFT_ALIGN</tt>
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def format_style=(fs)
-      raise ArgumentError, "Invalid value provided for format_style." if ((fs < LEFT_ALIGN) || (fs > JUSTIFY))
-      @format_style = fs
-    end
-
-      # Indicates that the format style is left alignment.
-      #
-      # *Default*::       +true+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def left_align?
-      return @format_style == LEFT_ALIGN
-    end
-
-      # Indicates that the format style is right alignment.
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def right_align?
-      return @format_style == RIGHT_ALIGN
-    end
-
-      # Indicates that the format style is right fill.
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def right_fill?
-      return @format_style == RIGHT_FILL
-    end
-
-      # Indicates that the format style is full justification.
-      #
-      # *Default*::       +false+
-      # <b>Used in</b>::  <tt>#format</tt>, <tt>#paragraphs</tt>
-    def justify?
-      return @format_style == JUSTIFY
-    end
-
-      # The default implementation of #hyphenate_to implements
-      # SPLIT_CONTINUATION.
-    def hyphenate_to(word, size)
-      [word[0 .. (size - 2)] + "\\", word[(size - 1) .. -1]]
-    end
-
-  private
-    def __do_split_word(word, size) #:nodoc:
-      [word[0 .. (size - 1)], word[size .. -1]]
-    end
-
-    def __format(to_wrap) #:nodoc:
-      words = to_wrap.split(/\s+/).compact
-      words.shift if words[0].nil? or words[0].empty?
-      to_wrap = []
-
-      abbrev = false
-      width = @columns - @first_indent - @left_margin - @right_margin
-      indent_str = ' ' * @first_indent
-      first_line = true
-      line = words.shift
-      abbrev = __is_abbrev(line) unless line.nil? || line.empty?
-
-      while w = words.shift
-        if (w.size + line.size < (width - 1)) ||
-           ((line !~ LEQ_RE || abbrev) && (w.size + line.size < width))
-          line << " " if (line =~ LEQ_RE) && (not abbrev)
-          line << " #{w}"
-        else
-          line, w = __do_break(line, w) if @nobreak
-          line, w = __do_hyphenate(line, w, width) if @hard_margins
-          if w.index(/\s+/)
-            w, *w2 = w.split(/\s+/)
-            words.unshift(w2)
-            words.flatten!
-          end
-          to_wrap << __make_line(line, indent_str, width, w.nil?) unless line.nil?
-          if first_line
-            first_line = false
-            width = @columns - @body_indent - @left_margin - @right_margin
-            indent_str = ' ' * @body_indent
-          end
-          line = w
-        end
-
-        abbrev = __is_abbrev(w) unless w.nil?
-      end
-
-      loop do
-        break if line.nil? or line.empty?
-        line, w = __do_hyphenate(line, w, width) if @hard_margins
-        to_wrap << __make_line(line, indent_str, width, w.nil?)
-        line = w
-      end
-
-      if (@tag_paragraph && (to_wrap.size > 0)) then
-        clr = %r{`(\w+)'}.match([caller(1)].flatten[0])[1]
-        clr = "" if clr.nil?
-
-        if ((not @tag_text[0].nil?) && (@tag_cur.size < 1) &&
-            (clr != "__paragraphs")) then
-          @tag_cur = @tag_text[0]
-        end
-
-        fchar = /(\S)/.match(to_wrap[0])[1]
-        white = to_wrap[0].index(fchar)
-        if ((white - @left_margin - 1) > @tag_cur.size) then
-          white = @tag_cur.size + @left_margin
-          to_wrap[0].gsub!(/^ {#{white}}/, "#{' ' * @left_margin}#{@tag_cur}")
-        else
-          to_wrap.unshift("#{' ' * @left_margin}#{@tag_cur}\n")
-        end
-      end
-      to_wrap.join('')
-    end
-
-      # format lines in text into paragraphs with each element of @wrap a
-      # paragraph; uses Text::Format.format for the formatting
-    def __paragraphs(to_wrap) #:nodoc:
-      if ((@first_indent == @body_indent) || @tag_paragraph) then
-        p_end = "\n"
-      else
-        p_end = ''
-      end
-
-      cnt = 0
-      ret = []
-      to_wrap.each do |tw|
-        @tag_cur = @tag_text[cnt] if @tag_paragraph
-        @tag_cur = '' if @tag_cur.nil?
-        line = __format(tw)
-        ret << "#{line}#{p_end}" if (not line.nil?) && (line.size > 0)
-        cnt += 1
-      end
-
-      ret[-1].chomp! unless ret.empty?
-      ret.join('')
-    end
-
-      # center text using spaces on left side to pad it out empty lines
-      # are preserved
-    def __center(to_center) #:nodoc:
-      tabs = 0
-      width = @columns - @left_margin - @right_margin
-      centered = []
-      to_center.each do |tc|
-        s = tc.strip
-        tabs = s.count("\t")
-        tabs = 0 if tabs.nil?
-        ct = ((width - s.size - (tabs * @tabstop) + tabs) / 2)
-        ct = (width - @left_margin - @right_margin) - ct
-        centered << "#{s.rjust(ct)}\n"
-      end
-      centered.join('')
-    end
-
-      # expand tabs to spaces should be similar to Text::Tabs::expand
-    def __expand(to_expand) #:nodoc:
-      expanded = []
-      to_expand.split("\n").each { |te| expanded << te.gsub(/\t/, ' ' * @tabstop) }
-      expanded.join('')
-    end
-
-    def __unexpand(to_unexpand) #:nodoc:
-      unexpanded = []
-      to_unexpand.split("\n").each { |tu| unexpanded << tu.gsub(/ {#{@tabstop}}/, "\t") }
-      unexpanded.join('')
-    end
-
-    def __is_abbrev(word) #:nodoc:
-        # remove period if there is one.
-      w = word.gsub(/\.$/, '') unless word.nil?
-      return true if (!@extra_space || ABBREV.include?(w) || @abbreviations.include?(w))
-      false
-    end
-
-    def __make_line(line, indent, width, last = false) #:nodoc:
-      lmargin = " " * @left_margin
-      fill = " " * (width - line.size) if right_fill? && (line.size <= width)
-
-      if (justify? && ((not line.nil?) && (not line.empty?)) && line =~ /\S+\s+\S+/ && !last)
-        spaces = width - line.size
-        words = line.split(/(\s+)/)
-        ws = spaces / (words.size / 2)
-        spaces = spaces % (words.size / 2) if ws > 0
-        words.reverse.each do |rw|
-          next if (rw =~ /^\S/)
-          rw.sub!(/^/, " " * ws)
-          next unless (spaces > 0)
-          rw.sub!(/^/, " ")
-          spaces -= 1
-        end
-        line = words.join('')
-      end
-      line = "#{lmargin}#{indent}#{line}#{fill}\n" unless line.nil?
-      if right_align? && (not line.nil?)
-        line.sub(/^/, " " * (@columns - @right_margin - (line.size - 1)))
-      else
-        line
-      end
-    end
-
-    def __do_hyphenate(line, next_line, width) #:nodoc:
-      rline = line.dup rescue line
-      rnext = next_line.dup rescue next_line
-      loop do
-        if rline.size == width
-          break
-        elsif rline.size > width
-          words = rline.strip.split(/\s+/)
-          word = words[-1].dup
-          size = width - rline.size + word.size
-          if (size <= 0)
-            words[-1] = nil
-            rline = words.join(' ').strip
-            rnext = "#{word} #{rnext}".strip
-            next
-          end
-
-          first = rest = nil
-
-          if ((@split_rules & SPLIT_HYPHENATION) != 0)
-            if @hyphenator_arity == 2
-              first, rest = @hyphenator.hyphenate_to(word, size)
-            else
-              first, rest = @hyphenator.hyphenate_to(word, size, self)
-            end
-          end
-
-          if ((@split_rules & SPLIT_CONTINUATION) != 0) and first.nil?
-            first, rest = self.hyphenate_to(word, size)
-          end
-
-          if ((@split_rules & SPLIT_FIXED) != 0) and first.nil?
-            first.nil? or @split_rules == SPLIT_FIXED
-            first, rest = __do_split_word(word, size)
-          end
-
-          if first.nil?
-            words[-1] = nil
-            rest = word
-          else
-            words[-1] = first
-            @split_words << SplitWord.new(word, first, rest)
-          end
-          rline = words.join(' ').strip
-          rnext = "#{rest} #{rnext}".strip
-          break
-        else
-          break if rnext.nil? or rnext.empty? or rline.nil? or rline.empty?
-          words = rnext.split(/\s+/)
-          word = words.shift
-          size = width - rline.size - 1
-
-          if (size <= 0)
-            rnext = "#{word} #{words.join(' ')}".strip
-            break
-          end
-
-          first = rest = nil
-
-          if ((@split_rules & SPLIT_HYPHENATION) != 0)
-            if @hyphenator_arity == 2
-              first, rest = @hyphenator.hyphenate_to(word, size)
-            else
-              first, rest = @hyphenator.hyphenate_to(word, size, self)
-            end
-          end
-
-          first, rest = self.hyphenate_to(word, size) if ((@split_rules & SPLIT_CONTINUATION) != 0) and first.nil?
-
-          first, rest = __do_split_word(word, size) if ((@split_rules & SPLIT_FIXED) != 0) and first.nil?
-
-          if (rline.size + (first ? first.size : 0)) < width
-            @split_words << SplitWord.new(word, first, rest)
-            rline = "#{rline} #{first}".strip
-            rnext = "#{rest} #{words.join(' ')}".strip
-          end
-          break
-        end
-      end
-      [rline, rnext]
-    end
-
-    def __do_break(line, next_line) #:nodoc:
-      no_brk = false
-      words = []
-      words = line.split(/\s+/) unless line.nil?
-      last_word = words[-1]
-
-      @nobreak_regex.each { |k, v| no_brk = ((last_word =~ /#{k}/) and (next_line =~ /#{v}/)) }
-
-      if no_brk && words.size > 1
-        i = words.size
-        while i > 0
-          no_brk = false
-          @nobreak_regex.each { |k, v| no_brk = ((words[i + 1] =~ /#{k}/) && (words[i] =~ /#{v}/)) }
-          i -= 1
-          break if not no_brk
-        end
-        if i > 0
-          l = brk_re(i).match(line)
-          line.sub!(brk_re(i), l[1])
-          next_line = "#{l[2]} #{next_line}"
-          line.sub!(/\s+$/, '')
-        end
-      end
-      [line, next_line]
-    end
-
-    def __create(arg = nil, &block) #:nodoc:
-        # Format::Text.new(text-to-wrap)
-      @text = arg unless arg.nil?
-        # Defaults
-      @columns          = 72
-      @tabstop          = 8
-      @first_indent     = 4
-      @body_indent      = 0
-      @format_style     = LEFT_ALIGN
-      @left_margin      = 0
-      @right_margin     = 0
-      @extra_space      = false
-      @text             = Array.new if @text.nil?
-      @tag_paragraph    = false
-      @tag_text         = Array.new
-      @tag_cur          = ""
-      @abbreviations    = Array.new
-      @nobreak          = false
-      @nobreak_regex    = Hash.new
-      @split_words      = Array.new
-      @hard_margins     = false
-      @split_rules      = SPLIT_FIXED
-      @hyphenator       = self
-      @hyphenator_arity = self.method(:hyphenate_to).arity
-
-      instance_eval(&block) unless block.nil?
-    end
-
-  public
-      # Formats text into a nice paragraph format. The text is separated
-      # into words and then reassembled a word at a time using the settings
-      # of this Format object. If a word is larger than the number of
-      # columns available for formatting, then that word will appear on the
-      # line by itself.
-      #
-      # If +to_wrap+ is +nil+, then the value of <tt>#text</tt> will be
-      # worked on.
-    def format(to_wrap = nil)
-      to_wrap = @text if to_wrap.nil?
-      if to_wrap.class == Array
-        __format(to_wrap[0])
-      else
-        __format(to_wrap)
-      end
-    end
-
-      # Considers each element of text (provided or internal) as a paragraph.
-      # If <tt>#first_indent</tt> is the same as <tt>#body_indent</tt>, then
-      # paragraphs will be separated by a single empty line in the result;
-      # otherwise, the paragraphs will follow immediately after each other.
-      # Uses <tt>#format</tt> to do the heavy lifting.
-    def paragraphs(to_wrap = nil)
-      to_wrap = @text if to_wrap.nil?
-      __paragraphs([to_wrap].flatten)
-    end
-
-      # Centers the text, preserving empty lines and tabs.
-    def center(to_center = nil)
-      to_center = @text if to_center.nil?
-      __center([to_center].flatten)
-    end
-
-      # Replaces all tab characters in the text with <tt>#tabstop</tt> spaces.
-    def expand(to_expand = nil)
-      to_expand = @text if to_expand.nil?
-      if to_expand.class == Array
-        to_expand.collect { |te| __expand(te) }
-      else
-        __expand(to_expand)
-      end
-    end
-
-      # Replaces all occurrences of <tt>#tabstop</tt> consecutive spaces
-      # with a tab character.
-    def unexpand(to_unexpand = nil)
-      to_unexpand = @text if to_unexpand.nil?
-      if to_unexpand.class == Array
-        to_unexpand.collect { |te| v << __unexpand(te) }
-      else
-        __unexpand(to_unexpand)
-      end
-    end
-
-      # This constructor takes advantage of a technique for Ruby object
-      # construction introduced by Andy Hunt and Dave Thomas (see reference),
-      # where optional values are set using commands in a block.
-      #
-      #   Text::Format.new {
-      #       columns         = 72
-      #       left_margin     = 0
-      #       right_margin    = 0
-      #       first_indent    = 4
-      #       body_indent     = 0
-      #       format_style    = Text::Format::LEFT_ALIGN
-      #       extra_space     = false
-      #       abbreviations   = {}
-      #       tag_paragraph   = false
-      #       tag_text        = []
-      #       nobreak         = false
-      #       nobreak_regex   = {}
-      #       tabstop         = 8
-      #       text            = nil
-      #   }
-      #
-      # As shown above, +arg+ is optional. If +arg+ is specified and is a
-      # +String+, then arg is used as the default value of <tt>#text</tt>.
-      # Alternately, an existing Text::Format object can be used or a Hash can
-      # be used. With all forms, a block can be specified.
-      #
-      # *Reference*:: "Object Construction and Blocks"
-      #               <http://www.pragmaticprogrammer.com/ruby/articles/insteval.html>
-      #
-    def initialize(arg = nil, &block)
-      @text = nil
-      case arg
-      when Text::Format
-        __create(arg.text) do
-          @columns        = arg.columns
-          @tabstop        = arg.tabstop
-          @first_indent   = arg.first_indent
-          @body_indent    = arg.body_indent
-          @format_style   = arg.format_style
-          @left_margin    = arg.left_margin
-          @right_margin   = arg.right_margin
-          @extra_space    = arg.extra_space
-          @tag_paragraph  = arg.tag_paragraph
-          @tag_text       = arg.tag_text
-          @abbreviations  = arg.abbreviations
-          @nobreak        = arg.nobreak
-          @nobreak_regex  = arg.nobreak_regex
-          @text           = arg.text
-          @hard_margins   = arg.hard_margins
-          @split_words    = arg.split_words
-          @split_rules    = arg.split_rules
-          @hyphenator     = arg.hyphenator
-        end
-        instance_eval(&block) unless block.nil?
-      when Hash
-        __create do
-          @columns       = arg[:columns]       || arg['columns']       || @columns
-          @tabstop       = arg[:tabstop]       || arg['tabstop']       || @tabstop
-          @first_indent  = arg[:first_indent]  || arg['first_indent']  || @first_indent
-          @body_indent   = arg[:body_indent]   || arg['body_indent']   || @body_indent
-          @format_style  = arg[:format_style]  || arg['format_style']  || @format_style
-          @left_margin   = arg[:left_margin]   || arg['left_margin']   || @left_margin
-          @right_margin  = arg[:right_margin]  || arg['right_margin']  || @right_margin
-          @extra_space   = arg[:extra_space]   || arg['extra_space']   || @extra_space
-          @text          = arg[:text]          || arg['text']          || @text
-          @tag_paragraph = arg[:tag_paragraph] || arg['tag_paragraph'] || @tag_paragraph
-          @tag_text      = arg[:tag_text]      || arg['tag_text']      || @tag_text
-          @abbreviations = arg[:abbreviations] || arg['abbreviations'] || @abbreviations
-          @nobreak       = arg[:nobreak]       || arg['nobreak']       || @nobreak
-          @nobreak_regex = arg[:nobreak_regex] || arg['nobreak_regex'] || @nobreak_regex
-          @hard_margins  = arg[:hard_margins]  || arg['hard_margins']  || @hard_margins
-          @split_rules   = arg[:split_rules] || arg['split_rules'] || @split_rules
-          @hyphenator    = arg[:hyphenator] || arg['hyphenator'] || @hyphenator
-        end
-        instance_eval(&block) unless block.nil?
-      when String
-        __create(arg, &block)
-      when NilClass
-        __create(&block)
-      else
-        raise TypeError
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  require 'test/unit'
-
-  class TestText__Format < Test::Unit::TestCase #:nodoc:
-    attr_accessor :format_o
-
-    GETTYSBURG = <<-'EOS'
-    Four score and seven years ago our fathers brought forth on this
-    continent a new nation, conceived in liberty and dedicated to the
-    proposition that all men are created equal. Now we are engaged in
-    a great civil war, testing whether that nation or any nation so
-    conceived and so dedicated can long endure. We are met on a great
-    battlefield of that war. We have come to dedicate a portion of
-    that field as a final resting-place for those who here gave their
-    lives that that nation might live. It is altogether fitting and
-    proper that we should do this. But in a larger sense, we cannot
-    dedicate, we cannot consecrate, we cannot hallow this ground.
-    The brave men, living and dead who struggled here have consecrated
-    it far above our poor power to add or detract. The world will
-    little note nor long remember what we say here, but it can never
-    forget what they did here. It is for us the living rather to be
-    dedicated here to the unfinished work which they who fought here
-    have thus far so nobly advanced. It is rather for us to be here
-    dedicated to the great task remaining before us--that from these
-    honored dead we take increased devotion to that cause for which
-    they gave the last full measure of devotion--that we here highly
-    resolve that these dead shall not have died in vain, that this
-    nation under God shall have a new birth of freedom, and that
-    government of the people, by the people, for the people shall
-    not perish from the earth.
-
-            -- Pres. Abraham Lincoln, 19 November 1863
-    EOS
-
-    FIVE_COL = "Four \nscore\nand s\neven \nyears\nago o\nur fa\nthers\nbroug\nht fo\nrth o\nn thi\ns con\ntinen\nt a n\new na\ntion,\nconce\nived \nin li\nberty\nand d\nedica\nted t\no the\npropo\nsitio\nn tha\nt all\nmen a\nre cr\neated\nequal\n. Now\nwe ar\ne eng\naged \nin a \ngreat\ncivil\nwar, \ntesti\nng wh\nether\nthat \nnatio\nn or \nany n\nation\nso co\nnceiv\ned an\nd so \ndedic\nated \ncan l\nong e\nndure\n. We \nare m\net on\na gre\nat ba\nttlef\nield \nof th\nat wa\nr. We\nhave \ncome \nto de\ndicat\ne a p\nortio\nn of \nthat \nfield\nas a \nfinal\nresti\nng-pl\nace f\nor th\nose w\nho he\nre ga\nve th\neir l\nives \nthat \nthat \nnatio\nn mig\nht li\nve. I\nt is \naltog\nether\nfitti\nng an\nd pro\nper t\nhat w\ne sho\nuld d\no thi\ns. Bu\nt in \na lar\nger s\nense,\nwe ca\nnnot \ndedic\nate, \nwe ca\nnnot \nconse\ncrate\n, we \ncanno\nt hal\nlow t\nhis g\nround\n. The\nbrave\nmen, \nlivin\ng and\ndead \nwho s\ntrugg\nled h\nere h\nave c\nonsec\nrated\nit fa\nr abo\nve ou\nr poo\nr pow\ner to\nadd o\nr det\nract.\nThe w\norld \nwill \nlittl\ne not\ne nor\nlong \nremem\nber w\nhat w\ne say\nhere,\nbut i\nt can\nnever\nforge\nt wha\nt the\ny did\nhere.\nIt is\nfor u\ns the\nlivin\ng rat\nher t\no be \ndedic\nated \nhere \nto th\ne unf\ninish\ned wo\nrk wh\nich t\nhey w\nho fo\nught \nhere \nhave \nthus \nfar s\no nob\nly ad\nvance\nd. It\nis ra\nther \nfor u\ns to \nbe he\nre de\ndicat\ned to\nthe g\nreat \ntask \nremai\nning \nbefor\ne us-\n-that\nfrom \nthese\nhonor\ned de\nad we\ntake \nincre\nased \ndevot\nion t\no tha\nt cau\nse fo\nr whi\nch th\ney ga\nve th\ne las\nt ful\nl mea\nsure \nof de\nvotio\nn--th\nat we\nhere \nhighl\ny res\nolve \nthat \nthese\ndead \nshall\nnot h\nave d\nied i\nn vai\nn, th\nat th\nis na\ntion \nunder\nGod s\nhall \nhave \na new\nbirth\nof fr\needom\n, and\nthat \ngover\nnment\nof th\ne peo\nple, \nby th\ne peo\nple, \nfor t\nhe pe\nople \nshall\nnot p\nerish\nfrom \nthe e\narth.\n-- Pr\nes. A\nbraha\nm Lin\ncoln,\n19 No\nvembe\nr 186\n3    \n"
-
-    FIVE_CNT = "Four \nscore\nand  \nseven\nyears\nago  \nour  \nfath\\\ners  \nbrou\\\nght  \nforth\non t\\\nhis  \ncont\\\ninent\na new\nnati\\\non,  \nconc\\\neived\nin l\\\niber\\\nty a\\\nnd d\\\nedic\\\nated \nto t\\\nhe p\\\nropo\\\nsiti\\\non t\\\nhat  \nall  \nmen  \nare  \ncrea\\\nted  \nequa\\\nl. N\\\now we\nare  \nenga\\\nged  \nin a \ngreat\ncivil\nwar, \ntest\\\ning  \nwhet\\\nher  \nthat \nnati\\\non or\nany  \nnati\\\non so\nconc\\\neived\nand  \nso d\\\nedic\\\nated \ncan  \nlong \nendu\\\nre.  \nWe a\\\nre m\\\net on\na gr\\\neat  \nbatt\\\nlefi\\\neld  \nof t\\\nhat  \nwar. \nWe h\\\nave  \ncome \nto d\\\nedic\\\nate a\nport\\\nion  \nof t\\\nhat  \nfield\nas a \nfinal\nrest\\\ning-\\\nplace\nfor  \nthose\nwho  \nhere \ngave \ntheir\nlives\nthat \nthat \nnati\\\non m\\\night \nlive.\nIt is\nalto\\\ngeth\\\ner f\\\nitti\\\nng a\\\nnd p\\\nroper\nthat \nwe s\\\nhould\ndo t\\\nhis. \nBut  \nin a \nlarg\\\ner s\\\nense,\nwe c\\\nannot\ndedi\\\ncate,\nwe c\\\nannot\ncons\\\necra\\\nte,  \nwe c\\\nannot\nhall\\\now t\\\nhis  \ngrou\\\nnd.  \nThe  \nbrave\nmen, \nlivi\\\nng a\\\nnd d\\\nead  \nwho  \nstru\\\nggled\nhere \nhave \ncons\\\necra\\\nted  \nit f\\\nar a\\\nbove \nour  \npoor \npower\nto a\\\ndd or\ndetr\\\nact. \nThe  \nworld\nwill \nlitt\\\nle n\\\note  \nnor  \nlong \nreme\\\nmber \nwhat \nwe s\\\nay h\\\nere, \nbut  \nit c\\\nan n\\\never \nforg\\\net w\\\nhat  \nthey \ndid  \nhere.\nIt is\nfor  \nus t\\\nhe l\\\niving\nrath\\\ner to\nbe d\\\nedic\\\nated \nhere \nto t\\\nhe u\\\nnfin\\\nished\nwork \nwhich\nthey \nwho  \nfoug\\\nht h\\\nere  \nhave \nthus \nfar  \nso n\\\nobly \nadva\\\nnced.\nIt is\nrath\\\ner f\\\nor us\nto be\nhere \ndedi\\\ncated\nto t\\\nhe g\\\nreat \ntask \nrema\\\nining\nbefo\\\nre u\\\ns--t\\\nhat  \nfrom \nthese\nhono\\\nred  \ndead \nwe t\\\nake  \nincr\\\neased\ndevo\\\ntion \nto t\\\nhat  \ncause\nfor  \nwhich\nthey \ngave \nthe  \nlast \nfull \nmeas\\\nure  \nof d\\\nevot\\\nion-\\\n-that\nwe h\\\nere  \nhigh\\\nly r\\\nesol\\\nve t\\\nhat  \nthese\ndead \nshall\nnot  \nhave \ndied \nin v\\\nain, \nthat \nthis \nnati\\\non u\\\nnder \nGod  \nshall\nhave \na new\nbirth\nof f\\\nreed\\\nom,  \nand  \nthat \ngove\\\nrnme\\\nnt of\nthe  \npeop\\\nle,  \nby t\\\nhe p\\\neopl\\\ne, f\\\nor t\\\nhe p\\\neople\nshall\nnot  \nperi\\\nsh f\\\nrom  \nthe  \neart\\\nh. --\nPres.\nAbra\\\nham  \nLinc\\\noln, \n19 N\\\novem\\\nber  \n1863 \n"
-
-      # Tests both abbreviations and abbreviations=
-    def test_abbreviations
-      abbr = ["    Pres. Abraham Lincoln\n", "    Pres.  Abraham Lincoln\n"]
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal([], @format_o.abbreviations)
-      assert_nothing_raised { @format_o.abbreviations = [ 'foo', 'bar' ] }
-      assert_equal([ 'foo', 'bar' ], @format_o.abbreviations)
-      assert_equal(abbr[0], @format_o.format(abbr[0]))
-      assert_nothing_raised { @format_o.extra_space = true }
-      assert_equal(abbr[1], @format_o.format(abbr[0]))
-      assert_nothing_raised { @format_o.abbreviations = [ "Pres" ] }
-      assert_equal([ "Pres" ], @format_o.abbreviations)
-      assert_equal(abbr[0], @format_o.format(abbr[0]))
-      assert_nothing_raised { @format_o.extra_space = false }
-      assert_equal(abbr[0], @format_o.format(abbr[0]))
-    end
-
-      # Tests both body_indent and body_indent=
-    def test_body_indent
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(0, @format_o.body_indent)
-      assert_nothing_raised { @format_o.body_indent = 7 }
-      assert_equal(7, @format_o.body_indent)
-      assert_nothing_raised { @format_o.body_indent = -3 }
-      assert_equal(3, @format_o.body_indent)
-      assert_nothing_raised { @format_o.body_indent = "9" }
-      assert_equal(9, @format_o.body_indent)
-      assert_nothing_raised { @format_o.body_indent = "-2" }
-      assert_equal(2, @format_o.body_indent)
-      assert_match(/^  [^ ]/, @format_o.format(GETTYSBURG).split("\n")[1])
-    end
-
-      # Tests both columns and columns=
-    def test_columns
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(72, @format_o.columns)
-      assert_nothing_raised { @format_o.columns = 7 }
-      assert_equal(7, @format_o.columns)
-      assert_nothing_raised { @format_o.columns = -3 }
-      assert_equal(3, @format_o.columns)
-      assert_nothing_raised { @format_o.columns = "9" }
-      assert_equal(9, @format_o.columns)
-      assert_nothing_raised { @format_o.columns = "-2" }
-      assert_equal(2, @format_o.columns)
-      assert_nothing_raised { @format_o.columns = 40 }
-      assert_equal(40, @format_o.columns)
-      assert_match(/this continent$/,
-                   @format_o.format(GETTYSBURG).split("\n")[1])
-    end
-
-      # Tests both extra_space and extra_space=
-    def test_extra_space
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.extra_space)
-      assert_nothing_raised { @format_o.extra_space = true }
-      assert(@format_o.extra_space)
-        # The behaviour of extra_space is tested in test_abbreviations. There
-        # is no need to reproduce it here.
-    end
-
-      # Tests both first_indent and first_indent=
-    def test_first_indent
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(4, @format_o.first_indent)
-      assert_nothing_raised { @format_o.first_indent = 7 }
-      assert_equal(7, @format_o.first_indent)
-      assert_nothing_raised { @format_o.first_indent = -3 }
-      assert_equal(3, @format_o.first_indent)
-      assert_nothing_raised { @format_o.first_indent = "9" }
-      assert_equal(9, @format_o.first_indent)
-      assert_nothing_raised { @format_o.first_indent = "-2" }
-      assert_equal(2, @format_o.first_indent)
-      assert_match(/^  [^ ]/, @format_o.format(GETTYSBURG).split("\n")[0])
-    end
-
-    def test_format_style
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(Text::Format::LEFT_ALIGN, @format_o.format_style)
-      assert_match(/^November 1863$/,
-                   @format_o.format(GETTYSBURG).split("\n")[-1])
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_ALIGN
-      }
-      assert_equal(Text::Format::RIGHT_ALIGN, @format_o.format_style)
-      assert_match(/^ +November 1863$/,
-                   @format_o.format(GETTYSBURG).split("\n")[-1])
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert_equal(Text::Format::RIGHT_FILL, @format_o.format_style)
-      assert_match(/^November 1863 +$/,
-                   @format_o.format(GETTYSBURG).split("\n")[-1])
-      assert_nothing_raised { @format_o.format_style = Text::Format::JUSTIFY }
-      assert_equal(Text::Format::JUSTIFY, @format_o.format_style)
-      assert_match(/^of freedom, and that government of the people, by the  people,  for  the$/,
-                   @format_o.format(GETTYSBURG).split("\n")[-3])
-      assert_raise(ArgumentError) { @format_o.format_style = 33 }
-    end
-
-    def test_tag_paragraph
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.tag_paragraph)
-      assert_nothing_raised { @format_o.tag_paragraph = true }
-      assert(@format_o.tag_paragraph)
-      assert_not_equal(@format_o.paragraphs([GETTYSBURG, GETTYSBURG]),
-                       Text::Format.new.paragraphs([GETTYSBURG, GETTYSBURG]))
-    end
-
-    def test_tag_text
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal([], @format_o.tag_text)
-      assert_equal(@format_o.format(GETTYSBURG),
-                   Text::Format.new.format(GETTYSBURG))
-      assert_nothing_raised {
-        @format_o.tag_paragraph = true
-        @format_o.tag_text = ["Gettysburg Address", "---"]
-      }
-      assert_not_equal(@format_o.format(GETTYSBURG),
-                       Text::Format.new.format(GETTYSBURG))
-      assert_not_equal(@format_o.paragraphs([GETTYSBURG, GETTYSBURG]),
-                       Text::Format.new.paragraphs([GETTYSBURG, GETTYSBURG]))
-      assert_not_equal(@format_o.paragraphs([GETTYSBURG, GETTYSBURG,
-                                             GETTYSBURG]),
-                       Text::Format.new.paragraphs([GETTYSBURG, GETTYSBURG,
-                                                    GETTYSBURG]))
-    end
-
-    def test_justify?
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.justify?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_ALIGN
-      }
-      assert(!@format_o.justify?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert(!@format_o.justify?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::JUSTIFY
-      }
-      assert(@format_o.justify?)
-        # The format testing is done in test_format_style
-    end
-
-    def test_left_align?
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(@format_o.left_align?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_ALIGN
-      }
-      assert(!@format_o.left_align?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert(!@format_o.left_align?)
-      assert_nothing_raised { @format_o.format_style = Text::Format::JUSTIFY }
-      assert(!@format_o.left_align?)
-        # The format testing is done in test_format_style
-    end
-
-    def test_left_margin
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(0, @format_o.left_margin)
-      assert_nothing_raised { @format_o.left_margin = -3 }
-      assert_equal(3, @format_o.left_margin)
-      assert_nothing_raised { @format_o.left_margin = "9" }
-      assert_equal(9, @format_o.left_margin)
-      assert_nothing_raised { @format_o.left_margin = "-2" }
-      assert_equal(2, @format_o.left_margin)
-      assert_nothing_raised { @format_o.left_margin = 7 }
-      assert_equal(7, @format_o.left_margin)
-      assert_nothing_raised {
-        ft = @format_o.format(GETTYSBURG).split("\n")
-        assert_match(/^ {11}Four score/, ft[0])
-        assert_match(/^ {7}November/, ft[-1])
-      }
-    end
-
-    def test_hard_margins
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.hard_margins)
-      assert_nothing_raised {
-        @format_o.hard_margins = true
-        @format_o.columns = 5
-        @format_o.first_indent = 0
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert(@format_o.hard_margins)
-      assert_equal(FIVE_COL, @format_o.format(GETTYSBURG))
-      assert_nothing_raised {
-        @format_o.split_rules |= Text::Format::SPLIT_CONTINUATION
-        assert_equal(Text::Format::SPLIT_CONTINUATION_FIXED,
-                     @format_o.split_rules)
-      }
-      assert_equal(FIVE_CNT, @format_o.format(GETTYSBURG))
-    end
-
-      # Tests both nobreak and nobreak_regex, since one is only useful
-      # with the other.
-    def test_nobreak
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.nobreak)
-      assert(@format_o.nobreak_regex.empty?)
-      assert_nothing_raised {
-        @format_o.nobreak = true
-        @format_o.nobreak_regex = { '^this$' => '^continent$' }
-        @format_o.columns = 77
-      }
-      assert(@format_o.nobreak)
-      assert_equal({ '^this$' => '^continent$' }, @format_o.nobreak_regex)
-      assert_match(/^this continent/,
-                   @format_o.format(GETTYSBURG).split("\n")[1])
-    end
-
-    def test_right_align?
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.right_align?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_ALIGN
-      }
-      assert(@format_o.right_align?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert(!@format_o.right_align?)
-      assert_nothing_raised { @format_o.format_style = Text::Format::JUSTIFY }
-      assert(!@format_o.right_align?)
-        # The format testing is done in test_format_style
-    end
-
-    def test_right_fill?
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert(!@format_o.right_fill?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_ALIGN
-      }
-      assert(!@format_o.right_fill?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::RIGHT_FILL
-      }
-      assert(@format_o.right_fill?)
-      assert_nothing_raised {
-        @format_o.format_style = Text::Format::JUSTIFY
-      }
-      assert(!@format_o.right_fill?)
-        # The format testing is done in test_format_style
-    end
-
-    def test_right_margin
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(0, @format_o.right_margin)
-      assert_nothing_raised { @format_o.right_margin = -3 }
-      assert_equal(3, @format_o.right_margin)
-      assert_nothing_raised { @format_o.right_margin = "9" }
-      assert_equal(9, @format_o.right_margin)
-      assert_nothing_raised { @format_o.right_margin = "-2" }
-      assert_equal(2, @format_o.right_margin)
-      assert_nothing_raised { @format_o.right_margin = 7 }
-      assert_equal(7, @format_o.right_margin)
-      assert_nothing_raised {
-        ft = @format_o.format(GETTYSBURG).split("\n")
-        assert_match(/^ {4}Four score.*forth on$/, ft[0])
-        assert_match(/^November/, ft[-1])
-      }
-    end
-
-    def test_tabstop
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal(8, @format_o.tabstop)
-      assert_nothing_raised { @format_o.tabstop = 7 }
-      assert_equal(7, @format_o.tabstop)
-      assert_nothing_raised { @format_o.tabstop = -3 }
-      assert_equal(3, @format_o.tabstop)
-      assert_nothing_raised { @format_o.tabstop = "9" }
-      assert_equal(9, @format_o.tabstop)
-      assert_nothing_raised { @format_o.tabstop = "-2" }
-      assert_equal(2, @format_o.tabstop)
-    end
-
-    def test_text
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal([], @format_o.text)
-      assert_nothing_raised { @format_o.text = "Test Text" }
-      assert_equal("Test Text", @format_o.text)
-      assert_nothing_raised { @format_o.text = ["Line 1", "Line 2"] }
-      assert_equal(["Line 1", "Line 2"], @format_o.text)
-    end
-
-    def test_s_new
-          # new(NilClass) { block }
-      assert_nothing_raised do
-        @format_o = Text::Format.new {
-          self.text = "Test 1, 2, 3"
-        }
-      end
-      assert_equal("Test 1, 2, 3", @format_o.text)
-
-        # new(Hash Symbols)
-      assert_nothing_raised { @format_o = Text::Format.new(:columns => 72) }
-      assert_equal(72, @format_o.columns)
-
-        # new(Hash String)
-      assert_nothing_raised { @format_o = Text::Format.new('columns' => 72) }
-      assert_equal(72, @format_o.columns)
-
-        # new(Hash) { block }
-      assert_nothing_raised do
-        @format_o = Text::Format.new('columns' => 80) {
-          self.text = "Test 4, 5, 6"
-        }
-      end
-      assert_equal("Test 4, 5, 6", @format_o.text)
-      assert_equal(80, @format_o.columns)
-
-        # new(Text::Format)
-      assert_nothing_raised do
-        fo = Text::Format.new(@format_o)
-        assert(fo == @format_o)
-      end
-
-        # new(Text::Format) { block }
-      assert_nothing_raised do
-        fo = Text::Format.new(@format_o) { self.columns = 79 }
-        assert(fo != @format_o)
-      end
-
-          # new(String)
-      assert_nothing_raised { @format_o = Text::Format.new("Test A, B, C") }
-      assert_equal("Test A, B, C", @format_o.text)
-
-          # new(String) { block }
-      assert_nothing_raised do
-        @format_o = Text::Format.new("Test X, Y, Z") { self.columns = -5 }
-      end
-      assert_equal("Test X, Y, Z", @format_o.text)
-      assert_equal(5, @format_o.columns)
-    end
-
-    def test_center
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_nothing_raised do
-        ct = @format_o.center(GETTYSBURG.split("\n")).split("\n")
-        assert_match(/^    Four score and seven years ago our fathers brought forth on this/, ct[0])
-        assert_match(/^                       not perish from the earth./, ct[-3])
-      end
-    end
-
-    def test_expand
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal("          ", @format_o.expand("\t  "))
-      assert_nothing_raised { @format_o.tabstop = 4 }
-      assert_equal("      ", @format_o.expand("\t  "))
-    end
-
-    def test_unexpand
-      assert_nothing_raised { @format_o = Text::Format.new }
-      assert_equal("\t  ", @format_o.unexpand("          "))
-      assert_nothing_raised { @format_o.tabstop = 4 }
-      assert_equal("\t  ", @format_o.unexpand("      "))
-    end
-
-    def test_space_only
-      assert_equal("", Text::Format.new.format(" "))
-      assert_equal("", Text::Format.new.format("\n"))
-      assert_equal("", Text::Format.new.format("        "))
-      assert_equal("", Text::Format.new.format("    \n"))
-      assert_equal("", Text::Format.new.paragraphs("\n"))
-      assert_equal("", Text::Format.new.paragraphs(" "))
-      assert_equal("", Text::Format.new.paragraphs("        "))
-      assert_equal("", Text::Format.new.paragraphs("    \n"))
-      assert_equal("", Text::Format.new.paragraphs(["\n"]))
-      assert_equal("", Text::Format.new.paragraphs([" "]))
-      assert_equal("", Text::Format.new.paragraphs(["        "]))
-      assert_equal("", Text::Format.new.paragraphs(["    \n"]))
-    end
-
-    def test_splendiferous
-      h = nil
-      test = "This is a splendiferous test"
-      assert_nothing_raised { @format_o = Text::Format.new(:columns => 6, :left_margin => 0, :indent => 0, :first_indent => 0) }
-      assert_match(/^splendiferous$/, @format_o.format(test))
-      assert_nothing_raised { @format_o.hard_margins = true }
-      assert_match(/^lendif$/, @format_o.format(test))
-      assert_nothing_raised { h = Object.new }
-      assert_nothing_raised do
-        @format_o.split_rules = Text::Format::SPLIT_HYPHENATION
-        class << h #:nodoc:
-          def hyphenate_to(word, size)
-            return ["", word] if size < 2
-            [word[0 ... size], word[size .. -1]]
-          end
-        end
-        @format_o.hyphenator = h
-      end
-      assert_match(/^iferou$/, @format_o.format(test))
-      assert_nothing_raised { h = Object.new }
-      assert_nothing_raised do
-        class << h #:nodoc:
-          def hyphenate_to(word, size, formatter)
-            return ["", word] if word.size < formatter.columns
-            [word[0 ... size], word[size .. -1]]
-          end
-        end
-        @format_o.hyphenator = h
-      end
-      assert_match(/^ferous$/, @format_o.format(test))
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/vendor/text_format.rb b/actionmailer/lib/action_mailer/vendor/text_format.rb
deleted file mode 100644
index c6c8c394d0..0000000000
--- a/actionmailer/lib/action_mailer/vendor/text_format.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
-  gem 'text-format', '>= 0.6.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/text-format-0.6.3"
-end
-
-require 'text/format'
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 50b8a53006..ce09bb5d61 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -8,7 +8,6 @@ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'rubygems'
 require 'test/unit'
-
 require 'action_mailer'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
@@ -18,14 +17,10 @@ ActiveSupport::Deprecation.debug = true
 ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect }
 ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect }
 
-ActionView::Base::DEFAULT_CONFIG = { :assets_dir => '/nowhere' }
-
-$:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
+FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
+ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
 
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
-
-class MockSMTP
+class MockSMTP  
   def self.deliveries
     @@deliveries
   end
@@ -49,19 +44,11 @@ class Net::SMTP
   end
 end
 
-def uses_gem(gem_name, test_name, version = '> 0')
-  gem gem_name.to_s, version
-  require gem_name.to_s
-  yield
-rescue LoadError
-  $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
-end
-
-def set_delivery_method(delivery_method)
+def set_delivery_method(method)
   @old_delivery_method = ActionMailer::Base.delivery_method
-  ActionMailer::Base.delivery_method = delivery_method
+  ActionMailer::Base.delivery_method = method
 end
 
 def restore_delivery_method
   ActionMailer::Base.delivery_method = @old_delivery_method
-end
+end
\ No newline at end of file
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
new file mode 100644
index 0000000000..03e3f81acd
--- /dev/null
+++ b/actionmailer/test/base_test.rb
@@ -0,0 +1,488 @@
+# encoding: utf-8
+require 'abstract_unit'
+
+class BaseTest < ActiveSupport::TestCase
+  class BaseMailer < ActionMailer::Base
+    self.mailer_name = "base_mailer"
+
+    default :to => 'system@test.lindsaar.net',
+            :from => 'jose@test.plataformatec.com',
+            :reply_to => 'mikel@test.lindsaar.net'
+
+    def welcome(hash = {})
+      headers['X-SPAM'] = "Not SPAM"
+      mail({:subject => "The first email on new API!"}.merge!(hash))
+    end
+
+    def simple(hash = {})
+      mail(hash)
+    end
+
+    def html_only(hash = {})
+      mail(hash)
+    end
+
+    def plain_text_only(hash = {})
+      mail(hash)
+    end
+    
+    def simple_with_headers(hash = {})
+      headers hash
+      mail
+    end
+
+    def attachment_with_content(hash = {})
+      attachments['invoice.pdf'] = 'This is test File content'
+      mail(hash)
+    end
+
+    def attachment_with_hash
+      attachments['invoice.jpg'] = { :data => "you smiling", :mime_type => "image/x-jpg",
+        :transfer_encoding => "base64" }
+      mail
+    end
+
+    def implicit_multipart(hash = {})
+      attachments['invoice.pdf'] = 'This is test File content' if hash.delete(:attachments)
+      mail(hash)
+    end
+
+    def implicit_with_locale(hash = {})
+      mail(hash)
+    end
+
+    def explicit_multipart(hash = {})
+      attachments['invoice.pdf'] = 'This is test File content' if hash.delete(:attachments)
+      mail(hash) do |format|
+        format.text { render :text => "TEXT Explicit Multipart" }
+        format.html { render :text => "HTML Explicit Multipart" }
+      end
+    end
+
+    def explicit_multipart_templates(hash = {})
+      mail(hash) do |format|
+        format.html
+        format.text
+      end
+    end
+
+    def explicit_multipart_with_any(hash = {})
+      mail(hash) do |format|
+        format.any(:text, :html){ render :text => "Format with any!" }
+      end
+    end
+
+    def custom_block(include_html=false)
+      mail do |format|
+        format.text(:content_transfer_encoding => "base64"){ render "welcome" }
+        format.html{ render "welcome" } if include_html
+      end
+    end
+  end
+
+  test "method call to mail does not raise error" do
+    assert_nothing_raised { BaseMailer.welcome }
+  end
+
+  # Basic mail usage without block
+  test "mail() should set the headers of the mail message" do
+    email = BaseMailer.welcome
+    assert_equal(['system@test.lindsaar.net'],    email.to)
+    assert_equal(['jose@test.plataformatec.com'], email.from)
+    assert_equal('The first email on new API!',   email.subject)
+  end
+
+  test "mail() with from overwrites the class level default" do
+    email = BaseMailer.welcome(:from => 'someone@example.com',
+                               :to   => 'another@example.org')
+    assert_equal(['someone@example.com'], email.from)
+    assert_equal(['another@example.org'], email.to)
+  end
+
+  test "mail() with bcc, cc, content_type, charset, mime_version, reply_to and date" do
+    @time = Time.now.beginning_of_day.to_datetime
+    email = BaseMailer.welcome(:bcc => 'bcc@test.lindsaar.net',
+                               :cc  => 'cc@test.lindsaar.net',
+                               :content_type => 'multipart/mixed',
+                               :charset => 'iso-8559-1',
+                               :mime_version => '2.0',
+                               :reply_to => 'reply-to@test.lindsaar.net',
+                               :date => @time)
+    assert_equal(['bcc@test.lindsaar.net'],      email.bcc)
+    assert_equal(['cc@test.lindsaar.net'],       email.cc)
+    assert_equal('multipart/mixed',              email.content_type)
+    assert_equal('iso-8559-1',                   email.charset)
+    assert_equal('2.0',                          email.mime_version)
+    assert_equal(['reply-to@test.lindsaar.net'], email.reply_to)
+    assert_equal(@time,                          email.date)
+  end
+
+  test "mail() renders the template using the method being processed" do
+    email = BaseMailer.welcome
+    assert_equal("Welcome", email.body.encoded)
+  end
+
+  test "can pass in :body to the mail method hash" do
+    email = BaseMailer.welcome(:body => "Hello there")
+    assert_equal("text/plain", email.mime_type)
+    assert_equal("Hello there", email.body.encoded)
+  end
+
+  # Custom headers
+  test "custom headers" do
+    email = BaseMailer.welcome
+    assert_equal("Not SPAM", email['X-SPAM'].decoded)
+  end
+
+  test "can pass random headers in as a hash to mail" do
+    hash = {'X-Special-Domain-Specific-Header' => "SecretValue",
+            'In-Reply-To' => '1234@mikel.me.com' }
+    mail = BaseMailer.simple(hash)
+    assert_equal('SecretValue', mail['X-Special-Domain-Specific-Header'].decoded)
+    assert_equal('1234@mikel.me.com', mail['In-Reply-To'].decoded)
+  end
+
+  test "can pass random headers in as a hash" do
+    hash = {'X-Special-Domain-Specific-Header' => "SecretValue",
+            'In-Reply-To' => '1234@mikel.me.com' }
+    mail = BaseMailer.simple_with_headers(hash)
+    assert_equal('SecretValue', mail['X-Special-Domain-Specific-Header'].decoded)
+    assert_equal('1234@mikel.me.com', mail['In-Reply-To'].decoded)
+  end
+
+  # Attachments
+  test "attachment with content" do
+    email = BaseMailer.attachment_with_content
+    assert_equal(1, email.attachments.length)
+    assert_equal('invoice.pdf', email.attachments[0].filename)
+    assert_equal('This is test File content', email.attachments['invoice.pdf'].decoded)
+  end
+
+  test "attachment gets content type from filename" do
+    email = BaseMailer.attachment_with_content
+    assert_equal('invoice.pdf', email.attachments[0].filename)
+  end
+
+  test "attachment with hash" do
+    email = BaseMailer.attachment_with_hash
+    assert_equal(1, email.attachments.length)
+    assert_equal('invoice.jpg', email.attachments[0].filename)
+    expected = "\312\213\254\232)b"
+    expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+    assert_equal expected, email.attachments['invoice.jpg'].decoded
+  end
+
+  test "sets mime type to multipart/mixed when attachment is included" do
+    email = BaseMailer.attachment_with_content
+    assert_equal(1, email.attachments.length)
+    assert_equal("multipart/mixed", email.mime_type)
+  end
+
+  test "adds the rendered template as part" do
+    email = BaseMailer.attachment_with_content
+    assert_equal(2, email.parts.length)
+    assert_equal("multipart/mixed", email.mime_type)
+    assert_equal("text/html", email.parts[0].mime_type)
+    assert_equal("Attachment with content", email.parts[0].body.encoded)
+    assert_equal("application/pdf", email.parts[1].mime_type)
+    assert_equal("VGhpcyBpcyB0ZXN0IEZpbGUgY29udGVudA==\r\n", email.parts[1].body.encoded)
+  end
+
+  test "adds the given :body as part" do
+    email = BaseMailer.attachment_with_content(:body => "I'm the eggman")
+    assert_equal(2, email.parts.length)
+    assert_equal("multipart/mixed", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("I'm the eggman", email.parts[0].body.encoded)
+    assert_equal("application/pdf", email.parts[1].mime_type)
+    assert_equal("VGhpcyBpcyB0ZXN0IEZpbGUgY29udGVudA==\r\n", email.parts[1].body.encoded)
+  end
+
+  # Defaults values
+  test "uses default charset from class" do
+    with_default BaseMailer, :charset => "US-ASCII" do
+      email = BaseMailer.welcome
+      assert_equal("US-ASCII", email.charset)
+
+      email = BaseMailer.welcome(:charset => "iso-8559-1")
+      assert_equal("iso-8559-1", email.charset)
+    end
+  end
+
+  test "uses default content type from class" do
+    with_default BaseMailer, :content_type => "text/html" do
+      email = BaseMailer.welcome
+      assert_equal("text/html", email.mime_type)
+
+      email = BaseMailer.welcome(:content_type => "text/plain")
+      assert_equal("text/plain", email.mime_type)
+    end
+  end
+
+  test "uses default mime version from class" do
+    with_default BaseMailer, :mime_version => "2.0" do
+      email = BaseMailer.welcome
+      assert_equal("2.0", email.mime_version)
+
+      email = BaseMailer.welcome(:mime_version => "1.0")
+      assert_equal("1.0", email.mime_version)
+    end
+  end
+
+  test "uses random default headers from class" do
+    with_default BaseMailer, "X-SPAM" => "Not spam" do
+      email = BaseMailer.simple
+      assert_equal("Not spam", email["X-SPAM"].decoded)
+    end
+  end
+
+  test "subject gets default from I18n" do
+    BaseMailer.default[:subject] = nil
+    email = BaseMailer.welcome(:subject => nil)
+    assert_equal "Welcome", email.subject
+
+    I18n.backend.store_translations('en', :actionmailer => {:base_mailer => {:welcome => {:subject => "New Subject!"}}})
+    email = BaseMailer.welcome(:subject => nil)
+    assert_equal "New Subject!", email.subject
+  end
+
+  # Implicit multipart
+  test "implicit multipart" do
+    email = BaseMailer.implicit_multipart
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("TEXT Implicit Multipart", email.parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].mime_type)
+    assert_equal("HTML Implicit Multipart", email.parts[1].body.encoded)
+  end
+
+  test "implicit multipart with sort order" do
+    order = ["text/html", "text/plain"]
+    with_default BaseMailer, :parts_order => order do
+      email = BaseMailer.implicit_multipart
+      assert_equal("text/html",  email.parts[0].mime_type)
+      assert_equal("text/plain", email.parts[1].mime_type)
+
+      email = BaseMailer.implicit_multipart(:parts_order => order.reverse)
+      assert_equal("text/plain", email.parts[0].mime_type)
+      assert_equal("text/html",  email.parts[1].mime_type)
+    end
+  end
+
+  test "implicit multipart with attachments creates nested parts" do
+    email = BaseMailer.implicit_multipart(:attachments => true)
+    assert_equal("application/pdf", email.parts[0].mime_type)
+    assert_equal("multipart/alternative", email.parts[1].mime_type)
+    assert_equal("text/plain", email.parts[1].parts[0].mime_type)
+    assert_equal("TEXT Implicit Multipart", email.parts[1].parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].parts[1].mime_type)
+    assert_equal("HTML Implicit Multipart", email.parts[1].parts[1].body.encoded)
+  end
+
+  test "implicit multipart with attachments and sort order" do
+    order = ["text/html", "text/plain"]
+    with_default BaseMailer, :parts_order => order do
+      email = BaseMailer.implicit_multipart(:attachments => true)
+      assert_equal("application/pdf", email.parts[0].mime_type)
+      assert_equal("multipart/alternative", email.parts[1].mime_type)
+      assert_equal("text/plain", email.parts[1].parts[1].mime_type)
+      assert_equal("text/html", email.parts[1].parts[0].mime_type)
+    end
+  end
+
+  test "implicit multipart with default locale" do
+    email = BaseMailer.implicit_with_locale
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("Implicit with locale TEXT", email.parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].mime_type)
+    assert_equal("Implicit with locale EN HTML", email.parts[1].body.encoded)
+  end
+
+  test "implicit multipart with other locale" do
+    swap I18n, :locale => :pl do
+      email = BaseMailer.implicit_with_locale
+      assert_equal(2, email.parts.size)
+      assert_equal("multipart/alternative", email.mime_type)
+      assert_equal("text/plain", email.parts[0].mime_type)
+      assert_equal("Implicit with locale PL TEXT", email.parts[0].body.encoded)
+      assert_equal("text/html", email.parts[1].mime_type)
+      assert_equal("Implicit with locale HTML", email.parts[1].body.encoded)
+    end
+  end
+
+  test "implicit multipart with several view paths uses the first one with template" do
+    begin
+      BaseMailer.view_paths.unshift(File.join(FIXTURE_LOAD_PATH, "another.path"))
+      email = BaseMailer.welcome
+      assert_equal("Welcome from another path", email.body.encoded)
+    ensure
+      BaseMailer.view_paths.shift
+    end
+  end
+
+  test "implicit multipart with inexistent templates uses the next view path" do
+    begin
+      BaseMailer.view_paths.unshift(File.join(FIXTURE_LOAD_PATH, "unknown"))
+      email = BaseMailer.welcome
+      assert_equal("Welcome", email.body.encoded)
+    ensure
+      BaseMailer.view_paths.shift
+    end
+  end
+
+  # Explicit multipart
+  test "explicit multipart" do
+    email = BaseMailer.explicit_multipart
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("TEXT Explicit Multipart", email.parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].mime_type)
+    assert_equal("HTML Explicit Multipart", email.parts[1].body.encoded)
+  end
+
+  test "explicit multipart does not sort order" do
+    order = ["text/html", "text/plain"]
+    with_default BaseMailer, :parts_order => order do
+      email = BaseMailer.explicit_multipart
+      assert_equal("text/plain", email.parts[0].mime_type)
+      assert_equal("text/html",  email.parts[1].mime_type)
+
+      email = BaseMailer.explicit_multipart(:parts_order => order.reverse)
+      assert_equal("text/plain", email.parts[0].mime_type)
+      assert_equal("text/html",  email.parts[1].mime_type)
+    end
+  end
+
+  test "explicit multipart with attachments creates nested parts" do
+    email = BaseMailer.explicit_multipart(:attachments => true)
+    assert_equal("application/pdf", email.parts[0].mime_type)
+    assert_equal("multipart/alternative", email.parts[1].mime_type)
+    assert_equal("text/plain", email.parts[1].parts[0].mime_type)
+    assert_equal("TEXT Explicit Multipart", email.parts[1].parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].parts[1].mime_type)
+    assert_equal("HTML Explicit Multipart", email.parts[1].parts[1].body.encoded)
+  end
+
+  test "explicit multipart with templates" do
+    email = BaseMailer.explicit_multipart_templates
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/html", email.parts[0].mime_type)
+    assert_equal("HTML Explicit Multipart Templates", email.parts[0].body.encoded)
+    assert_equal("text/plain", email.parts[1].mime_type)
+    assert_equal("TEXT Explicit Multipart Templates", email.parts[1].body.encoded)
+  end
+
+  test "explicit multipart with any" do
+    email = BaseMailer.explicit_multipart_with_any
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("Format with any!", email.parts[0].body.encoded)
+    assert_equal("text/html", email.parts[1].mime_type)
+    assert_equal("Format with any!", email.parts[1].body.encoded)
+  end
+
+  test "explicit multipart with options" do
+    email = BaseMailer.custom_block(true)
+    email.ready_to_send!
+    assert_equal(2, email.parts.size)
+    assert_equal("multipart/alternative", email.mime_type)
+    assert_equal("text/plain", email.parts[0].mime_type)
+    assert_equal("base64", email.parts[0].content_transfer_encoding)
+    assert_equal("text/html", email.parts[1].mime_type)
+    assert_equal("7bit", email.parts[1].content_transfer_encoding)
+  end
+
+  test "explicit multipart with one part is rendered as body" do
+    email = BaseMailer.custom_block
+    assert_equal(0, email.parts.size)
+    assert_equal("text/plain", email.mime_type)
+    assert_equal("base64", email.content_transfer_encoding)
+  end
+
+  # Class level API with method missing
+  test "should respond to action methods" do
+    assert BaseMailer.respond_to?(:welcome)
+    assert BaseMailer.respond_to?(:implicit_multipart)
+    assert !BaseMailer.respond_to?(:mail)
+    assert !BaseMailer.respond_to?(:headers)
+  end
+
+  test "calling just the action should return the generated mail object" do
+    BaseMailer.deliveries.clear
+    email = BaseMailer.welcome
+    assert_equal(0, BaseMailer.deliveries.length)
+    assert_equal('The first email on new API!', email.subject)
+  end
+
+  test "calling deliver on the action should deliver the mail object" do
+    BaseMailer.deliveries.clear
+    BaseMailer.expects(:deliver_mail).once
+    mail = BaseMailer.welcome.deliver
+    assert_instance_of Mail::Message, mail
+  end
+
+  test "calling deliver on the action should increment the deliveries collection" do
+    BaseMailer.deliveries.clear
+    BaseMailer.welcome.deliver
+    assert_equal(1, BaseMailer.deliveries.length)
+  end
+  
+  test "calling deliver, ActionMailer should yield back to mail to let it call :do_delivery on itself" do
+    mail = Mail::Message.new
+    mail.expects(:do_delivery).once
+    BaseMailer.expects(:welcome).returns(mail)
+    BaseMailer.welcome.deliver
+  end
+  
+  test "explicit multipart should be multipart" do
+    mail = BaseMailer.explicit_multipart
+    assert_not_nil(mail.content_type_parameters[:boundary])
+  end
+  
+  test "should set a content type if only has an html part" do
+    mail = BaseMailer.html_only
+    assert_equal('text/html', mail.mime_type)
+  end
+  
+  test "should set a content type if only has an plain text part" do
+    mail = BaseMailer.plain_text_only
+    assert_equal('text/plain', mail.mime_type)
+  end
+
+  protected
+
+    # Execute the block setting the given values and restoring old values after
+    # the block is executed.
+    def swap(klass, new_values)
+      old_values = {}
+      new_values.each do |key, value|
+        old_values[key] = klass.send key
+        klass.send :"#{key}=", value
+      end
+      yield
+    ensure
+      old_values.each do |key, value|
+        klass.send :"#{key}=", value
+      end
+    end
+
+    def with_default(klass, new_values)
+      hash = klass.default
+      old_values = {}
+      new_values.each do |key, value|
+        old_values[key] = hash[key]
+        hash[key] = value
+      end
+      yield
+    ensure
+      old_values.each do |key, value|
+        hash[key] = value
+      end
+    end
+end
diff --git a/actionmailer/test/delivery_method_test.rb b/actionmailer/test/delivery_method_test.rb
deleted file mode 100644
index 8f8c6b0275..0000000000
--- a/actionmailer/test/delivery_method_test.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'abstract_unit'
-
-class DefaultDeliveryMethodMailer < ActionMailer::Base
-end
-
-class NonDefaultDeliveryMethodMailer < ActionMailer::Base
-  self.delivery_method = :sendmail
-end
-
-class FileDeliveryMethodMailer < ActionMailer::Base
-  self.delivery_method = :file
-end
-
-class CustomDeliveryMethod
-  attr_accessor :custom_deliveries
-  def initialize()
-    @customer_deliveries = []
-  end
-
-  def self.perform_delivery(mail)
-    self.custom_deliveries << mail
-  end
-end
-
-class CustomerDeliveryMailer < ActionMailer::Base
-  self.delivery_method = CustomDeliveryMethod.new
-end
-
-class ActionMailerBase_delivery_method_Test < Test::Unit::TestCase
-  def setup
-    set_delivery_method :smtp
-  end
-  
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_be_the_default_smtp
-    assert_instance_of ActionMailer::DeliveryMethod::Smtp, ActionMailer::Base.delivery_method
-  end
-end
-
-class DefaultDeliveryMethodMailer_delivery_method_Test < Test::Unit::TestCase
-  def setup
-    set_delivery_method :smtp
-  end
-  
-  def teardown
-    restore_delivery_method
-  end
-  
-  def test_should_be_the_default_smtp
-    assert_instance_of ActionMailer::DeliveryMethod::Smtp, DefaultDeliveryMethodMailer.delivery_method
-  end
-end
-
-class NonDefaultDeliveryMethodMailer_delivery_method_Test < Test::Unit::TestCase
-  def setup
-    set_delivery_method :smtp
-  end
-  
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_be_the_set_delivery_method
-    assert_instance_of ActionMailer::DeliveryMethod::Sendmail, NonDefaultDeliveryMethodMailer.delivery_method
-  end
-end
-
-class FileDeliveryMethodMailer_delivery_method_Test < Test::Unit::TestCase
-  def setup
-    set_delivery_method :smtp
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_be_the_set_delivery_method
-    assert_instance_of ActionMailer::DeliveryMethod::File, FileDeliveryMethodMailer.delivery_method
-  end
-
-  def test_should_default_location_to_the_tmpdir
-    assert_equal "#{Dir.tmpdir}/mails", ActionMailer::Base.file_settings[:location]
-  end
-end
-
-class CustomDeliveryMethodMailer_delivery_method_Test < Test::Unit::TestCase
-  def setup
-    set_delivery_method :smtp
-  end
-
-  def teardown
-    restore_delivery_method
-  end
-
-  def test_should_be_the_set_delivery_method
-    assert_instance_of CustomDeliveryMethod, CustomerDeliveryMailer.delivery_method
-  end
-end
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
new file mode 100644
index 0000000000..4907ca0903
--- /dev/null
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -0,0 +1,170 @@
+require 'abstract_unit'
+require 'mail'
+
+class MyCustomDelivery
+end
+
+class BogusDelivery
+  def initialize(*)
+  end
+
+  def deliver!(mail)
+    raise "failed"
+  end
+end
+
+class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
+  test "default smtp settings" do
+    settings = { :address              => "localhost",
+                 :port                 => 25,
+                 :domain               => 'localhost.localdomain',
+                 :user_name            => nil,
+                 :password             => nil,
+                 :authentication       => nil,
+                 :enable_starttls_auto => true }
+    assert_equal settings, ActionMailer::Base.smtp_settings
+  end
+
+  test "default file delivery settings" do
+    settings = {:location => "#{Dir.tmpdir}/mails"}
+    assert_equal settings, ActionMailer::Base.file_settings
+  end
+
+  test "default sendmail settings" do
+    settings = {:location       => '/usr/sbin/sendmail',
+                :arguments      => '-i -t'}
+    assert_equal settings, ActionMailer::Base.sendmail_settings
+  end
+end
+
+class CustomDeliveryMethodsTest < ActiveSupport::TestCase
+  def setup
+    @old_delivery_method = ActionMailer::Base.delivery_method
+    ActionMailer::Base.add_delivery_method :custom, MyCustomDelivery
+  end
+
+  def teardown
+    ActionMailer::Base.delivery_method = @old_delivery_method
+    ActionMailer::Base.delivery_methods.delete(:custom)
+  end
+
+  test "allow to add custom delivery method" do
+    ActionMailer::Base.delivery_method = :custom
+    assert_equal :custom, ActionMailer::Base.delivery_method
+  end
+
+  test "allow to customize custom settings" do
+    ActionMailer::Base.custom_settings = { :foo => :bar }
+    assert_equal Hash[:foo => :bar], ActionMailer::Base.custom_settings
+  end
+
+  test "respond to custom settings" do
+    assert_respond_to ActionMailer::Base, :custom_settings
+    assert_respond_to ActionMailer::Base, :custom_settings=
+  end
+
+  test "does not respond to unknown settings" do
+    assert_raise NoMethodError do
+      ActionMailer::Base.another_settings
+    end
+  end
+end
+
+class MailDeliveryTest < ActiveSupport::TestCase
+  class DeliveryMailer < ActionMailer::Base
+    DEFAULT_HEADERS = {
+      :to => 'mikel@test.lindsaar.net',
+      :from => 'jose@test.plataformatec.com'
+    }
+
+    def welcome(hash={})
+      mail(DEFAULT_HEADERS.merge(hash))
+    end
+  end
+
+  def setup
+    ActionMailer::Base.delivery_method = :smtp
+  end
+
+  def teardown
+    DeliveryMailer.delivery_method = :smtp
+    DeliveryMailer.perform_deliveries = true
+    DeliveryMailer.raise_delivery_errors = true
+  end
+
+  test "ActionMailer should be told when Mail gets delivered" do
+    DeliveryMailer.deliveries.clear
+    DeliveryMailer.expects(:deliver_mail).once
+    DeliveryMailer.welcome.deliver
+  end
+
+  test "delivery method can be customized per instance" do
+    email = DeliveryMailer.welcome.deliver
+    assert_instance_of Mail::SMTP, email.delivery_method
+    email = DeliveryMailer.welcome(:delivery_method => :test).deliver
+    assert_instance_of Mail::TestMailer, email.delivery_method
+  end
+
+  test "delivery method can be customized in subclasses not changing the parent" do
+    DeliveryMailer.delivery_method = :test
+    assert_equal :smtp, ActionMailer::Base.delivery_method
+    $BREAK = true
+    email = DeliveryMailer.welcome.deliver
+    assert_instance_of Mail::TestMailer, email.delivery_method
+  end
+
+  test "non registered delivery methods raises errors" do
+    DeliveryMailer.delivery_method = :unknown
+    assert_raise RuntimeError do
+      DeliveryMailer.welcome.deliver
+    end
+  end
+
+  test "does not perform deliveries if requested" do
+    DeliveryMailer.perform_deliveries = false
+    DeliveryMailer.deliveries.clear
+    Mail::Message.any_instance.expects(:deliver!).never
+    DeliveryMailer.welcome.deliver
+  end
+  
+  test "does not append the deliveries collection if told not to perform the delivery" do
+    DeliveryMailer.perform_deliveries = false
+    DeliveryMailer.deliveries.clear
+    DeliveryMailer.welcome.deliver
+    assert_equal(0, DeliveryMailer.deliveries.length)
+  end
+
+  test "raise errors on bogus deliveries" do
+    DeliveryMailer.delivery_method = BogusDelivery
+    DeliveryMailer.deliveries.clear
+    assert_raise RuntimeError do
+      DeliveryMailer.welcome.deliver
+    end
+  end
+
+  test "does not increment the deliveries collection on error" do
+    DeliveryMailer.delivery_method = BogusDelivery
+    DeliveryMailer.deliveries.clear
+    assert_raise RuntimeError do
+      DeliveryMailer.welcome.deliver
+    end
+    assert_equal(0, DeliveryMailer.deliveries.length)
+  end
+
+  test "does not raise errors on bogus deliveries if set" do
+    DeliveryMailer.delivery_method = BogusDelivery
+    DeliveryMailer.raise_delivery_errors = false
+    assert_nothing_raised do
+      DeliveryMailer.welcome.deliver
+    end
+  end
+  
+  test "does not increment the deliveries collection on bogus deliveries" do
+    DeliveryMailer.delivery_method = BogusDelivery
+    DeliveryMailer.raise_delivery_errors = false
+    DeliveryMailer.deliveries.clear
+    DeliveryMailer.welcome.deliver
+    assert_equal(0, DeliveryMailer.deliveries.length)
+  end
+  
+end
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/another.path/base_mailer/welcome.erb b/actionmailer/test/fixtures/another.path/base_mailer/welcome.erb
new file mode 100644
index 0000000000..ef451298e2
--- /dev/null
+++ b/actionmailer/test/fixtures/another.path/base_mailer/welcome.erb
@@ -0,0 +1 @@
+Welcome from another path
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/attachment_with_content.erb b/actionmailer/test/fixtures/base_mailer/attachment_with_content.erb
new file mode 100644
index 0000000000..deb9dbd03b
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/attachment_with_content.erb
@@ -0,0 +1 @@
+Attachment with content
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.html.erb b/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.html.erb
new file mode 100644
index 0000000000..c0a61b6249
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.html.erb
@@ -0,0 +1 @@
+HTML Explicit Multipart Templates
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.text.erb b/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.text.erb
new file mode 100644
index 0000000000..507230b1de
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/explicit_multipart_templates.text.erb
@@ -0,0 +1 @@
+TEXT Explicit Multipart Templates
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/html_only.html.erb b/actionmailer/test/fixtures/base_mailer/html_only.html.erb
new file mode 100644
index 0000000000..9c99a008e7
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/html_only.html.erb
@@ -0,0 +1 @@
+<h1>Testing</h1>
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_multipart.html.erb b/actionmailer/test/fixtures/base_mailer/implicit_multipart.html.erb
new file mode 100644
index 0000000000..23745cd282
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_multipart.html.erb
@@ -0,0 +1 @@
+HTML Implicit Multipart
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_multipart.text.erb b/actionmailer/test/fixtures/base_mailer/implicit_multipart.text.erb
new file mode 100644
index 0000000000..d51437fc72
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_multipart.text.erb
@@ -0,0 +1 @@
+TEXT Implicit Multipart
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_with_locale.en.html.erb b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.en.html.erb
new file mode 100644
index 0000000000..34e39c8fdb
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.en.html.erb
@@ -0,0 +1 @@
+Implicit with locale EN HTML
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_with_locale.html.erb b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.html.erb
new file mode 100644
index 0000000000..5ce283f221
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.html.erb
@@ -0,0 +1 @@
+Implicit with locale HTML
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_with_locale.pl.text.erb b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.pl.text.erb
new file mode 100644
index 0000000000..c49cbae60a
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.pl.text.erb
@@ -0,0 +1 @@
+Implicit with locale PL TEXT
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/implicit_with_locale.text.erb b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.text.erb
new file mode 100644
index 0000000000..5a18ff62cd
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/implicit_with_locale.text.erb
@@ -0,0 +1 @@
+Implicit with locale TEXT
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/plain_text_only.text.erb b/actionmailer/test/fixtures/base_mailer/plain_text_only.text.erb
new file mode 100644
index 0000000000..0a90125685
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/plain_text_only.text.erb
@@ -0,0 +1 @@
+Testing
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/base_mailer/welcome.erb b/actionmailer/test/fixtures/base_mailer/welcome.erb
new file mode 100644
index 0000000000..01f3f00c63
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/welcome.erb
@@ -0,0 +1 @@
+Welcome
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb
deleted file mode 100644
index fcff3bb1b4..0000000000
--- a/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb
+++ /dev/null
@@ -1 +0,0 @@
-So, <%= example_format(@text) %>
diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_helper.erb
deleted file mode 100644
index 378777f8bb..0000000000
--- a/actionmailer/test/fixtures/helper_mailer/use_helper.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello, <%= person_name %>. Thanks for registering!
diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb b/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb
deleted file mode 100644
index d5b8b285e7..0000000000
--- a/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb
+++ /dev/null
@@ -1 +0,0 @@
-This message brought to you by <%= name_of_the_mailer_class %>.
diff --git a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb
deleted file mode 100644
index 96ec49d18a..0000000000
--- a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-From "Romeo and Juliet":
-
-<%= block_format @text %>
-
-Good ol' Shakespeare.
diff --git a/actionmailer/test/fixtures/helpers/example_helper.rb b/actionmailer/test/fixtures/helpers/example_helper.rb
deleted file mode 100644
index f6a6a49ced..0000000000
--- a/actionmailer/test/fixtures/helpers/example_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ExampleHelper
-  def example_format(text)
-    "<em><strong><small>#{h(text)}</small></strong></em>".html_safe!
-  end
-end
diff --git a/actionmailer/test/fixtures/nested_layout_mailer/signup.html.erb b/actionmailer/test/fixtures/nested_layout_mailer/signup.html.erb
new file mode 100644
index 0000000000..4789e888c6
--- /dev/null
+++ b/actionmailer/test/fixtures/nested_layout_mailer/signup.html.erb
@@ -0,0 +1 @@
+We do not spam
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/test_mailer/body_ivar.erb b/actionmailer/test/fixtures/test_mailer/body_ivar.erb
deleted file mode 100644
index 1421e5c908..0000000000
--- a/actionmailer/test/fixtures/test_mailer/body_ivar.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-body: <%= @body %>
-bar: <%= @bar %>
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/test_mailer/multipart_alternative.html.erb b/actionmailer/test/fixtures/test_mailer/multipart_alternative.html.erb
new file mode 100644
index 0000000000..73ea14f82f
--- /dev/null
+++ b/actionmailer/test/fixtures/test_mailer/multipart_alternative.html.erb
@@ -0,0 +1 @@
+<strong>foo</strong> <%= @foo %>
\ No newline at end of file
diff --git a/actionmailer/test/fixtures/test_mailer/multipart_alternative.plain.erb b/actionmailer/test/fixtures/test_mailer/multipart_alternative.plain.erb
new file mode 100644
index 0000000000..779fe4c1ea
--- /dev/null
+++ b/actionmailer/test/fixtures/test_mailer/multipart_alternative.plain.erb
@@ -0,0 +1 @@
+foo: <%= @foo %>
\ No newline at end of file
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 2d3565d159..7cc0804323 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -1,96 +1,54 @@
 require 'abstract_unit'
 
-module MailerHelper
-  def person_name
-    "Mr. Joe Person"
-  end
-end
-
 class HelperMailer < ActionMailer::Base
-  helper MailerHelper
-  helper :example
-
-  def use_helper(recipient)
-    recipients recipient
-    subject    "using helpers"
-    from       "tester@example.com"
-  end
-
-  def use_example_helper(recipient)
-    recipients recipient
-    subject    "using helpers"
-    from       "tester@example.com"
-
-    @text = "emphasize me!"
-  end
-
-  def use_mail_helper(recipient)
-    recipients recipient
-    subject    "using mailing helpers"
-    from       "tester@example.com"
-
+  def use_mail_helper
     @text = "But soft! What light through yonder window breaks? It is the east, " +
             "and Juliet is the sun. Arise, fair sun, and kill the envious moon, " +
             "which is sick and pale with grief that thou, her maid, art far more " +
             "fair than she. Be not her maid, for she is envious! Her vestal " +
             "livery is but sick and green, and none but fools do wear it. Cast " +
             "it off!"
-  end
 
-  def use_helper_method(recipient)
-    recipients recipient
-    subject    "using helpers"
-    from       "tester@example.com"
-
-    @text = "emphasize me!"
+    mail_with_defaults do |format|
+      format.html { render(:inline => "<%= block_format @text %>") }
+    end
   end
 
-  private
-
-    def name_of_the_mailer_class
-      self.class.name
+  def use_mailer
+    mail_with_defaults do |format|
+      format.html { render(:inline => "<%= mailer.message.subject %>") }
     end
-    helper_method :name_of_the_mailer_class
-end
+  end
 
-class MailerHelperTest < Test::Unit::TestCase
-  def new_mail( charset="utf-8" )
-    mail = Mail.new
-    mail.set_content_type "text", "plain", { "charset" => charset } if charset
-    mail
+  def use_message
+    mail_with_defaults do |format|
+      format.html { render(:inline => "<%= message.subject %>") }
+    end
   end
 
-  def setup
-    set_delivery_method :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+  protected
 
-    @recipient = 'test@localhost'
-  end
-  
-  def teardown
-    restore_delivery_method
-  end
-  
-  def test_use_helper
-    mail = HelperMailer.create_use_helper(@recipient)
-    assert_match %r{Mr. Joe Person}, mail.encoded
+  def mail_with_defaults(&block)
+    mail(:to => "test@localhost", :from => "tester@example.com",
+          :subject => "using helpers", &block)
   end
+end
 
-  def test_use_example_helper
-    mail = HelperMailer.create_use_example_helper(@recipient)
-    assert_match %r{<em><strong><small>emphasize me!}, mail.encoded
+class MailerHelperTest < ActionMailer::TestCase
+  def test_use_mail_helper
+    mail = HelperMailer.use_mail_helper
+    assert_match %r{  But soft!}, mail.body.encoded
+    assert_match %r{east, and\r\n  Juliet}, mail.body.encoded
   end
 
-  def test_use_helper_method
-    mail = HelperMailer.create_use_helper_method(@recipient)
-    assert_match %r{HelperMailer}, mail.encoded
+  def test_use_mailer
+    mail = HelperMailer.use_mailer
+    assert_match "using helpers", mail.body.encoded
   end
 
-  def test_use_mail_helper
-    mail = HelperMailer.create_use_mail_helper(@recipient)
-    assert_match %r{  But soft!}, mail.encoded
-    assert_match %r{east, and\r\n  Juliet}, mail.encoded
+  def test_use_message
+    mail = HelperMailer.use_message
+    assert_match "using helpers", mail.body.encoded
   end
 end
 
diff --git a/actionmailer/test/mail_test.rb b/actionmailer/test/mail_test.rb
deleted file mode 100644
index ea6f25d157..0000000000
--- a/actionmailer/test/mail_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'abstract_unit'
-
-class MailTest < Test::Unit::TestCase
-  def test_body
-    m = Mail.new
-    expected = 'something_with_underscores'
-    m.content_transfer_encoding = 'quoted-printable'
-    quoted_body = [expected].pack('*M')
-    m.body = quoted_body
-    assert_equal "something_with_underscores=\r\n", m.body.encoded
-    # CHANGED: body returns object, not string, Changed m.body to m.body.to_s
-    assert_equal expected, m.body.to_s
-  end
-
-  def test_nested_attachments_are_recognized_correctly
-    fixture = File.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_nested_attachment")
-    mail = Mail.new(fixture)
-    assert_equal 2, mail.attachments.length
-    assert_equal "image/png", mail.attachments.first.mime_type
-    assert_equal 1902, mail.attachments.first.decoded.length
-    assert_equal "application/pkcs7-signature", mail.attachments.last.mime_type
-  end
-  
-end
diff --git a/actionmailer/test/adv_attr_test.rb b/actionmailer/test/old_base/adv_attr_test.rb
index f22d733bc5..f22d733bc5 100644
--- a/actionmailer/test/adv_attr_test.rb
+++ b/actionmailer/test/old_base/adv_attr_test.rb
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/old_base/asset_host_test.rb
index f3383e5608..124032f1d9 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/old_base/asset_host_test.rb
@@ -1,8 +1,8 @@
 require 'abstract_unit'
 
 class AssetHostMailer < ActionMailer::Base
-  def email_with_asset(recipient)
-    recipients recipient
+  def email_with_asset
+    recipients 'test@localhost'
     subject    "testing email containing asset path while asset_host is set"
     from       "tester@example.com"
   end
@@ -12,9 +12,7 @@ class AssetHostTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
-
-    @recipient = 'test@localhost'
+    ActionMailer::Base.deliveries.clear
   end
 
   def teardown
@@ -23,7 +21,7 @@ class AssetHostTest < Test::Unit::TestCase
 
   def test_asset_host_as_string
     ActionController::Base.asset_host = "http://www.example.com"
-    mail = AssetHostMailer.deliver_email_with_asset(@recipient)
+    mail = AssetHostMailer.email_with_asset
     assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
@@ -35,7 +33,7 @@ class AssetHostTest < Test::Unit::TestCase
         "http://assets.example.com"
       end
     }
-    mail = AssetHostMailer.deliver_email_with_asset(@recipient)
+    mail = AssetHostMailer.email_with_asset
     assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
@@ -48,7 +46,7 @@ class AssetHostTest < Test::Unit::TestCase
       end
     }
     mail = nil
-    assert_nothing_raised { mail = AssetHostMailer.deliver_email_with_asset(@recipient) }
+    assert_nothing_raised { mail = AssetHostMailer.email_with_asset }
     assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 end
\ No newline at end of file
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/old_base/mail_layout_test.rb
index 0877e7b2cb..5679aa5a64 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/old_base/mail_layout_test.rb
@@ -1,32 +1,33 @@
 require 'abstract_unit'
 
 class AutoLayoutMailer < ActionMailer::Base
-  def hello(recipient)
-    recipients recipient
+
+  def hello
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
   end
 
-  def spam(recipient)
-    recipients recipient
+  def spam
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
 
     @world = "Earth"
-    render(:inline => "Hello, <%= @world %>", :layout => 'spam')
+    body render(:inline => "Hello, <%= @world %>", :layout => 'spam')
   end
 
-  def nolayout(recipient)
-    recipients recipient
+  def nolayout
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
 
     @world = "Earth"
-    render(:inline => "Hello, <%= @world %>", :layout => false)
+    body render(:inline => "Hello, <%= @world %>", :layout => false)
   end
 
-  def multipart(recipient, type = nil)
-    recipients recipient
+  def multipart(type = nil)
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
 
@@ -37,14 +38,14 @@ end
 class ExplicitLayoutMailer < ActionMailer::Base
   layout 'spam', :except => [:logout]
 
-  def signup(recipient)
-    recipients recipient
+  def signup
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
   end
 
-  def logout(recipient)
-    recipients recipient
+  def logout
+    recipients 'test@localhost'
     subject    "You have a mail"
     from       "tester@example.com"
   end
@@ -54,9 +55,7 @@ class LayoutMailerTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
-
-    @recipient = 'test@localhost'
+    ActionMailer::Base.deliveries.clear
   end
 
   def teardown
@@ -64,12 +63,12 @@ class LayoutMailerTest < Test::Unit::TestCase
   end
 
   def test_should_pickup_default_layout
-    mail = AutoLayoutMailer.create_hello(@recipient)
+    mail = AutoLayoutMailer.hello
     assert_equal "Hello from layout Inside", mail.body.to_s.strip
   end
 
   def test_should_pickup_multipart_layout
-    mail = AutoLayoutMailer.create_multipart(@recipient)
+    mail = AutoLayoutMailer.multipart
     # CHANGED: content_type returns an object
     # assert_equal "multipart/alternative", mail.content_type
     assert_equal "multipart/alternative", mail.mime_type
@@ -78,7 +77,7 @@ class LayoutMailerTest < Test::Unit::TestCase
     # CHANGED: content_type returns an object
     # assert_equal 'text/plain', mail.parts.first.content_type
     assert_equal 'text/plain', mail.parts.first.mime_type
-    
+
     # CHANGED: body returns an object
     # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
     assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
@@ -93,7 +92,7 @@ class LayoutMailerTest < Test::Unit::TestCase
   end
 
   def test_should_pickup_multipartmixed_layout
-    mail = AutoLayoutMailer.create_multipart(@recipient, "multipart/mixed")
+    mail = AutoLayoutMailer.multipart("multipart/mixed")
     # CHANGED: content_type returns an object
     # assert_equal "multipart/mixed", mail.content_type
     assert_equal "multipart/mixed", mail.mime_type
@@ -115,7 +114,7 @@ class LayoutMailerTest < Test::Unit::TestCase
   end
 
   def test_should_fix_multipart_layout
-    mail = AutoLayoutMailer.create_multipart(@recipient, "text/plain")
+    mail = AutoLayoutMailer.multipart("text/plain")
     assert_equal "multipart/alternative", mail.mime_type
     assert_equal 2, mail.parts.size
 
@@ -128,22 +127,22 @@ class LayoutMailerTest < Test::Unit::TestCase
 
 
   def test_should_pickup_layout_given_to_render
-    mail = AutoLayoutMailer.create_spam(@recipient)
+    mail = AutoLayoutMailer.spam
     assert_equal "Spammer layout Hello, Earth", mail.body.to_s.strip
   end
 
   def test_should_respect_layout_false
-    mail = AutoLayoutMailer.create_nolayout(@recipient)
+    mail = AutoLayoutMailer.nolayout
     assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_explicit_class_layout
-    mail = ExplicitLayoutMailer.create_signup(@recipient)
+    mail = ExplicitLayoutMailer.signup
     assert_equal "Spammer layout We do not spam", mail.body.to_s.strip
   end
 
   def test_explicit_layout_exceptions
-    mail = ExplicitLayoutMailer.create_logout(@recipient)
+    mail = ExplicitLayoutMailer.logout
     assert_equal "You logged out", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb
index 09ce5e4854..405d43d7d3 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/old_base/mail_render_test.rb
@@ -1,60 +1,43 @@
 require 'abstract_unit'
 
 class RenderMailer < ActionMailer::Base
-  def inline_template(recipient)
-    recipients recipient
+  def inline_template
+    recipients 'test@localhost'
     subject    "using helpers"
     from       "tester@example.com"
 
     @world = "Earth"
-    render :inline => "Hello, <%= @world %>"
+    body       render(:inline => "Hello, <%= @world %>")
   end
 
-  def file_template(recipient)
-    recipients recipient
+  def file_template
+    recipients 'test@localhost'
     subject    "using helpers"
     from       "tester@example.com"
 
-    @recipient = recipient
-    render :file => "templates/signed_up"
-  end
-
-  def implicit_body(recipient)
-    recipients recipient
-    subject    "using helpers"
-    from       "tester@example.com"
-
-    @recipient = recipient
-    render :template => "templates/signed_up"
+    @recipient = 'test@localhost'
+    body       render(:file => "templates/signed_up")
   end
 
-  def rxml_template(recipient)
-    recipients recipient
+  def rxml_template
+    recipients 'test@localhost'
     subject    "rendering rxml template"
     from       "tester@example.com"
   end
 
-  def included_subtemplate(recipient)
-    recipients recipient
+  def included_subtemplate
+    recipients 'test@localhost'
     subject    "Including another template in the one being rendered"
     from       "tester@example.com"
   end
 
-  def mailer_accessor(recipient)
-    recipients recipient
-    subject    "Mailer Accessor"
-    from       "tester@example.com"
-
-    render :inline => "Look, <%= mailer.subject %>!"
-  end
-
-  def no_instance_variable(recipient)
-    recipients recipient
+  def no_instance_variable
+    recipients 'test@localhost'
     subject    "No Instance Variable"
     from       "tester@example.com"
 
     silence_warnings do
-      render :inline => "Look, subject.nil? is <%= @subject.nil? %>!"
+      body render(:inline => "Look, subject.nil? is <%= @subject.nil? %>!")
     end
   end
 
@@ -62,19 +45,46 @@ class RenderMailer < ActionMailer::Base
     super
     mailer_name "test_mailer"
   end
+
+  def multipart_alternative
+    recipients 'test@localhost'
+    subject    'multipart/alternative'
+    from       'tester@example.com'
+
+    build_multipart_message(:foo => "bar")
+  end
+
+  private
+    def build_multipart_message(assigns = {})
+      content_type "multipart/alternative"
+
+      part "text/plain" do |p|
+        p.body = build_body_part('plain', assigns, :layout => false)
+      end
+
+      part "text/html" do |p|
+        p.body = build_body_part('html', assigns)
+      end
+    end
+
+    def build_body_part(content_type, assigns, options = {})
+      ActiveSupport::Deprecation.silence do
+        render "#{template}.#{content_type}", :body => assigns
+      end
+    end
 end
 
 class FirstMailer < ActionMailer::Base
-  def share(recipient)
-    recipients recipient
+  def share
+    recipients 'test@localhost'
     subject    "using helpers"
     from       "tester@example.com"
   end
 end
 
 class SecondMailer < ActionMailer::Base
-  def share(recipient)
-    recipients recipient
+  def share
+    recipients 'test@localhost'
     subject    "using helpers"
     from       "tester@example.com"
   end
@@ -86,7 +96,7 @@ class RenderHelperTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
 
     @recipient = 'test@localhost'
   end
@@ -95,47 +105,47 @@ class RenderHelperTest < Test::Unit::TestCase
     restore_delivery_method
   end
 
-  def test_implicit_body
-    mail = RenderMailer.create_implicit_body(@recipient)
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
-  end
-
   def test_inline_template
-    mail = RenderMailer.create_inline_template(@recipient)
+    mail = RenderMailer.inline_template
     assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_file_template
-    mail = RenderMailer.create_file_template(@recipient)
+    mail = RenderMailer.file_template
     assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
   end
 
   def test_rxml_template
-    mail = RenderMailer.deliver_rxml_template(@recipient)
+    mail = RenderMailer.rxml_template.deliver
     assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.to_s.strip
   end
 
   def test_included_subtemplate
-    mail = RenderMailer.deliver_included_subtemplate(@recipient)
+    mail = RenderMailer.included_subtemplate.deliver
     assert_equal "Hey Ho, let's go!", mail.body.to_s.strip
   end
 
-  def test_mailer_accessor
-    mail = RenderMailer.deliver_mailer_accessor(@recipient)
-    assert_equal "Look, Mailer Accessor!", mail.body.to_s.strip
-  end
-
   def test_no_instance_variable
-    mail = RenderMailer.deliver_no_instance_variable(@recipient)
+    mail = RenderMailer.no_instance_variable.deliver
     assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
   end
+
+  def test_legacy_multipart_alternative
+    mail = RenderMailer.multipart_alternative.deliver
+    assert_equal(2, mail.parts.size)
+    assert_equal("multipart/alternative", mail.mime_type)
+    assert_equal("text/plain", mail.parts[0].mime_type)
+    assert_equal("foo: bar", mail.parts[0].body.encoded)
+    assert_equal("text/html", mail.parts[1].mime_type)
+    assert_equal("<strong>foo</strong> bar", mail.parts[1].body.encoded)
+  end
 end
 
 class FirstSecondHelperTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
 
     @recipient = 'test@localhost'
   end
@@ -145,13 +155,13 @@ class FirstSecondHelperTest < Test::Unit::TestCase
   end
 
   def test_ordering
-    mail = FirstMailer.create_share(@recipient)
+    mail = FirstMailer.share
     assert_equal "first mail", mail.body.to_s.strip
-    mail = SecondMailer.create_share(@recipient)
+    mail = SecondMailer.share
     assert_equal "second mail", mail.body.to_s.strip
-    mail = FirstMailer.create_share(@recipient)
+    mail = FirstMailer.share
     assert_equal "first mail", mail.body.to_s.strip
-    mail = SecondMailer.create_share(@recipient)
+    mail = SecondMailer.share
     assert_equal "second mail", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index f87d9b2e5b..70dafaf33c 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -2,7 +2,7 @@
 require 'abstract_unit'
 
 class FunkyPathMailer < ActionMailer::Base
-  self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
+  self.view_paths = "#{File.dirname(__FILE__)}/../fixtures/path.with.dots"
 
   def multipart_with_template_path_with_dots(recipient)
     recipients recipient
@@ -27,20 +27,19 @@ class TestMailer < ActionMailer::Base
     subject    "[Cancelled] Goodbye #{recipient}"
     from       "system@loudthinking.com"
     sent_on    Time.local(2004, 12, 12)
-
-    render :text => "Goodbye, Mr. #{recipient}"
+    body       "Goodbye, Mr. #{recipient}"
   end
 
   def from_with_name
     from       "System <system@loudthinking.com>"
     recipients "root@loudthinking.com"
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def from_without_name
     from       "system@loudthinking.com"
     recipients "root@loudthinking.com"
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def cc_bcc(recipient)
@@ -51,7 +50,7 @@ class TestMailer < ActionMailer::Base
     cc         "nobody@loudthinking.com"
     bcc        "root@loudthinking.com"
 
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def different_reply_to(recipient)
@@ -61,7 +60,7 @@ class TestMailer < ActionMailer::Base
     sent_on    Time.local(2008, 5, 23)
     reply_to   "atraver@gmail.com"
 
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def iso_charset(recipient)
@@ -73,7 +72,7 @@ class TestMailer < ActionMailer::Base
     bcc        "root@loudthinking.com"
     charset    "iso-8859-1"
 
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def unencoded_subject(recipient)
@@ -84,7 +83,7 @@ class TestMailer < ActionMailer::Base
     cc         "nobody@loudthinking.com"
     bcc        "root@loudthinking.com"
 
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def extended_headers(recipient)
@@ -96,7 +95,7 @@ class TestMailer < ActionMailer::Base
     bcc        "Grytøyr <stian3@example.net>"
     charset    "iso-8859-1"
 
-    render :text => "Nothing to see here."
+    body       "Nothing to see here."
   end
 
   def utf8_body(recipient)
@@ -108,7 +107,7 @@ class TestMailer < ActionMailer::Base
     bcc        "Foo áëô îü <extended@example.net>"
     charset    "utf-8"
     
-    render :text => "åœö blah"
+    body       "åœö blah"
   end
 
   def multipart_with_mime_version(recipient)
@@ -120,11 +119,11 @@ class TestMailer < ActionMailer::Base
     content_type "multipart/alternative"
 
     part "text/plain" do |p|
-      p.body = render_message(:text => "blah")
+      p.body = render(:text => "blah")
     end
 
     part "text/html" do |p|
-      p.body = render_message(:inline => "<%= content_tag(:b, 'blah') %>")
+      p.body = render(:inline => "<%= content_tag(:b, 'blah') %>")
     end
   end
 
@@ -158,7 +157,7 @@ class TestMailer < ActionMailer::Base
     attachment :content_type => "image/jpeg", :filename => File.join(File.dirname(__FILE__), "fixtures", "attachments", "foo.jpg"),
       :data => "123456789"
 
-    render :text => "plain text default"
+    body       "plain text default"
   end
 
   def implicitly_multipart_example(recipient, cs = nil, order = nil)
@@ -187,12 +186,12 @@ class TestMailer < ActionMailer::Base
     from         "test@example.com"
     content_type "text/html"
 
-    render :text => "<em>Emphasize</em> <strong>this</strong>"
+    body       "<em>Emphasize</em> <strong>this</strong>"
   end
 
   def html_mail_with_underscores(recipient)
     subject      "html mail with underscores"
-    render :text => %{<a href="http://google.com" target="_blank">_Google</a>}
+    body       %{<a href="http://google.com" target="_blank">_Google</a>}
   end
 
   def custom_template(recipient)
@@ -219,7 +218,7 @@ class TestMailer < ActionMailer::Base
     subject      "various newlines"
     from         "test@example.com"
 
-    render :text => "line #1\nline #2\rline #3\r\nline #4\r\r" +
+    body       "line #1\nline #2\rline #3\r\nline #4\r\r" +
                     "line #5\n\nline#6\r\n\r\nline #7"
   end
 
@@ -282,7 +281,7 @@ class TestMailer < ActionMailer::Base
     from         "One: Two <test@example.com>"
     cc           "Three: Four <test@example.com>"
     bcc          "Five: Six <test@example.com>"
-    render :text => "testing"
+    body       "testing"
   end
 
   def custom_content_type_attributes
@@ -290,28 +289,21 @@ class TestMailer < ActionMailer::Base
     subject      "custom content types"
     from         "some.one@somewhere.test"
     content_type "text/plain; format=flowed"
-    render :text => "testing"
+    body       "testing"
   end
 
   def return_path
     recipients   "no.one@nowhere.test"
     subject      "return path test"
     from         "some.one@somewhere.test"
-    headers      "return-path" => "another@somewhere.test"
-    render :text => "testing"
-  end
-
-  def body_ivar(recipient)
-    recipients   recipient
-    subject      "Body as a local variable"
-    from         "test@example.com"
-    body         :body => "foo", :bar => "baz"
+    headers["return-path"] = "another@somewhere.test"
+    body       "testing"
   end
 
   def subject_with_i18n(recipient)
     recipients recipient
     from       "system@loudthinking.com"
-    render :text => "testing"
+    body       "testing"
   end
 
   class << self
@@ -344,7 +336,7 @@ class ActionMailerTest < Test::Unit::TestCase
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.raise_delivery_errors = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
 
     @original_logger = TestMailer.logger
     @recipient = 'test@localhost'
@@ -357,7 +349,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
   def test_nested_parts
     created = nil
-    assert_nothing_raised { created = TestMailer.create_nested_multipart(@recipient)}
+    assert_nothing_raised { created = TestMailer.nested_multipart(@recipient)}
     assert_equal 2, created.parts.size
     assert_equal 2, created.parts.first.parts.size
 
@@ -373,8 +365,8 @@ class ActionMailerTest < Test::Unit::TestCase
 
   def test_nested_parts_with_body
     created = nil
-    TestMailer.create_nested_multipart_with_body(@recipient)
-    assert_nothing_raised { created = TestMailer.create_nested_multipart_with_body(@recipient)}
+    TestMailer.nested_multipart_with_body(@recipient)
+    assert_nothing_raised { created = TestMailer.nested_multipart_with_body(@recipient)}
 
     assert_equal 1,created.parts.size
     assert_equal 2,created.parts.first.parts.size
@@ -389,11 +381,13 @@ class ActionMailerTest < Test::Unit::TestCase
 
   def test_attachment_with_custom_header
     created = nil
-    assert_nothing_raised { created = TestMailer.create_attachment_with_custom_header(@recipient) }
+    assert_nothing_raised { created = TestMailer.attachment_with_custom_header(@recipient) }
     assert created.parts.any? { |p| p.header['content-id'].to_s == "<test@test.com>" }
   end
 
   def test_signed_up
+    TestMailer.delivery_method = :test
+
     Time.stubs(:now => Time.now)
 
     expected = new_mail
@@ -404,7 +398,7 @@ class ActionMailerTest < Test::Unit::TestCase
     expected.date    = Time.now
 
     created = nil
-    assert_nothing_raised { created = TestMailer.create_signed_up(@recipient) }
+    assert_nothing_raised { created = TestMailer.signed_up(@recipient) }
     assert_not_nil created
     
     expected.message_id = '<123@456>'
@@ -412,7 +406,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     assert_equal expected.encoded, created.encoded
 
-    assert_nothing_raised { TestMailer.deliver_signed_up(@recipient) }
+    assert_nothing_raised { TestMailer.signed_up(@recipient).deliver }
 
     delivered = ActionMailer::Base.deliveries.first
     assert_not_nil delivered
@@ -423,15 +417,6 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, delivered.encoded
   end
 
-  def test_subject_with_i18n
-    assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
-    assert_equal "Subject with i18n", ActionMailer::Base.deliveries.first.subject.to_s
-
-    I18n.backend.store_translations('en', :actionmailer => {:test_mailer => {:subject_with_i18n => {:subject => "New Subject!"}}})
-    assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) }
-    assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject.to_s
-  end
-
   def test_custom_template
     expected = new_mail
     expected.to      = @recipient
@@ -441,7 +426,7 @@ class ActionMailerTest < Test::Unit::TestCase
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
-    assert_nothing_raised { created = TestMailer.create_custom_template(@recipient) }
+    assert_nothing_raised { created = TestMailer.custom_template(@recipient) }
     assert_not_nil created
     expected.message_id = '<123@456>'
     created.message_id = '<123@456>'
@@ -464,7 +449,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     # Now that the template is registered, there should be one part. The text/plain part.
     created = nil
-    assert_nothing_raised { created = TestMailer.create_custom_templating_extension(@recipient) }
+    assert_nothing_raised { created = TestMailer.custom_templating_extension(@recipient) }
     assert_not_nil created
     assert_equal 2, created.parts.length
     assert_equal 'text/plain', created.parts[0].mime_type
@@ -480,13 +465,13 @@ class ActionMailerTest < Test::Unit::TestCase
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
-    assert_nothing_raised { created = TestMailer.create_cancelled_account(@recipient) }
+    assert_nothing_raised { created = TestMailer.cancelled_account(@recipient) }
     assert_not_nil created
     expected.message_id = '<123@456>'
     created.message_id = '<123@456>'
     assert_equal expected.encoded, created.encoded
 
-    assert_nothing_raised { TestMailer.deliver_cancelled_account(@recipient) }
+    assert_nothing_raised { TestMailer.cancelled_account(@recipient).deliver }
     assert_not_nil ActionMailer::Base.deliveries.first
     delivered = ActionMailer::Base.deliveries.first
     expected.message_id = '<123@456>'
@@ -507,7 +492,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     created = nil
     assert_nothing_raised do
-      created = TestMailer.create_cc_bcc @recipient
+      created = TestMailer.cc_bcc @recipient
     end
     assert_not_nil created
     expected.message_id = '<123@456>'
@@ -515,7 +500,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
-      TestMailer.deliver_cc_bcc @recipient
+      TestMailer.cc_bcc(@recipient).deliver
     end
 
     assert_not_nil ActionMailer::Base.deliveries.first
@@ -527,8 +512,8 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_from_without_name_for_smtp
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_from_without_name
+    TestMailer.delivery_method = :smtp
+    TestMailer.from_without_name.deliver
 
     mail = MockSMTP.deliveries.first
     assert_not_nil mail
@@ -538,17 +523,19 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_from_with_name_for_smtp
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_from_with_name
+    TestMailer.delivery_method = :smtp
+    TestMailer.from_with_name.deliver
 
     mail = MockSMTP.deliveries.first
     assert_not_nil mail
     mail, from, to = mail
 
-    assert_equal 'system@loudthinking.com', from.addresses.first
+    assert_equal 'system@loudthinking.com', from
   end
 
   def test_reply_to
+    TestMailer.delivery_method = :test
+
     expected = new_mail
 
     expected.to       = @recipient
@@ -560,7 +547,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     created = nil
     assert_nothing_raised do
-      created = TestMailer.create_different_reply_to @recipient
+      created = TestMailer.different_reply_to @recipient
     end
     assert_not_nil created
     
@@ -570,7 +557,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
-      TestMailer.deliver_different_reply_to @recipient
+      TestMailer.different_reply_to(@recipient).deliver
     end
 
     delivered = ActionMailer::Base.deliveries.first
@@ -583,6 +570,8 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_iso_charset
+    TestMailer.delivery_method = :test
+
     expected = new_mail( "iso-8859-1" )
     expected.to      = @recipient
     expected.subject = encode "testing isø charsets", "iso-8859-1"
@@ -594,7 +583,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     created = nil
     assert_nothing_raised do
-      created = TestMailer.create_iso_charset @recipient
+      created = TestMailer.iso_charset @recipient
     end
     assert_not_nil created
     
@@ -604,7 +593,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
-      TestMailer.deliver_iso_charset @recipient
+      TestMailer.iso_charset(@recipient).deliver
     end
 
     delivered = ActionMailer::Base.deliveries.first
@@ -617,6 +606,7 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_unencoded_subject
+    TestMailer.delivery_method = :test
     expected = new_mail
     expected.to      = @recipient
     expected.subject = "testing unencoded subject"
@@ -628,7 +618,7 @@ class ActionMailerTest < Test::Unit::TestCase
 
     created = nil
     assert_nothing_raised do
-      created = TestMailer.create_unencoded_subject @recipient
+      created = TestMailer.unencoded_subject @recipient
     end
     assert_not_nil created
 
@@ -638,7 +628,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
-      TestMailer.deliver_unencoded_subject @recipient
+      TestMailer.unencoded_subject(@recipient).deliver
     end
 
     delivered = ActionMailer::Base.deliveries.first
@@ -650,41 +640,33 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, delivered.encoded
   end
 
-  def test_instances_are_nil
-    assert_nil ActionMailer::Base.new
-    assert_nil TestMailer.new
-  end
-
   def test_deliveries_array
     assert_not_nil ActionMailer::Base.deliveries
     assert_equal 0, ActionMailer::Base.deliveries.size
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.signed_up(@recipient).deliver
     assert_equal 1, ActionMailer::Base.deliveries.size
     assert_not_nil ActionMailer::Base.deliveries.first
   end
 
   def test_perform_deliveries_flag
     ActionMailer::Base.perform_deliveries = false
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.signed_up(@recipient).deliver
     assert_equal 0, ActionMailer::Base.deliveries.size
     ActionMailer::Base.perform_deliveries = true
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.signed_up(@recipient).deliver
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
   def test_doesnt_raise_errors_when_raise_delivery_errors_is_false
     ActionMailer::Base.raise_delivery_errors = false
-    TestMailer.delivery_method.expects(:perform_delivery).raises(Exception)
-    assert_nothing_raised { TestMailer.deliver_signed_up(@recipient) }
+    Mail::TestMailer.any_instance.expects(:deliver!).raises(Exception)
+    assert_nothing_raised { TestMailer.signed_up(@recipient).deliver }
   end
 
   def test_performs_delivery_via_sendmail
-    sm = mock()
-    sm.expects(:print).with(anything)
-    sm.expects(:flush)
-    IO.expects(:popen).once.with('/usr/sbin/sendmail -i -t', 'w+').yields(sm)
-    ActionMailer::Base.delivery_method = :sendmail
-    TestMailer.deliver_signed_up(@recipient)
+    IO.expects(:popen).once.with('/usr/sbin/sendmail -i -t -f "system@loudthinking.com" test@localhost', 'w+')
+    TestMailer.delivery_method = :sendmail
+    TestMailer.signed_up(@recipient).deliver
   end
 
   def test_unquote_quoted_printable_subject
@@ -769,7 +751,7 @@ EOF
 
     created = nil
     assert_nothing_raised do
-      created = TestMailer.create_extended_headers @recipient
+      created = TestMailer.extended_headers @recipient
     end
 
     assert_not_nil created
@@ -779,7 +761,7 @@ EOF
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
-      TestMailer.deliver_extended_headers @recipient
+      TestMailer.extended_headers(@recipient).deliver
     end
 
     delivered = ActionMailer::Base.deliveries.first
@@ -802,7 +784,7 @@ EOF
     expected.bcc     = quote_address_if_necessary @recipient, "utf-8"
     expected.date    = Time.local 2004, 12, 12
 
-    created = TestMailer.create_utf8_body @recipient
+    created = TestMailer.utf8_body @recipient
     assert_match(/åœö blah/, created.encoded)
   end
 
@@ -817,82 +799,82 @@ EOF
     expected.bcc     = quote_address_if_necessary @recipient, "utf-8"
     expected.date    = Time.local 2004, 12, 12
 
-    created = TestMailer.create_utf8_body @recipient
+    created = TestMailer.utf8_body @recipient
     assert_match(/\nFrom: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>\r/, created.encoded)
     assert_match(/\nTo: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>, \r\n\tExample Recipient <me/, created.encoded)
   end
 
   def test_receive_decodes_base64_encoded_mail
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email")
     TestMailer.receive(fixture)
     assert_match(/Jamis/, TestMailer.received_body.to_s)
   end
 
   def test_receive_attachments
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email2")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email2")
     mail = Mail.new(fixture)
     attachment = mail.attachments.last
-    assert_equal "smime.p7s", attachment.original_filename
+    assert_equal "smime.p7s", attachment.filename
     assert_equal "application/pkcs7-signature", mail.parts.last.mime_type
   end
 
   def test_decode_attachment_without_charset
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email3")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email3")
     mail = Mail.new(fixture)
     attachment = mail.attachments.last
     assert_equal 1026, attachment.read.length
   end
 
   def test_attachment_using_content_location
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email12")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email12")
     mail = Mail.new(fixture)
     assert_equal 1, mail.attachments.length
-    assert_equal "Photo25.jpg", mail.attachments.first.original_filename
+    assert_equal "Photo25.jpg", mail.attachments.first.filename
   end
 
   def test_attachment_with_text_type
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email13")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email13")
     mail = Mail.new(fixture)
     assert mail.has_attachments?
     assert_equal 1, mail.attachments.length
-    assert_equal "hello.rb", mail.attachments.first.original_filename
+    assert_equal "hello.rb", mail.attachments.first.filename
   end
 
   def test_decode_part_without_content_type
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email4")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email4")
     mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
   def test_decode_message_without_content_type
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email5")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email5")
     mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
   def test_decode_message_with_incorrect_charset
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email6")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email6")
     mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
   def test_multipart_with_mime_version
-    mail = TestMailer.create_multipart_with_mime_version(@recipient)
+    mail = TestMailer.multipart_with_mime_version(@recipient)
     assert_equal "1.1", mail.mime_version
   end
 
   def test_multipart_with_utf8_subject
-    mail = TestMailer.create_multipart_with_utf8_subject(@recipient)
+    mail = TestMailer.multipart_with_utf8_subject(@recipient)
     assert_match(/\nSubject: =\?utf-8\?Q\?Foo_.*?\?=/, mail.encoded)
   end
 
   def test_implicitly_multipart_with_utf8
-    mail = TestMailer.create_implicitly_multipart_with_utf8
+    mail = TestMailer.implicitly_multipart_with_utf8
     assert_match(/\nSubject: =\?utf-8\?Q\?Foo_.*?\?=/, mail.encoded)
   end
 
   def test_explicitly_multipart_messages
-    mail = TestMailer.create_explicitly_multipart_example(@recipient)
+    mail = TestMailer.explicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
     assert_equal 'multipart/mixed', mail.mime_type
     assert_equal "text/plain", mail.parts[0].mime_type
@@ -901,6 +883,7 @@ EOF
     assert_equal "iso-8859-1", mail.parts[1].charset
 
     assert_equal "image/jpeg", mail.parts[2].mime_type
+    
     assert_equal "attachment", mail.parts[2][:content_disposition].disposition_type
     assert_equal "foo.jpg", mail.parts[2][:content_disposition].filename
     assert_equal "foo.jpg", mail.parts[2][:content_type].filename
@@ -908,13 +891,13 @@ EOF
   end
 
   def test_explicitly_multipart_with_content_type
-    mail = TestMailer.create_explicitly_multipart_example(@recipient, "multipart/alternative")
+    mail = TestMailer.explicitly_multipart_example(@recipient, "multipart/alternative")
     assert_equal 3, mail.parts.length
     assert_equal "multipart/alternative", mail.mime_type
   end
 
   def test_explicitly_multipart_with_invalid_content_type
-    mail = TestMailer.create_explicitly_multipart_example(@recipient, "text/xml")
+    mail = TestMailer.explicitly_multipart_example(@recipient, "text/xml")
     assert_equal 3, mail.parts.length
     assert_equal 'multipart/mixed', mail.mime_type
   end
@@ -922,7 +905,7 @@ EOF
   def test_implicitly_multipart_messages
     assert ActionView::Template.template_handler_extensions.include?("bak"), "bak extension was not registered"
 
-    mail = TestMailer.create_implicitly_multipart_example(@recipient)
+    mail = TestMailer.implicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
     assert_equal "1.0", mail.mime_version.to_s
     assert_equal "multipart/alternative", mail.mime_type
@@ -937,7 +920,7 @@ EOF
   def test_implicitly_multipart_messages_with_custom_order
     assert ActionView::Template.template_handler_extensions.include?("bak"), "bak extension was not registered"
 
-    mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["application/x-yaml", "text/plain"])
+    mail = TestMailer.implicitly_multipart_example(@recipient, nil, ["application/x-yaml", "text/plain"])
     assert_equal 3, mail.parts.length
     assert_equal "application/x-yaml", mail.parts[0].mime_type
     assert_equal "text/plain", mail.parts[1].mime_type
@@ -945,7 +928,7 @@ EOF
   end
 
   def test_implicitly_multipart_messages_with_charset
-    mail = TestMailer.create_implicitly_multipart_example(@recipient, 'iso-8859-1')
+    mail = TestMailer.implicitly_multipart_example(@recipient, 'iso-8859-1')
 
     assert_equal "multipart/alternative", mail.header['content-type'].content_type
 
@@ -955,23 +938,23 @@ EOF
   end
 
   def test_html_mail
-    mail = TestMailer.create_html_mail(@recipient)
+    mail = TestMailer.html_mail(@recipient)
     assert_equal "text/html", mail.mime_type
   end
 
   def test_html_mail_with_underscores
-    mail = TestMailer.create_html_mail_with_underscores(@recipient)
+    mail = TestMailer.html_mail_with_underscores(@recipient)
     assert_equal %{<a href="http://google.com" target="_blank">_Google</a>}, mail.body.to_s
   end
 
   def test_various_newlines
-    mail = TestMailer.create_various_newlines(@recipient)
+    mail = TestMailer.various_newlines(@recipient)
     assert_equal("line #1\nline #2\nline #3\nline #4\n\n" +
                  "line #5\n\nline#6\n\nline #7", mail.body.to_s)
   end
 
   def test_various_newlines_multipart
-    mail = TestMailer.create_various_newlines_multipart(@recipient)
+    mail = TestMailer.various_newlines_multipart(@recipient)
     assert_equal "line #1\nline #2\nline #3\nline #4\n\n", mail.parts[0].body.to_s
     assert_equal "<p>line #1</p>\n<p>line #2</p>\n<p>line #3</p>\n<p>line #4</p>\n\n", mail.parts[1].body.to_s
     assert_equal "line #1\r\nline #2\r\nline #3\r\nline #4\r\n\r\n", mail.parts[0].body.encoded
@@ -979,8 +962,8 @@ EOF
   end
 
   def test_headers_removed_on_smtp_delivery
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_cc_bcc(@recipient)
+    TestMailer.delivery_method = :smtp
+    TestMailer.cc_bcc(@recipient).deliver
     assert MockSMTP.deliveries[0][2].include?("root@loudthinking.com")
     assert MockSMTP.deliveries[0][2].include?("nobody@loudthinking.com")
     assert MockSMTP.deliveries[0][2].include?(@recipient)
@@ -990,10 +973,10 @@ EOF
   end
 
    def test_file_delivery_should_create_a_file
-     ActionMailer::Base.delivery_method = :file
-     tmp_location = ActionMailer::Base.file_settings[:location]
+     TestMailer.delivery_method = :file
+     tmp_location = TestMailer.file_settings[:location]
 
-     TestMailer.deliver_cc_bcc(@recipient)
+     result = TestMailer.cc_bcc(@recipient).deliver
      assert File.exists?(tmp_location)
      assert File.directory?(tmp_location)
      assert File.exists?(File.join(tmp_location, @recipient))
@@ -1002,7 +985,7 @@ EOF
    end
 
   def test_recursive_multipart_processing
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email7")
     mail = Mail.new(fixture)
     assert_equal(2, mail.parts.length)
     assert_equal(4, mail.parts.first.parts.length)
@@ -1013,36 +996,36 @@ EOF
   end
 
   def test_decode_encoded_attachment_filename
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email8")
     mail = Mail.new(fixture)
     attachment = mail.attachments.last
 
     expected = "01 Quien Te Dij\212at. Pitbull.mp3"
     
     if expected.respond_to?(:force_encoding)
-      result = attachment.original_filename.dup
+      result = attachment.filename.dup
       expected.force_encoding(Encoding::ASCII_8BIT)
       result.force_encoding(Encoding::ASCII_8BIT)
       assert_equal expected, result
     else
-      assert_equal expected, attachment.original_filename
+      assert_equal expected, attachment.filename
     end
   end
 
   def test_decode_message_with_unknown_charset
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email10")
+    fixture = File.read(File.dirname(__FILE__) + "/../fixtures/raw_email10")
     mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
   def test_empty_header_values_omitted
-    result = TestMailer.create_unnamed_attachment(@recipient).encoded
+    result = TestMailer.unnamed_attachment(@recipient).encoded
     assert_match %r{Content-Type: application/octet-stream;}, result
-    assert_match %r{Content-Disposition: attachment[^;]}, result
+    assert_match %r{Content-Disposition: attachment;}, result
   end
 
   def test_headers_with_nonalpha_chars
-    mail = TestMailer.create_headers_with_nonalpha_chars(@recipient)
+    mail = TestMailer.headers_with_nonalpha_chars(@recipient)
     assert !mail.from_addrs.empty?
     assert !mail.cc_addrs.empty?
     assert !mail.bcc_addrs.empty?
@@ -1051,98 +1034,90 @@ EOF
     assert_match(/:/, mail[:bcc].decoded)
   end
 
-  def test_deliver_with_mail_object
-    mail = TestMailer.create_headers_with_nonalpha_chars(@recipient)
-    assert_nothing_raised { TestMailer.deliver(mail) }
+  def test_with_mail_object_deliver
+    TestMailer.delivery_method = :test
+    mail = TestMailer.headers_with_nonalpha_chars(@recipient)
+    assert_nothing_raised { mail.deliver }
     assert_equal 1, TestMailer.deliveries.length
   end
 
   def test_multipart_with_template_path_with_dots
-    mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
+    mail = FunkyPathMailer.multipart_with_template_path_with_dots(@recipient)
     assert_equal 2, mail.parts.length
     assert "text/plain", mail.parts[1].mime_type
     assert "utf-8", mail.parts[1].charset
   end
 
   def test_custom_content_type_attributes
-    mail = TestMailer.create_custom_content_type_attributes
+    mail = TestMailer.custom_content_type_attributes
     assert_match %r{format=flowed}, mail.content_type
     assert_match %r{charset=utf-8}, mail.content_type
   end
 
   def test_return_path_with_create
-    mail = TestMailer.create_return_path
-    assert_equal "another@somewhere.test", mail['return-path'].to_s
-  end
-
-  def test_return_path_with_create
-    mail = TestMailer.create_return_path
-    assert_equal ["another@somewhere.test"], mail.return_path
+    mail = TestMailer.return_path
+    assert_equal "another@somewhere.test", mail.return_path
   end
 
   def test_return_path_with_deliver
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_return_path
+    TestMailer.delivery_method = :smtp
+    TestMailer.return_path.deliver
     assert_match %r{^Return-Path: <another@somewhere.test>}, MockSMTP.deliveries[0][0]
     assert_equal "another@somewhere.test", MockSMTP.deliveries[0][1].to_s
   end
 
-  def test_body_is_stored_as_an_ivar
-    mail = TestMailer.create_body_ivar(@recipient)
-    assert_equal "body: foo\nbar: baz", mail.body.to_s
-  end
-
   def test_starttls_is_enabled_if_supported
-    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
+    TestMailer.smtp_settings.merge!(:enable_starttls_auto => true)
     MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(true)
     MockSMTP.any_instance.expects(:enable_starttls_auto)
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.delivery_method = :smtp
+    TestMailer.signed_up(@recipient).deliver
   end
 
   def test_starttls_is_disabled_if_not_supported
-    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
+    TestMailer.smtp_settings.merge!(:enable_starttls_auto => true)
     MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(false)
     MockSMTP.any_instance.expects(:enable_starttls_auto).never
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.delivery_method = :smtp
+    TestMailer.signed_up(@recipient).deliver
   end
 
   def test_starttls_is_not_enabled
-    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = false
+    TestMailer.smtp_settings.merge!(:enable_starttls_auto => false)
     MockSMTP.any_instance.expects(:respond_to?).never
-    MockSMTP.any_instance.expects(:enable_starttls_auto).never
-    ActionMailer::Base.delivery_method = :smtp
-    TestMailer.deliver_signed_up(@recipient)
+    TestMailer.delivery_method = :smtp
+    TestMailer.signed_up(@recipient).deliver
   ensure
-    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
+    TestMailer.smtp_settings.merge!(:enable_starttls_auto => true)
   end
 end
 
-class InheritableTemplateRootTest < Test::Unit::TestCase
+class InheritableTemplateRootTest < ActiveSupport::TestCase
   def test_attr
-    expected = File.expand_path("#{File.dirname(__FILE__)}/fixtures/path.with.dots")
+    expected = File.expand_path("#{File.dirname(__FILE__)}/../fixtures/path.with.dots")
     assert_equal expected, FunkyPathMailer.template_root.to_s
 
     sub = Class.new(FunkyPathMailer)
-    sub.template_root = 'test/path'
+    assert_deprecated do
+      sub.template_root = 'test/path'
+    end
 
     assert_equal File.expand_path('test/path'), sub.template_root.to_s
     assert_equal expected, FunkyPathMailer.template_root.to_s
   end
 end
 
-class MethodNamingTest < Test::Unit::TestCase
+class MethodNamingTest < ActiveSupport::TestCase
   class TestMailer < ActionMailer::Base
     def send
-      render :text => 'foo'
+      body       'foo'
     end
   end
 
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
   end
 
   def teardown
@@ -1152,12 +1127,13 @@ class MethodNamingTest < Test::Unit::TestCase
   def test_send_method
     assert_nothing_raised do
       assert_emails 1 do
-        TestMailer.deliver_send
+        assert_deprecated do
+          TestMailer.deliver_send
+        end
       end
     end
   end
 end
-
 class RespondToTest < Test::Unit::TestCase
   class RespondToMailer < ActionMailer::Base; end
 
@@ -1220,4 +1196,4 @@ class RespondToTest < Test::Unit::TestCase
 
     assert_match(/undefined method.*not_a_method/, error.message)
   end
-end
+end
\ No newline at end of file
diff --git a/actionmailer/test/tmail_compat_test.rb b/actionmailer/test/old_base/tmail_compat_test.rb
index a1ca6a7243..7c1d9a07c1 100644
--- a/actionmailer/test/tmail_compat_test.rb
+++ b/actionmailer/test/old_base/tmail_compat_test.rb
@@ -1,21 +1,23 @@
 require 'abstract_unit'
 
-class TmailCompatTest < Test::Unit::TestCase
+class TmailCompatTest < ActiveSupport::TestCase
 
   def test_set_content_type_raises_deprecation_warning
     mail = Mail.new
-    STDERR.expects(:puts) # Deprecation warning
-    assert_nothing_raised do
-      mail.set_content_type "text/plain"
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.set_content_type "text/plain"
+      end
     end
     assert_equal mail.mime_type, "text/plain"
   end
 
   def test_transfer_encoding_raises_deprecation_warning
     mail = Mail.new
-    STDERR.expects(:puts) # Deprecation warning
-    assert_nothing_raised do
-      mail.transfer_encoding "base64"
+    assert_deprecated do
+      assert_nothing_raised do
+        mail.transfer_encoding "base64"
+      end
     end
     assert_equal mail.content_transfer_encoding, "base64"
   end
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/old_base/url_test.rb
index 12bf609dce..5affb47997 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -44,7 +44,7 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
     ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
+    ActionMailer::Base.deliveries.clear
 
     @recipient = 'test@localhost'
   end
@@ -54,6 +54,8 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def test_signed_up_with_url
+    TestMailer.delivery_method = :test
+    
     ActionController::Routing::Routes.draw do |map|
       map.connect ':controller/:action/:id'
       map.welcome 'welcome', :controller=>"foo", :action=>"bar"
@@ -67,14 +69,14 @@ class ActionMailerUrlTest < Test::Unit::TestCase
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
-    assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
+    assert_nothing_raised { created = TestMailer.signed_up_with_url(@recipient) }
     assert_not_nil created
 
     expected.message_id = '<123@456>'
     created.message_id = '<123@456>'
     assert_equal expected.encoded, created.encoded
 
-    assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
+    assert_nothing_raised { TestMailer.signed_up_with_url(@recipient).deliver }
     assert_not_nil ActionMailer::Base.deliveries.first
     delivered = ActionMailer::Base.deliveries.first
     
diff --git a/actionmailer/test/subscriber_test.rb b/actionmailer/test/subscriber_test.rb
index aed5d2ca7e..3d1736d64f 100644
--- a/actionmailer/test/subscriber_test.rb
+++ b/actionmailer/test/subscriber_test.rb
@@ -11,7 +11,7 @@ class AMSubscriberTest < ActionMailer::TestCase
       recipients "somewhere@example.com"
       subject    "basic"
       from       "basic@example.com"
-      render :text => "Hello world"
+      body       "Hello world"
     end
 
     def receive(mail)
@@ -24,21 +24,21 @@ class AMSubscriberTest < ActionMailer::TestCase
   end
 
   def test_deliver_is_notified
-    TestMailer.deliver_basic
+    TestMailer.basic.deliver
     wait
-    assert_equal 1, @logger.logged(:info).size
-    assert_match /Sent mail to somewhere@example.com/, @logger.logged(:info).first
-    assert_equal 1, @logger.logged(:debug).size
-    assert_match /Hello world/, @logger.logged(:debug).first
+    assert_equal(1, @logger.logged(:info).size)
+    assert_match(/Sent mail to somewhere@example.com/, @logger.logged(:info).first)
+    assert_equal(1, @logger.logged(:debug).size)
+    assert_match(/Hello world/, @logger.logged(:debug).first)
   end
 
   def test_receive_is_notified
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email")
     TestMailer.receive(fixture)
     wait
-    assert_equal 1, @logger.logged(:info).size
-    assert_match /Received mail/, @logger.logged(:info).first
-    assert_equal 1, @logger.logged(:debug).size
-    assert_match /Jamis/, @logger.logged(:debug).first
+    assert_equal(1, @logger.logged(:info).size)
+    assert_match(/Received mail/, @logger.logged(:info).first)
+    assert_equal(1, @logger.logged(:debug).size)
+    assert_match(/Jamis/, @logger.logged(:debug).first)
   end
 end
\ No newline at end of file
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 1fed26f78f..3a38a91c28 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -12,7 +12,7 @@ end
 
 class TestHelperMailerTest < ActionMailer::TestCase
   def test_setup_sets_right_action_mailer_options
-    assert_instance_of ActionMailer::DeliveryMethod::Test, ActionMailer::Base.delivery_method
+    assert_equal :test, ActionMailer::Base.delivery_method
     assert ActionMailer::Base.perform_deliveries
     assert_equal [], ActionMailer::Base.deliveries
   end
@@ -44,7 +44,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_emails
     assert_nothing_raised do
       assert_emails 1 do
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
       end
     end
   end
@@ -52,27 +52,27 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_repeated_assert_emails_calls
     assert_nothing_raised do
       assert_emails 1 do
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
       end
     end
     
     assert_nothing_raised do
       assert_emails 2 do
-        TestHelperMailer.deliver_test
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver
       end
     end
   end
   
   def test_assert_emails_with_no_block
     assert_nothing_raised do
-      TestHelperMailer.deliver_test
+      TestHelperMailer.test.deliver
       assert_emails 1
     end
     
     assert_nothing_raised do
-      TestHelperMailer.deliver_test
-      TestHelperMailer.deliver_test
+      TestHelperMailer.test.deliver
+      TestHelperMailer.test.deliver
       assert_emails 3
     end
   end
@@ -80,7 +80,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_no_emails
     assert_nothing_raised do
       assert_no_emails do
-        TestHelperMailer.create_test
+        TestHelperMailer.test
       end
     end
   end
@@ -88,7 +88,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_emails_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 2 do
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
       end
     end
     
@@ -98,8 +98,8 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_emails_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 1 do
-        TestHelperMailer.deliver_test
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver
       end
     end
     
@@ -109,7 +109,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_no_emails_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_emails do
-        TestHelperMailer.deliver_test
+        TestHelperMailer.test.deliver
       end
     end