Merge remote branch 'mainstream/master'

62 files changed, 2157 insertions, 9905 deletions

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 773e603d73..785bf98c55 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,3 +1,27 @@
+*Rails 3.0 (pending)*
+
+* 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'}
+
+* ActionMailer::Base :default_implicit_parts_order now is in the sequence of the order you want, no reversing of ordering takes place.  The default order now is text/plain, then text/enriched, then text/html and then any other part that is not one of these three.
+
+* Mail does not have "quoted_body", "quoted_subject" etc.  All of these are accessed via body.encoded, subject.encoded etc
+
+* Every object in a Mail object returns an object, never a string.  So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
+* Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
+
+* Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
+
+* Mail now has a proper concept of parts, remove the ActionMailer::Part and ActionMailer::PartContainer classes
+
+* Calling #encoded on any object returns it as a string ready to go into the output stream of an email, this means it includes the \r\n at the end of the lines and the object is pre-wrapped with \r\n\t if it is a header field.  Also, the "encoded" value includes the field name if it is a header field.
+
+* Attachments are only the actual attachment, with filename etc.  A part contains an attachment.  The part has the content_type etc.  So attachments.last.content_type is invalid.  But parts.last.content_type
+
+* There is no idea of a "sub_head" in Mail.  A part is just a Message with some extra functionality, so it just has a "header" like a normal mail message
+
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 1a7ece5068..6c19371514 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -23,7 +23,6 @@ task :default => [ :test ]
 Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
-  t.verbose = true
   t.warning = true
 }
 
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index efe50c4f84..8adea46d35 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.rubyonrails.org"
 
   s.add_dependency('actionpack', '= 3.0.pre')
+  s.add_dependency('mail', '~> 1.5.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 23f04a11ba..55ddbb24f4 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -21,36 +21,27 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
-$:.unshift(actionpack_path) if File.directory?(actionpack_path)
+actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
+$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
+
 require 'action_controller'
 require 'action_view'
 
 module ActionMailer
-  def self.load_all!
-    [Base, Part, ::Text::Format, ::Net::SMTP]
-  end
+  extend ::ActiveSupport::Autoload
 
-  autoload :AdvAttrAccessor, 'action_mailer/adv_attr_accessor'
-  autoload :DeprecatedBody, 'action_mailer/deprecated_body'
-  autoload :Base, 'action_mailer/base'
-  autoload :DeliveryMethod, 'action_mailer/delivery_method'
-  autoload :Part, 'action_mailer/part'
-  autoload :PartContainer, 'action_mailer/part_container'
-  autoload :Quoting, 'action_mailer/quoting'
-  autoload :TestCase, 'action_mailer/test_case'
-  autoload :TestHelper, 'action_mailer/test_helper'
-  autoload :Utils, 'action_mailer/utils'
+  autoload :AdvAttrAccessor
+  autoload :Base
+  autoload :DeliveryMethod
+  autoload :DeprecatedBody
+  autoload :MailHelper
+  autoload :Quoting
+  autoload :TestCase
+  autoload :TestHelper
 end
 
 module Text
-  autoload :Format, 'action_mailer/vendor/text_format'
-end
+  extend ActiveSupport::Autoload
 
-module Net
-  autoload :SMTP, 'net/smtp'
+  autoload :Format, 'action_mailer/vendor/text_format'
 end
-
-autoload :MailHelper, 'action_mailer/mail_helper'
-
-require 'action_mailer/vendor/tmail'
diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb
index e77029afdd..be6b1feca9 100644
--- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb
+++ b/actionmailer/lib/action_mailer/adv_attr_accessor.rb
@@ -1,29 +1,25 @@
 module ActionMailer
   module AdvAttrAccessor #:nodoc:
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods #:nodoc:
-      def adv_attr_accessor(*names)
-        names.each do |name|
-          ivar = "@#{name}"
+    def adv_attr_accessor(*names)
+      names.each do |name|
+        ivar = "@#{name}"
 
-          define_method("#{name}=") do |value|
-            instance_variable_set(ivar, value)
+        class_eval <<-ACCESSORS, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            #{ivar} = value
           end
 
-          define_method(name) do |*parameters|
-            raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
-            if parameters.empty?
-              if instance_variable_names.include?(ivar)
-                instance_variable_get(ivar)
-              end
+          def #{name}(*args)
+            raise ArgumentError, "expected 0 or 1 parameters" unless args.length <= 1
+            if args.empty?
+              #{ivar} if instance_variable_names.include?(#{ivar.inspect})
             else
-              instance_variable_set(ivar, parameters.first)
+              #{ivar} = args.first
             end
           end
-        end
+        ACCESSORS
+
+        self.protected_instance_variables << ivar if self.respond_to?(:protected_instance_variables)
       end
     end
   end
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index dfa1b6444b..25b8e4874e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,9 +1,10 @@
 require 'active_support/core_ext/class'
+require 'mail'
+require 'action_mailer/tmail_compat'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
-  #
   # = Mailer Models
   #
   # To use Action Mailer, you need to create a mailer model.
@@ -22,7 +23,8 @@ module ActionMailer #:nodoc:
   #      bcc        ["bcc@example.com", "Order Watcher <watcher@example.com>"]
   #      from       "system@example.com"
   #      subject    "New account information"
-  #      body       :account => recipient
+  #
+  #      @account = recipient
   #    end
   #  end
   #
@@ -42,13 +44,6 @@ module ActionMailer #:nodoc:
   # address. Setting this is useful when you want delivery notifications sent to a different address than
   # the one in <tt>from</tt>.
   #
-  # The <tt>body</tt> method has special behavior. It takes a hash which generates an instance variable
-  # named after each key in the hash containing the value that that key points to.
-  #
-  # So, for example, <tt>body :account => recipient</tt> would result
-  # in an instance variable <tt>@account</tt> with the value of <tt>recipient</tt> being accessible in the
-  # view.
-  #
   #
   # = Mailer views
   #
@@ -68,7 +63,12 @@ module ActionMailer #:nodoc:
   # You can even use Action Pack helpers in these views. For example:
   #
   #   You got a new note!
-  #   <%= truncate(note.body, 25) %>
+  #   <%= 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:
+  #
+  #   You got a new note from <%= mailer.from %>!
+  #   <%= truncate(@note.body, 25) %>
   #
   #
   # = Generating URLs
@@ -150,7 +150,7 @@ module ActionMailer #:nodoc:
   #
   #       part "text/plain" do |p|
   #         p.body = render_message("signup-as-plain", :account => recipient)
-  #         p.transfer_encoding = "base64"
+  #         p.content_transfer_encoding = "base64"
   #       end
   #     end
   #   end
@@ -250,29 +250,23 @@ module ActionMailer #:nodoc:
   #   <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+.
-  class Base
-    include AdvAttrAccessor, PartContainer, Quoting, Utils
+  class Base < AbstractController::Base
+    include Quoting
+    extend  AdvAttrAccessor
 
-    include AbstractController::RenderingController
+    include AbstractController::Logger
+    include AbstractController::Rendering
     include AbstractController::LocalizedCache
     include AbstractController::Layouts
-
     include AbstractController::Helpers
-    helper MailHelper
 
-    if Object.const_defined?(:ActionController)
-      include ActionController::UrlWriter
-    end
+    helper  ActionMailer::MailHelper
 
+    include ActionController::UrlWriter
     include ActionMailer::DeprecatedBody
 
     private_class_method :new #:nodoc:
 
-    class_inheritable_accessor :view_paths
-    self.view_paths = []
-
-    cattr_accessor :logger
-
     @@raise_delivery_errors = true
     cattr_accessor :raise_delivery_errors
 
@@ -291,10 +285,16 @@ module ActionMailer #:nodoc:
     @@default_mime_version = "1.0"
     cattr_accessor :default_mime_version
 
-    @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ]
+    # 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 = []
+    @@protected_instance_variables = %w(@parts @mail)
     cattr_reader :protected_instance_variables
 
     # Specify the BCC addresses for the message
@@ -344,24 +344,13 @@ module ActionMailer #:nodoc:
     # have multiple mailer methods share the same template.
     adv_attr_accessor :template
 
-    # The mail and action_name instances referenced by this mailer.
-    attr_reader :mail, :action_name
-
-    # Where the response body is stored.
-    attr_internal :response_body
-
     # 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.
-    attr_writer :mailer_name
+    adv_attr_accessor :mailer_name
 
-    def mailer_name(value = nil)
-      if value
-        @mailer_name = value
-      else
-        @mailer_name || self.class.mailer_name
-      end
-    end
+    # Expose the internal mail
+    attr_reader :mail
 
     # Alias controller_path to mailer_name so render :partial in views work.
     alias :controller_path :mailer_name
@@ -376,6 +365,7 @@ module ActionMailer #:nodoc:
       def mailer_name
         @mailer_name ||= name.underscore
       end
+      alias :controller_path :mailer_name
 
       def delivery_method=(method_name)
         @delivery_method = ActionMailer::DeliveryMethod.lookup_method(method_name)
@@ -411,8 +401,7 @@ module ActionMailer #:nodoc:
       #   end
       def receive(raw_email)
         logger.info "Received mail:\n #{raw_email}" unless logger.nil?
-        mail = TMail::Mail.parse(raw_email)
-        mail.base64_decode
+        mail = Mail.new(raw_email)
         new.receive(mail)
       end
 
@@ -447,21 +436,47 @@ module ActionMailer #:nodoc:
     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
+
     # 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
     # remain uninitialized (useful when you only need to invoke the "receive"
     # method, for instance).
-    def initialize(method_name=nil, *parameters) #:nodoc:
-      @_response_body = nil
+    def initialize(method_name=nil, *args)
       super()
-      create!(method_name, *parameters) if method_name
+      process(method_name, *args) if method_name
     end
 
-    # Initialize the mailer via the given +method_name+. The body will be
-    # rendered and a new TMail::Mail object created.
-    def create!(method_name, *parameters) #:nodoc:
+    # 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)
-      __send__(method_name, *parameters)
+      super
 
       # Create e-mail parts
       create_parts
@@ -470,11 +485,11 @@ module ActionMailer #:nodoc:
       @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name],
                                     :default => method_name.humanize)
 
-      # build the mail object itself
-      @mail = create_mail
+      # Build the mail object itself
+      create_mail
     end
 
-    # Delivers a TMail::Mail object. By default, it delivers the cached mail
+    # 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)
@@ -485,7 +500,7 @@ module ActionMailer #:nodoc:
         logger.debug "\n#{mail.encoded}"
       end
 
-      ActiveSupport::Notifications.instrument(:deliver_mail, :mail => @mail) do
+      ActiveSupport::Notifications.instrument(:deliver_mail, :mail => mail) do
         begin
           self.delivery_method.perform_delivery(mail) if perform_deliveries
         rescue Exception => e # Net::SMTP errors or sendmail pipe errors
@@ -501,15 +516,14 @@ module ActionMailer #:nodoc:
       # 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)
+      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
 
-        @mailer_name ||= self.class.mailer_name
+        @mailer_name ||= self.class.mailer_name.dup
         @template    ||= method_name
-        @action_name = @template
 
         @parts   ||= []
         @headers ||= {}
@@ -518,29 +532,18 @@ module ActionMailer #:nodoc:
         super # Run deprecation hooks
       end
 
-      def create_parts
+      def create_parts #:nodoc:
         super # Run deprecation hooks
 
         if String === response_body
-          @parts.unshift Part.new(
-            :content_type => "text/plain",
-            :disposition => "inline",
-            :charset => charset,
-            :body => response_body
-          )
+          @parts.unshift create_inline_part(response_body)
         else
-          self.class.template_root.find_all(@template, {}, mailer_name).each do |template|
-            @parts << Part.new(
-              :content_type => template.mime_type ? template.mime_type.to_s : "text/plain",
-              :disposition => "inline",
-              :charset => charset,
-              :body => render_to_body(:_template => template)
-            )
+          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
 
           if @parts.size > 1
             @content_type = "multipart/alternative" if @content_type !~ /^multipart/
-            @parts = sort_parts(@parts, @implicit_parts_order)
           end
 
           # If this is a multipart e-mail add the mime_version if it is not
@@ -549,37 +552,19 @@ module ActionMailer #:nodoc:
         end
       end
 
-      def sort_parts(parts, order = [])
-        order = order.collect { |s| s.downcase }
-
-        parts = parts.sort do |a, b|
-          a_ct = a.content_type.downcase
-          b_ct = b.content_type.downcase
-
-          a_in = order.include? a_ct
-          b_in = order.include? b_ct
-
-          s = case
-          when a_in && b_in
-            order.index(a_ct) <=> order.index(b_ct)
-          when a_in
-            -1
-          when b_in
-            1
-          else
-            a_ct <=> b_ct
-          end
-
-          # reverse the ordering because parts that come last are displayed
-          # first in mail clients
-          (s * -1)
-        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)
 
-        parts
+        Mail::Part.new(
+          :content_type => [main_type, sub_type, {:charset => charset}],
+          :content_disposition => "inline",
+          :body => body
+        )
       end
 
-      def create_mail
-        m = TMail::Mail.new
+      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)
@@ -592,27 +577,43 @@ module ActionMailer #:nodoc:
         headers.each { |k, v| m[k] = v }
 
         real_content_type, ctype_attrs = parse_content_type
-        
-        if @parts.empty?
-          m.set_content_type(real_content_type, nil, ctype_attrs)
-          m.body = normalize_new_lines(body)
-        elsif @parts.size == 1 && @parts.first.parts.empty?
-          m.set_content_type(real_content_type, nil, ctype_attrs)
-          m.body = normalize_new_lines(@parts.first.body)
+        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|
-            part = (TMail::Mail === p ? p : p.to_mail(self))
-            m.parts << part
+            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.set_content_type(real_content_type, nil, ctype_attrs)
+            m.content_type([main_type, sub_type, ctype_attrs])
           end
         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
+
+      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
+      end
 
   end
 end
diff --git a/actionmailer/lib/action_mailer/delivery_method.rb b/actionmailer/lib/action_mailer/delivery_method.rb
index 29a51afdc3..4f7d3afc3c 100644
--- a/actionmailer/lib/action_mailer/delivery_method.rb
+++ b/actionmailer/lib/action_mailer/delivery_method.rb
@@ -1,7 +1,7 @@
-require "active_support/core_ext/class"
+require 'active_support/core_ext/class'
+
 module ActionMailer
   module DeliveryMethod
-
     autoload :File,     'action_mailer/delivery_method/file'
     autoload :Sendmail, 'action_mailer/delivery_method/sendmail'
     autoload :Smtp,     'action_mailer/delivery_method/smtp'
@@ -52,6 +52,5 @@ module ActionMailer
       superclass_delegating_accessor :settings
       self.settings = {}
     end
-    
   end
 end
diff --git a/actionmailer/lib/action_mailer/delivery_method/file.rb b/actionmailer/lib/action_mailer/delivery_method/file.rb
index 587ae37ffa..571e32df49 100644
--- a/actionmailer/lib/action_mailer/delivery_method/file.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/file.rb
@@ -6,13 +6,13 @@ module ActionMailer
     # A delivery method implementation which writes all mails to a file.
     class File < Method
       self.settings = {
-        :location       => defined?(Rails) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
+        :location       => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"
       }
 
       def perform_delivery(mail)
         FileUtils.mkdir_p settings[:location]
 
-        (mail.to + mail.cc + mail.bcc).uniq.each do |to|
+        mail.destinations.uniq.each do |to|
           ::File.open(::File.join(settings[:location], to), 'a') { |f| f.write(mail) }
         end
       end
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
index 86b0ae8329..af30c498b5 100644
--- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb
+++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb
@@ -1,8 +1,9 @@
+require 'net/smtp'
+
 module ActionMailer
   module DeliveryMethod
     # A delivery method implementation which sends via smtp.
     class Smtp < Method
-
       self.settings = {
         :address              => "localhost",
         :port                 => 25,
@@ -15,8 +16,7 @@ module ActionMailer
 
       def perform_delivery(mail)
         destinations = mail.destinations
-        mail.ready_to_send
-        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+        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)
@@ -26,6 +26,5 @@ module ActionMailer
         end
       end
     end
-
   end
 end
diff --git a/actionmailer/lib/action_mailer/deprecated_body.rb b/actionmailer/lib/action_mailer/deprecated_body.rb
index 50ff262432..20b0989a85 100644
--- a/actionmailer/lib/action_mailer/deprecated_body.rb
+++ b/actionmailer/lib/action_mailer/deprecated_body.rb
@@ -15,6 +15,14 @@ module ActionMailer
       @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
         ActiveSupport::Deprecation.warn('body is deprecated. To set the body with a text ' <<
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 351b966abe..701dc34431 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,17 +1,24 @@
-module MailHelper
-  # Uses Text::Format to take the text and format it, indented two spaces for
-  # each line, and wrapped at 72 columns.
-  def block_format(text)
-    formatted = text.split(/\n\r\n/).collect { |paragraph| 
-      Text::Format.new(
-        :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
-      ).format
-    }.join("\n")
+module ActionMailer
+  module MailHelper
+    # Uses Text::Format to take the text and format it, indented two spaces for
+    # each line, and wrapped at 72 columns.
+    def block_format(text)
+      formatted = text.split(/\n\r\n/).collect { |paragraph|
+        Text::Format.new(
+          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
+        ).format
+      }.join("\n")
     
-    # Make list points stand on their own line
-    formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-    formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      # Make list points stand on their own line
+      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+ 
+      formatted
+    end
 
-    formatted
+    # Access the mailer instance.
+    def mailer #:nodoc:
+      @controller
+    end
   end
 end
diff --git a/actionmailer/lib/action_mailer/part.rb b/actionmailer/lib/action_mailer/part.rb
deleted file mode 100644
index 2bbb59cdb6..0000000000
--- a/actionmailer/lib/action_mailer/part.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-module ActionMailer
-  # Represents a subpart of an email message. It shares many similar
-  # attributes of ActionMailer::Base.  Although you can create parts manually
-  # and add them to the +parts+ list of the mailer, it is easier
-  # to use the helper methods in ActionMailer::PartContainer.
-  class Part
-    include AdvAttrAccessor, PartContainer, Utils
-
-    # Represents the body of the part, as a string. This should not be a
-    # Hash (like ActionMailer::Base), but if you want a template to be rendered
-    # into the body of a subpart you can do it with the mailer's +render+ method
-    # and assign the result here.
-    adv_attr_accessor :body
-    
-    # Specify the charset for this subpart. By default, it will be the charset
-    # of the containing part or mailer.
-    adv_attr_accessor :charset
-    
-    # The content disposition of this part, typically either "inline" or
-    # "attachment".
-    adv_attr_accessor :content_disposition
-    
-    # The content type of the part.
-    adv_attr_accessor :content_type
-    
-    # The filename to use for this subpart (usually for attachments).
-    adv_attr_accessor :filename
-    
-    # Accessor for specifying additional headers to include with this part.
-    adv_attr_accessor :headers
-    
-    # The transfer encoding to use for this subpart, like "base64" or
-    # "quoted-printable".
-    adv_attr_accessor :transfer_encoding
-
-    # Create a new part from the given +params+ hash. The valid params keys
-    # correspond to the accessors.
-    def initialize(params)
-      @content_type = params[:content_type]
-      @content_disposition = params[:disposition] || "inline"
-      @charset = params[:charset]
-      @body = params[:body]
-      @filename = params[:filename]
-      @transfer_encoding = params[:transfer_encoding] || "quoted-printable"
-      @headers = params[:headers] || {}
-      @parts = []
-    end
-
-    # Convert the part to a mail object which can be included in the parts
-    # list of another mail object.
-    def to_mail(defaults)
-      part = TMail::Mail.new
-
-      real_content_type, ctype_attrs = parse_content_type(defaults)
-
-      if @parts.empty?
-        part.content_transfer_encoding = transfer_encoding || "quoted-printable"
-        case (transfer_encoding || "").downcase
-          when "base64" then
-            part.body = TMail::Base64.folding_encode(body)
-          when "quoted-printable"
-            part.body = [normalize_new_lines(body)].pack("M*")
-          else
-            part.body = body
-        end
-
-        # Always set the content_type after setting the body and or parts!
-        # Also don't set filename and name when there is none (like in
-        # non-attachment parts)
-        if content_disposition == "attachment"
-          ctype_attrs.delete "charset"
-          part.set_content_type(real_content_type, nil,
-            squish("name" => filename).merge(ctype_attrs))
-          part.set_content_disposition(content_disposition,
-            squish("filename" => filename).merge(ctype_attrs))
-        else
-          part.set_content_type(real_content_type, nil, ctype_attrs)
-          part.set_content_disposition(content_disposition) 
-        end        
-      else
-        if String === body
-          @parts.unshift Part.new(:charset => charset, :body => @body, :content_type => 'text/plain')
-          @body = nil
-        end
-          
-        @parts.each do |p|
-          prt = (TMail::Mail === p ? p : p.to_mail(defaults))
-          part.parts << prt
-        end
-        
-        if real_content_type =~ /multipart/
-          ctype_attrs.delete 'charset'
-          part.set_content_type(real_content_type, nil, ctype_attrs)
-        end
-      end
-
-      headers.each { |k,v| part[k] = v }
-
-      part
-    end
-
-    private
-      def squish(values={})
-        values.delete_if { |k,v| v.nil? }
-      end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/part_container.rb b/actionmailer/lib/action_mailer/part_container.rb
deleted file mode 100644
index abfd8f8426..0000000000
--- a/actionmailer/lib/action_mailer/part_container.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-module ActionMailer
-  # Accessors and helpers that ActionMailer::Base and ActionMailer::Part have
-  # in common. Using these helpers you can easily add subparts or attachments
-  # to your message:
-  #
-  #   def my_mail_message(...)
-  #     ...
-  #     part "text/plain" do |p|
-  #       p.body "hello, world"
-  #       p.transfer_encoding "base64"
-  #     end
-  #
-  #     attachment "image/jpg" do |a|
-  #       a.body = File.read("hello.jpg")
-  #       a.filename = "hello.jpg"
-  #     end
-  #   end
-  module PartContainer
-    # The list of subparts of this container
-    attr_reader :parts
-
-    # 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
-      part = 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 = { :disposition => "attachment",
-                 :transfer_encoding => "base64" }.merge(params)
-      part(params, &block)
-    end
-
-    private
-    
-      def parse_content_type(defaults=nil)
-        if content_type.blank? 
-          return defaults                                                ? 
-            [ defaults.content_type, { 'charset' => defaults.charset } ] : 
-            [ nil, {} ] 
-        end 
-        ctype, *attrs = content_type.split(/;\s*/)
-        attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
-        [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]
-      end
-
-  end
-end
diff --git a/actionmailer/lib/action_mailer/quoting.rb b/actionmailer/lib/action_mailer/quoting.rb
index 94fa042002..b30441f9de 100644
--- a/actionmailer/lib/action_mailer/quoting.rb
+++ b/actionmailer/lib/action_mailer/quoting.rb
@@ -43,7 +43,7 @@ module ActionMailer
     # "to", "from", "cc", "bcc" and "reply-to" headers.
     def quote_address_if_necessary(address, charset)
       if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }
+        address.map { |a| quote_address_if_necessary(a, charset) }.join(", ")
       elsif address =~ /^(\S.*)\s+(<.*>)$/
         address = $2
         phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
new file mode 100644
index 0000000000..5410c7d75f
--- /dev/null
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -0,0 +1,25 @@
+require "action_mailer"
+require "rails"
+
+module ActionMailer
+  class Railtie < Rails::Railtie
+    plugin_name :action_mailer
+
+    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?
+    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 8035db6f03..e8632d4559 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -1,4 +1,5 @@
 require 'active_support/test_case'
+require 'action_mailer/base'
 
 module ActionMailer
   class NonInferrableMailerError < ::StandardError
@@ -43,8 +44,8 @@ module ActionMailer
       end
 
       def set_expected_mail
-        @expected = TMail::Mail.new
-        @expected.set_content_type "text", "plain", { "charset" => charset }
+        @expected = Mail.new
+        @expected.content_type ["text", "plain", { "charset" => charset }]
         @expected.mime_version = '1.0'
       end
 
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb
new file mode 100644
index 0000000000..2fd25ff145
--- /dev/null
+++ b/actionmailer/lib/action_mailer/tmail_compat.rb
@@ -0,0 +1,20 @@
+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}")
+      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}")
+        content_transfer_encoding(value)
+      else
+        old_transfer_encoding
+      end
+    end
+    
+  end
+end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/utils.rb b/actionmailer/lib/action_mailer/utils.rb
deleted file mode 100644
index 26d2e60aaf..0000000000
--- a/actionmailer/lib/action_mailer/utils.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ActionMailer
-  module Utils #:nodoc:
-    def normalize_new_lines(text)
-      text.to_s.gsub(/\r\n?/, "\n")
-    end
-  end
-end
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
index 2d20c7a6a1..81cc7906d8 100755
--- 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
@@ -1,1466 +1,1467 @@
-#--

-# 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)

-      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

+#--
+# 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/tmail-1.2.3/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail.rb
deleted file mode 100644
index 18003659a6..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'tmail/version'
-require 'tmail/mail'
-require 'tmail/mailbox'
-require 'tmail/core_extensions'
-require 'tmail/net'
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb
deleted file mode 100644
index 982ad5b661..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb
+++ /dev/null
@@ -1,426 +0,0 @@
-=begin rdoc
-
-= Address handling class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-require 'tmail/encode'
-require 'tmail/parser'
-
-
-module TMail
-
-  # = Class Address
-  # 
-  # Provides a complete handling library for email addresses. Can parse a string of an
-  # address directly or take in preformatted addresses themselves.  Allows you to add
-  # and remove phrases from the front of the address and provides a compare function for
-  # email addresses.
-  # 
-  # == Parsing and Handling a Valid Address:
-  # 
-  # Just pass the email address in as a string to Address.parse:
-  # 
-  #  email = TMail::Address.parse('Mikel Lindsaar <mikel@lindsaar.net>)
-  #  #=> #<TMail::Address mikel@lindsaar.net>
-  #  email.address
-  #  #=> "mikel@lindsaar.net"
-  #  email.local
-  #  #=> "mikel"
-  #  email.domain
-  #  #=> "lindsaar.net"
-  #  email.name             # Aliased as phrase as well
-  #  #=> "Mikel Lindsaar"
-  # 
-  # == Detecting an Invalid Address
-  # 
-  # If you want to check the syntactical validity of an email address, just pass it to
-  # Address.parse and catch any SyntaxError:
-  # 
-  #  begin
-  #    TMail::Mail.parse("mikel   2@@@@@ me .com")
-  #  rescue TMail::SyntaxError
-  #    puts("Invalid Email Address Detected")
-  #  else
-  #    puts("Address is valid")
-  #  end
-  #  #=> "Invalid Email Address Detected"
-  class Address
-
-    include TextUtils #:nodoc:
-    
-    # Sometimes you need to parse an address, TMail can do it for you and provide you with
-    # a fairly robust method of detecting a valid address.
-    # 
-    # Takes in a string, returns a TMail::Address object.
-    # 
-    # Raises a TMail::SyntaxError on invalid email format
-    def Address.parse( str )
-      Parser.parse :ADDRESS, special_quote_address(str)
-    end
-    
-    def Address.special_quote_address(str) #:nodoc:
-      # Takes a string which is an address and adds quotation marks to special
-      # edge case methods that the RACC parser can not handle.
-      #
-      # Right now just handles two edge cases:
-      #
-      # Full stop as the last character of the display name:
-      #   Mikel L. <mikel@me.com>
-      # Returns:
-      #   "Mikel L." <mikel@me.com>
-      #
-      # Unquoted @ symbol in the display name:
-      #   mikel@me.com <mikel@me.com>
-      # Returns:
-      #   "mikel@me.com" <mikel@me.com>
-      #
-      # Any other address not matching these patterns just gets returned as is. 
-      case
-      # This handles the missing "" in an older version of Apple Mail.app
-      # around the display name when the display name contains a '@'
-      # like 'mikel@me.com <mikel@me.com>'
-      # Just quotes it to: '"mikel@me.com" <mikel@me.com>'
-      when str =~ /\A([^"].+@.+[^"])\s(<.*?>)\Z/
-        return "\"#{$1}\" #{$2}"
-      # This handles cases where 'Mikel A. <mikel@me.com>' which is a trailing
-      # full stop before the address section.  Just quotes it to
-      # '"Mikel A. <mikel@me.com>"
-      when str =~ /\A(.*?\.)\s(<.*?>)\Z/
-        return "\"#{$1}\" #{$2}"
-      else
-        str
-      end
-    end
-
-    def address_group? #:nodoc:
-      false
-    end
-
-    # Address.new(local, domain)
-    # 
-    # Accepts:
-    # 
-    # * local - Left of the at symbol
-    # 
-    # * domain - Array of the domain split at the periods.
-    # 
-    # For example:
-    # 
-    #  Address.new("mikel", ["lindsaar", "net"])
-    #  #=> "#<TMail::Address mikel@lindsaar.net>"
-    def initialize( local, domain )
-      if domain
-        domain.each do |s|
-          raise SyntaxError, 'empty word in domain' if s.empty?
-        end
-      end
-      
-      # This is to catch an unquoted "@" symbol in the local part of the
-      # address.  Handles addresses like <"@"@me.com> and makes sure they
-      # stay like <"@"@me.com> (previously were becoming <@@me.com>)
-      if local && (local.join == '@' || local.join =~ /\A[^"].*?@.*?[^"]\Z/)
-        @local = "\"#{local.join}\""
-      else
-        @local = local
-      end
-
-      @domain = domain
-      @name   = nil
-      @routes = []
-    end
-
-    # Provides the name or 'phrase' of the email address.
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Address.parse("Mikel Lindsaar <mikel@lindsaar.net>")
-    #  email.name
-    #  #=> "Mikel Lindsaar"
-    def name
-      @name
-    end
-
-    # Setter method for the name or phrase of the email
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Address.parse("mikel@lindsaar.net")
-    #  email.name
-    #  #=> nil
-    #  email.name = "Mikel Lindsaar"
-    #  email.to_s
-    #  #=> "Mikel Lindsaar <mikel@me.com>"
-    def name=( str )
-      @name = str
-      @name = nil if str and str.empty?
-    end
-
-    #:stopdoc:
-    alias phrase  name
-    alias phrase= name=
-    #:startdoc:
-    
-    # This is still here from RFC 822, and is now obsolete per RFC2822 Section 4.
-    # 
-    # "When interpreting addresses, the route portion SHOULD be ignored."
-    # 
-    # It is still here, so you can access it.
-    # 
-    # Routes return the route portion at the front of the email address, if any.
-    # 
-    # For Example:
-    #  email = TMail::Address.parse( "<@sa,@another:Mikel@me.com>")
-    #  => #<TMail::Address Mikel@me.com>
-    #  email.to_s
-    #  => "<@sa,@another:Mikel@me.com>"
-    #  email.routes
-    #  => ["sa", "another"]
-    def routes
-      @routes
-    end
-    
-    def inspect #:nodoc:
-      "#<#{self.class} #{address()}>"
-    end
-
-    # Returns the local part of the email address
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Address.parse("mikel@lindsaar.net")
-    #  email.local
-    #  #=> "mikel"
-    def local
-      return nil unless @local
-      return '""' if @local.size == 1 and @local[0].empty?
-      # Check to see if it is an array before trying to map it
-      if @local.respond_to?(:map)
-        @local.map {|i| quote_atom(i) }.join('.')
-      else
-        quote_atom(@local)
-      end
-    end
-
-    # Returns the domain part of the email address
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Address.parse("mikel@lindsaar.net")
-    #  email.local
-    #  #=> "lindsaar.net"
-    def domain
-      return nil unless @domain
-      join_domain(@domain)
-    end
-
-    # Returns the full specific address itself
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Address.parse("mikel@lindsaar.net")
-    #  email.address
-    #  #=> "mikel@lindsaar.net"
-    def spec
-      s = self.local
-      d = self.domain
-      if s and d
-        s + '@' + d
-      else
-        s
-      end
-    end
-
-    alias address spec
-
-    # Provides == function to the email.  Only checks the actual address
-    # and ignores the name/phrase component
-    # 
-    # For Example
-    # 
-    #  addr1 = TMail::Address.parse("My Address <mikel@lindsaar.net>")
-    #  #=> "#<TMail::Address mikel@lindsaar.net>"
-    #  addr2 = TMail::Address.parse("Another <mikel@lindsaar.net>")
-    #  #=> "#<TMail::Address mikel@lindsaar.net>"
-    #  addr1 == addr2
-    #  #=> true
-    def ==( other )
-      other.respond_to? :spec and self.spec == other.spec
-    end
-
-    alias eql? ==
-
-    # Provides a unique hash value for this record against the local and domain
-    # parts, ignores the name/phrase value
-    # 
-    #  email = TMail::Address.parse("mikel@lindsaar.net")
-    #  email.hash
-    #  #=> 18767598
-    def hash
-      @local.hash ^ @domain.hash
-    end
-
-    # Duplicates a TMail::Address object returning the duplicate
-    # 
-    #  addr1 = TMail::Address.parse("mikel@lindsaar.net")
-    #  addr2 = addr1.dup
-    #  addr1.id == addr2.id
-    #  #=> false
-    def dup
-      obj = self.class.new(@local.dup, @domain.dup)
-      obj.name = @name.dup if @name
-      obj.routes.replace @routes
-      obj
-    end
-
-    include StrategyInterface #:nodoc:
-
-    def accept( strategy, dummy1 = nil, dummy2 = nil ) #:nodoc:
-      unless @local
-        strategy.meta '<>'   # empty return-path
-        return
-      end
-
-      spec_p = (not @name and @routes.empty?)
-      if @name
-        strategy.phrase @name
-        strategy.space
-      end
-      tmp = spec_p ? '' : '<'
-      unless @routes.empty?
-        tmp << @routes.map {|i| '@' + i }.join(',') << ':'
-      end
-      tmp << self.spec
-      tmp << '>' unless spec_p
-      strategy.meta tmp
-      strategy.lwsp ''
-    end
-
-  end
-
-
-  class AddressGroup
-
-    include Enumerable
-
-    def address_group?
-      true
-    end
-
-    def initialize( name, addrs )
-      @name = name
-      @addresses = addrs
-    end
-
-    attr_reader :name
-    
-    def ==( other )
-      other.respond_to? :to_a and @addresses == other.to_a
-    end
-
-    alias eql? ==
-
-    def hash
-      map {|i| i.hash }.hash
-    end
-
-    def []( idx )
-      @addresses[idx]
-    end
-
-    def size
-      @addresses.size
-    end
-
-    def empty?
-      @addresses.empty?
-    end
-
-    def each( &block )
-      @addresses.each(&block)
-    end
-
-    def to_a
-      @addresses.dup
-    end
-
-    alias to_ary to_a
-
-    def include?( a )
-      @addresses.include? a
-    end
-
-    def flatten
-      set = []
-      @addresses.each do |a|
-        if a.respond_to? :flatten
-          set.concat a.flatten
-        else
-          set.push a
-        end
-      end
-      set
-    end
-
-    def each_address( &block )
-      flatten.each(&block)
-    end
-
-    def add( a )
-      @addresses.push a
-    end
-
-    alias push add
-    
-    def delete( a )
-      @addresses.delete a
-    end
-
-    include StrategyInterface
-
-    def accept( strategy, dummy1 = nil, dummy2 = nil )
-      strategy.phrase @name
-      strategy.meta ':'
-      strategy.space
-      first = true
-      each do |mbox|
-        if first
-          first = false
-        else
-          strategy.meta ','
-        end
-        strategy.space
-        mbox.accept strategy
-      end
-      strategy.meta ';'
-      strategy.lwsp ''
-    end
-
-  end
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
deleted file mode 100644
index 5dc5efae5e..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-=begin rdoc
-
-= Attachment handling file
-
-=end
-
-require 'stringio'
-
-module TMail
-  class Attachment < StringIO
-    attr_accessor :original_filename, :content_type
-  end
-
-  class Mail
-    def has_attachments?
-      multipart? && parts.any? { |part| attachment?(part) }
-    end
-
-    def attachment?(part)
-      part.disposition_is_attachment? || part.content_type_is_text?
-    end
-
-    def attachments
-      if multipart?
-        parts.collect { |part| 
-          if part.multipart?
-            part.attachments
-          elsif attachment?(part)
-            content   = part.body # unquoted automatically by TMail#body
-            file_name = (part['content-location'] &&
-                          part['content-location'].body) ||
-                        part.sub_header("content-type", "name") ||
-                        part.sub_header("content-disposition", "filename")
-            
-            next if file_name.blank? || content.blank?
-            
-            attachment = Attachment.new(content)
-            attachment.original_filename = file_name.strip
-            attachment.content_type = part.content_type
-            attachment
-          end
-        }.flatten.compact
-      end      
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb
deleted file mode 100644
index e294c62960..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#--
-#   Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-#   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 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.
-#
-#   Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-#   with permission of Minero Aoki.
-#++
-#:stopdoc:
-module TMail
-  module Base64
-
-    module_function
-
-    def folding_encode( str, eol = "\n", limit = 60 )
-      [str].pack('m')
-    end
-
-    def encode( str )
-      [str].pack('m').tr( "\r\n", '' )
-    end
-
-    def decode( str, strict = false )
-      str.unpack('m').first
-    end
-
-  end
-end
-#:startdoc:
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb
deleted file mode 100644
index 1275df79a6..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#:stopdoc:
-unless Enumerable.method_defined?(:map) 
-  module Enumerable #:nodoc:
-    alias map collect
-  end
-end
-
-unless Enumerable.method_defined?(:select)
-  module Enumerable #:nodoc:
-    alias select find_all
-  end
-end
-
-unless Enumerable.method_defined?(:reject)
-  module Enumerable #:nodoc:
-    def reject
-      result = []
-      each do |i|
-        result.push i unless yield(i)
-      end
-      result
-    end
-  end
-end
-
-unless Enumerable.method_defined?(:sort_by)
-  module Enumerable #:nodoc:
-    def sort_by
-      map {|i| [yield(i), i] }.sort.map {|val, i| i }
-    end
-  end
-end
-
-unless File.respond_to?(:read)
-  def File.read(fname) #:nodoc:
-    File.open(fname) {|f|
-      return f.read
-    }
-  end
-end
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb
deleted file mode 100644
index 3a876dcdbd..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-#:stopdoc:
-module TMail
-
-  class Config
-
-    def initialize( strict )
-      @strict_parse = strict
-      @strict_base64decode = strict
-    end
-
-    def strict_parse?
-      @strict_parse
-    end
-
-    attr_writer :strict_parse
-
-    def strict_base64decode?
-      @strict_base64decode
-    end
-
-    attr_writer :strict_base64decode
-
-    def new_body_port( mail )
-      StringPort.new
-    end
-
-    alias new_preamble_port  new_body_port
-    alias new_part_port      new_body_port
-  
-  end
-
-  DEFAULT_CONFIG        = Config.new(false)
-  DEFAULT_STRICT_CONFIG = Config.new(true)
-
-  def Config.to_config( arg )
-    return DEFAULT_STRICT_CONFIG if arg == true
-    return DEFAULT_CONFIG        if arg == false
-    arg or DEFAULT_CONFIG
-  end
-
-end
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb
deleted file mode 100644
index da62c33bbf..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#:stopdoc:
-unless Object.respond_to?(:blank?)
-  class Object
-    # Check first to see if we are in a Rails environment, no need to 
-    # define these methods if we are
-
-    # An object is blank if it's nil, empty, or a whitespace string.
-    # For example, "", "   ", nil, [], and {} are blank.
-    #
-    # This simplifies
-    #   if !address.nil? && !address.empty?
-    # to
-    #   if !address.blank?
-    def blank?
-      if respond_to?(:empty?) && respond_to?(:strip)
-        empty? or strip.empty?
-      elsif respond_to?(:empty?)
-        empty?
-      else
-        !self
-      end
-    end
-  end
-
-  class NilClass
-    def blank?
-      true
-    end
-  end
-
-  class FalseClass
-    def blank?
-      true
-    end
-  end
-
-  class TrueClass
-    def blank?
-      false
-    end
-  end
-
-  class Array
-    alias_method :blank?, :empty?
-  end
-
-  class Hash
-    alias_method :blank?, :empty?
-  end
-
-  class String
-    def blank?
-      empty? || strip.empty?
-    end
-  end
-
-  class Numeric
-    def blank?
-      false
-    end
-  end
-end
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb
deleted file mode 100644
index 458dbbfe6a..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb
+++ /dev/null
@@ -1,581 +0,0 @@
-#--
-# = COPYRIGHT:
-#
-#   Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-#   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 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.
-#
-#   Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-#   with permission of Minero Aoki.
-#++
-#:stopdoc:
-require 'nkf'
-require 'tmail/base64'
-require 'tmail/stringio'
-require 'tmail/utils'
-#:startdoc:
-
-
-module TMail
-  
-  #:stopdoc:
-  class << self
-    attr_accessor :KCODE
-  end
-  self.KCODE = 'NONE'
-
-  module StrategyInterface
-
-    def create_dest( obj )
-      case obj
-      when nil
-        StringOutput.new
-      when String
-        StringOutput.new(obj)
-      when IO, StringOutput
-        obj
-      else
-        raise TypeError, 'cannot handle this type of object for dest'
-      end
-    end
-    module_function :create_dest
-
-    #:startdoc:
-    # Returns the TMail object encoded and ready to be sent via SMTP etc.
-    # You should call this before you are packaging up your  email to
-    # correctly escape all the values that need escaping in the email, line
-    # wrap the email etc.
-    # 
-    # It is also a good idea to call this before you marshal or serialize
-    # a TMail object.
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Load(my_email_file)
-    #  email_to_send = email.encoded
-    def encoded( eol = "\r\n", charset = 'j', dest = nil )
-      accept_strategy Encoder, eol, charset, dest
-    end
-
-    # Returns the TMail object decoded and ready to be used by you, your
-    # program etc.
-    # 
-    # You should call this before you are packaging up your  email to
-    # correctly escape all the values that need escaping in the email, line
-    # wrap the email etc.
-    # 
-    # For Example:
-    # 
-    #  email = TMail::Load(my_email_file)
-    #  email_to_send = email.encoded
-    def decoded( eol = "\n", charset = 'e', dest = nil )
-      # Turn the E-Mail into a string and return it with all
-      # encoded characters decoded.  alias for to_s
-      accept_strategy Decoder, eol, charset, dest
-    end
-
-    alias to_s decoded
-
-    def accept_strategy( klass, eol, charset, dest = nil ) #:nodoc:
-      dest ||= ''
-      accept klass.new( create_dest(dest), charset, eol )
-      dest
-    end
-
-  end
-
-  #:stopdoc:
-
-  ###
-  ### MIME B encoding decoder
-  ###
-
-  class Decoder
-
-    include TextUtils
-
-    encoded = '=\?(?:iso-2022-jp|euc-jp|shift_jis)\?[QB]\?[a-z0-9+/=]+\?='
-    ENCODED_WORDS = /#{encoded}(?:\s+#{encoded})*/i
-
-    OUTPUT_ENCODING = {
-      'EUC'  => 'e',
-      'SJIS' => 's',
-    }
-
-    def self.decode( str, encoding = nil )
-      encoding ||= (OUTPUT_ENCODING[TMail.KCODE] || 'j')
-      opt = '-mS' + encoding
-      str.gsub(ENCODED_WORDS) {|s| NKF.nkf(opt, s) }
-    end
-
-    def initialize( dest, encoding = nil, eol = "\n" )
-      @f = StrategyInterface.create_dest(dest)
-      @encoding = (/\A[ejs]/ === encoding) ? encoding[0,1] : nil
-      @eol = eol
-    end
-
-    def decode( str )
-      self.class.decode(str, @encoding)
-    end
-    private :decode
-
-    def terminate
-    end
-
-    def header_line( str )
-      @f << decode(str)
-    end
-
-    def header_name( nm )
-      @f << nm << ': '
-    end
-
-    def header_body( str )
-      @f << decode(str)
-    end
-
-    def space
-      @f << ' '
-    end
-
-    alias spc space
-
-    def lwsp( str )
-      @f << str
-    end
-
-    def meta( str )
-      @f << str
-    end
-
-    def text( str )
-      @f << decode(str)
-    end
-
-    def phrase( str )
-      @f << quote_phrase(decode(str))
-    end
-
-    def kv_pair( k, v )
-      v = dquote(v) unless token_safe?(v)
-      @f << k << '=' << v
-    end
-
-    def puts( str = nil )
-      @f << str if str
-      @f << @eol
-    end
-
-    def write( str )
-      @f << str
-    end
-
-  end
-
-
-  ###
-  ### MIME B-encoding encoder
-  ###
-
-  #
-  # FIXME: This class can handle only (euc-jp/shift_jis -> iso-2022-jp).
-  #
-  class Encoder
-
-    include TextUtils
-
-    BENCODE_DEBUG = false unless defined?(BENCODE_DEBUG)
-
-    def Encoder.encode( str )
-      e = new()
-      e.header_body str
-      e.terminate
-      e.dest.string
-    end
-
-    SPACER       = "\t"
-    MAX_LINE_LEN = 78
-    RFC_2822_MAX_LENGTH = 998
-
-    OPTIONS = {
-      'EUC'  => '-Ej -m0',
-      'SJIS' => '-Sj -m0',
-      'UTF8' => nil,      # FIXME
-      'NONE' => nil
-    }
-
-    def initialize( dest = nil, encoding = nil, eol = "\r\n", limit = nil )
-      @f = StrategyInterface.create_dest(dest)
-      @opt = OPTIONS[TMail.KCODE]
-      @eol = eol
-      @folded = false
-      @preserve_quotes = true
-      reset
-    end
-
-    def preserve_quotes=( bool )
-      @preserve_quotes
-    end
-
-    def preserve_quotes
-      @preserve_quotes
-    end
-
-    def normalize_encoding( str )
-      if @opt
-      then NKF.nkf(@opt, str)
-      else str
-      end
-    end
-
-    def reset
-      @text = ''
-      @lwsp = ''
-      @curlen = 0
-    end
-
-    def terminate
-      add_lwsp ''
-      reset
-    end
-
-    def dest
-      @f
-    end
-
-    def puts( str = nil )
-      @f << str if str
-      @f << @eol
-    end
-
-    def write( str )
-      @f << str
-    end
-
-    #
-    # add
-    #
-
-    def header_line( line )
-      scanadd line
-    end
-
-    def header_name( name )
-      add_text name.split(/-/).map {|i| i.capitalize }.join('-')
-      add_text ':'
-      add_lwsp ' '
-    end
-
-    def header_body( str )
-      scanadd normalize_encoding(str)
-    end
-
-    def space
-      add_lwsp ' '
-    end
-
-    alias spc space
-
-    def lwsp( str )
-      add_lwsp str.sub(/[\r\n]+[^\r\n]*\z/, '')
-    end
-
-    def meta( str )
-      add_text str
-    end
-
-    def text( str )
-      scanadd normalize_encoding(str)
-    end
-
-    def phrase( str )
-      str = normalize_encoding(str)
-      if CONTROL_CHAR === str
-        scanadd str
-      else
-        add_text quote_phrase(str)
-      end
-    end
-
-    # FIXME: implement line folding
-    #
-    def kv_pair( k, v )
-      return if v.nil?
-      v = normalize_encoding(v)
-      if token_safe?(v)
-        add_text k + '=' + v
-      elsif not CONTROL_CHAR === v
-        add_text k + '=' + quote_token(v)
-      else
-        # apply RFC2231 encoding
-        kv = k + '*=' + "iso-2022-jp'ja'" + encode_value(v)
-        add_text kv
-      end
-    end
-
-    def encode_value( str )
-      str.gsub(TOKEN_UNSAFE) {|s| '%%%02x' % s[0] }
-    end
-
-    private
-
-    def scanadd( str, force = false )
-      types = ''
-      strs = []
-      if str.respond_to?(:encoding)
-        enc = str.encoding 
-        str.force_encoding(Encoding::ASCII_8BIT)
-      end
-      until str.empty?
-        if m = /\A[^\e\t\r\n ]+/.match(str)
-          types << (force ? 'j' : 'a')
-          if str.respond_to?(:encoding)
-            strs.push m[0].force_encoding(enc)
-          else
-            strs.push m[0]
-          end
-        elsif m = /\A[\t\r\n ]+/.match(str)
-          types << 's'
-          if str.respond_to?(:encoding)
-            strs.push m[0].force_encoding(enc)
-          else
-            strs.push m[0]
-          end
-
-        elsif m = /\A\e../.match(str)
-          esc = m[0]
-          str = m.post_match
-          if esc != "\e(B" and m = /\A[^\e]+/.match(str)
-            types << 'j'
-            if str.respond_to?(:encoding)
-              strs.push m[0].force_encoding(enc)
-            else
-              strs.push m[0]
-            end
-          end
-
-        else
-          raise 'TMail FATAL: encoder scan fail'
-        end
-        (str = m.post_match) unless m.nil?
-      end
-
-      do_encode types, strs
-    end
-
-    def do_encode( types, strs )
-      #
-      # result  : (A|E)(S(A|E))*
-      # E       : W(SW)*
-      # W       : (J|A)+ but must contain J  # (J|A)*J(J|A)*
-      # A       : <<A character string not to be encoded>>
-      # J       : <<A character string to be encoded>>
-      # S       : <<LWSP>>
-      #
-      # An encoding unit is `E'.
-      # Input (parameter `types') is  (J|A)(J|A|S)*(J|A)
-      #
-      if BENCODE_DEBUG
-        puts
-        puts '-- do_encode ------------'
-        puts types.split(//).join(' ')
-        p strs
-      end
-
-      e = /[ja]*j[ja]*(?:s[ja]*j[ja]*)*/
-
-      while m = e.match(types)
-        pre = m.pre_match
-        concat_A_S pre, strs[0, pre.size] unless pre.empty?
-        concat_E m[0], strs[m.begin(0) ... m.end(0)]
-        types = m.post_match
-        strs.slice! 0, m.end(0)
-      end
-      concat_A_S types, strs
-    end
-
-    def concat_A_S( types, strs )
-      if RUBY_VERSION < '1.9'
-        a = ?a; s = ?s
-      else
-        a = 'a'.ord; s = 's'.ord
-      end
-      i = 0
-      types.each_byte do |t|
-        case t
-        when a then add_text strs[i]
-        when s then add_lwsp strs[i]
-        else
-          raise "TMail FATAL: unknown flag: #{t.chr}"
-        end
-        i += 1
-      end
-    end
-
-    METHOD_ID = {
-      ?j => :extract_J,
-      ?e => :extract_E,
-      ?a => :extract_A,
-      ?s => :extract_S
-    }
-
-    def concat_E( types, strs )
-      if BENCODE_DEBUG
-        puts '---- concat_E'
-        puts "types=#{types.split(//).join(' ')}"
-        puts "strs =#{strs.inspect}"
-      end
-
-      flush() unless @text.empty?
-
-      chunk = ''
-      strs.each_with_index do |s,i|
-        mid = METHOD_ID[types[i]]
-        until s.empty?
-          unless c = __send__(mid, chunk.size, s)
-            add_with_encode chunk unless chunk.empty?
-            flush
-            chunk = ''
-            fold
-            c = __send__(mid, 0, s)
-            raise 'TMail FATAL: extract fail' unless c
-          end
-          chunk << c
-        end
-      end
-      add_with_encode chunk unless chunk.empty?
-    end
-
-    def extract_J( chunksize, str )
-      size = max_bytes(chunksize, str.size) - 6
-      size = (size % 2 == 0) ? (size) : (size - 1)
-      return nil if size <= 0
-      if str.respond_to?(:encoding)
-        enc = str.encoding
-        str.force_encoding(Encoding::ASCII_8BIT)
-        "\e$B#{str.slice!(0, size)}\e(B".force_encoding(enc)
-      else
-        "\e$B#{str.slice!(0, size)}\e(B"
-      end
-    end
-
-    def extract_A( chunksize, str )
-      size = max_bytes(chunksize, str.size)
-      return nil if size <= 0
-      str.slice!(0, size)
-    end
-
-    alias extract_S extract_A
-
-    def max_bytes( chunksize, ssize )
-      (restsize() - '=?iso-2022-jp?B??='.size) / 4 * 3 - chunksize
-    end
-
-    #
-    # free length buffer
-    #
-
-    def add_text( str )
-      @text << str
-      # puts '---- text -------------------------------------'
-      # puts "+ #{str.inspect}"
-      # puts "txt >>>#{@text.inspect}<<<"
-    end
-
-    def add_with_encode( str )
-      @text << "=?iso-2022-jp?B?#{Base64.encode(str)}?="
-    end
-
-    def add_lwsp( lwsp )
-      # puts '---- lwsp -------------------------------------'
-      # puts "+ #{lwsp.inspect}"
-      fold if restsize() <= 0
-      flush(@folded)
-      @lwsp = lwsp
-    end
-
-    def flush(folded = false)
-      # puts '---- flush ----'
-      # puts "spc >>>#{@lwsp.inspect}<<<"
-      # puts "txt >>>#{@text.inspect}<<<"
-      @f << @lwsp << @text
-      if folded
-        @curlen = 0
-      else
-        @curlen += (@lwsp.size + @text.size)
-      end
-      @text = ''
-      @lwsp = ''
-    end
-
-    def fold
-      # puts '---- fold ----'
-      unless @f.string =~ /^.*?:$/
-        @f << @eol
-        @lwsp = SPACER
-      else
-        fold_header
-        @folded = true
-      end
-      @curlen = 0
-    end
-
-    def fold_header
-      # Called because line is too long - so we need to wrap.
-      # First look for whitespace in the text
-      # if it has text, fold there
-      # check the remaining text, if too long, fold again
-      # if it doesn't, then don't fold unless the line goes beyond 998 chars
-
-      # Check the text to see if there is whitespace, or if not
-      @wrapped_text = []
-      until @text.blank?
-        fold_the_string
-      end
-      @text = @wrapped_text.join("#{@eol}#{SPACER}")
-    end
-
-    def fold_the_string
-      whitespace_location = @text =~ /\s/ || @text.length
-      # Is the location of the whitespace shorter than the RCF_2822_MAX_LENGTH?
-      # if there is no whitespace in the string, then this
-      unless mazsize(whitespace_location) <= 0
-        @text.strip!
-        @wrapped_text << @text.slice!(0...whitespace_location)
-      # If it is not less, we have to wrap it destructively
-      else
-        slice_point = RFC_2822_MAX_LENGTH - @curlen - @lwsp.length
-        @text.strip!
-        @wrapped_text << @text.slice!(0...slice_point)
-      end
-    end
-
-    def restsize
-      MAX_LINE_LEN - (@curlen + @lwsp.size + @text.size)
-    end
-
-    def mazsize(whitespace_location)
-      # Per RFC2822, the maximum length of a line is 998 chars
-      RFC_2822_MAX_LENGTH - (@curlen + @lwsp.size + whitespace_location)
-    end
-
-  end
-  #:startdoc:
-end    # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb
deleted file mode 100644
index dbdefcf979..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb
+++ /dev/null
@@ -1,960 +0,0 @@
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-require 'tmail/encode'
-require 'tmail/address'
-require 'tmail/parser'
-require 'tmail/config'
-require 'tmail/utils'
-
-#:startdoc:
-module TMail
-
-  # Provides methods to handle and manipulate headers in the email
-  class HeaderField
-
-    include TextUtils
-
-    class << self
-
-      alias newobj new
-
-      def new( name, body, conf = DEFAULT_CONFIG )
-        klass = FNAME_TO_CLASS[name.downcase] || UnstructuredHeader
-        klass.newobj body, conf
-      end
-
-      # Returns a HeaderField object matching the header you specify in the "name" param.
-      # Requires an initialized TMail::Port to be passed in.
-      #
-      # The method searches the header of the Port you pass into it to find a match on
-      # the header line you pass.  Once a match is found, it will unwrap the matching line
-      # as needed to return an initialized HeaderField object.
-      #
-      # If you want to get the Envelope sender of the email object, pass in "EnvelopeSender",
-      # if you want the From address of the email itself, pass in 'From'.
-      #
-      # This is because a mailbox doesn't have the : after the From that designates the
-      # beginning of the envelope sender (which can be different to the from address of 
-      # the email)
-      #
-      # Other fields can be passed as normal, "Reply-To", "Received" etc.
-      #
-      # Note: Change of behaviour in 1.2.1 => returns nil if it does not find the specified
-      # header field, otherwise returns an instantiated object of the correct header class
-      # 
-      # For example:
-      #   port = TMail::FilePort.new("/test/fixtures/raw_email_simple")
-      #   h = TMail::HeaderField.new_from_port(port, "From")
-      #   h.addrs.to_s #=> "Mikel Lindsaar <mikel@nowhere.com>"
-      #   h = TMail::HeaderField.new_from_port(port, "EvelopeSender")
-      #   h.addrs.to_s #=> "mike@anotherplace.com.au"
-      #   h = TMail::HeaderField.new_from_port(port, "SomeWeirdHeaderField")
-      #   h #=> nil
-      def new_from_port( port, name, conf = DEFAULT_CONFIG )
-        if name == "EnvelopeSender"
-          name = "From"
-          re = Regexp.new('\A(From) ', 'i')
-        else
-          re = Regexp.new('\A(' + Regexp.quote(name) + '):', 'i')
-        end
-        str = nil
-        port.ropen {|f|
-            f.each do |line|
-              if m = re.match(line)            then str = m.post_match.strip
-              elsif str and /\A[\t ]/ === line then str << ' ' << line.strip
-              elsif /\A-*\s*\z/ === line       then break
-              elsif str                        then break
-              end
-            end
-        }
-        new(name, str, Config.to_config(conf)) if str
-      end
-
-      def internal_new( name, conf )
-        FNAME_TO_CLASS[name].newobj('', conf, true)
-      end
-
-    end   # class << self
-
-    def initialize( body, conf, intern = false )
-      @body = body
-      @config = conf
-
-      @illegal = false
-      @parsed = false
-      
-      if intern
-        @parsed = true
-        parse_init
-      end
-    end
-
-    def inspect
-      "#<#{self.class} #{@body.inspect}>"
-    end
-
-    def illegal?
-      @illegal
-    end
-
-    def empty?
-      ensure_parsed
-      return true if @illegal
-      isempty?
-    end
-
-    private
-
-    def ensure_parsed
-      return if @parsed
-      @parsed = true
-      parse
-    end
-
-    # defabstract parse
-    # end
-
-    def clear_parse_status
-      @parsed = false
-      @illegal = false
-    end
-
-    public
-
-    def body
-      ensure_parsed
-      v = Decoder.new(s = '')
-      do_accept v
-      v.terminate
-      s
-    end
-
-    def body=( str )
-      @body = str
-      clear_parse_status
-    end
-
-    include StrategyInterface
-
-    def accept( strategy )
-      ensure_parsed
-      do_accept strategy
-      strategy.terminate
-    end
-
-    # abstract do_accept
-
-  end
-
-
-  class UnstructuredHeader < HeaderField
-
-    def body
-      ensure_parsed
-      @body
-    end
-
-    def body=( arg )
-      ensure_parsed
-      @body = arg
-    end
-
-    private
-
-    def parse_init
-    end
-
-    def parse
-      @body = Decoder.decode(@body.gsub(/\n|\r\n|\r/, ''))
-    end
-
-    def isempty?
-      not @body
-    end
-
-    def do_accept( strategy )
-      strategy.text @body
-    end
-
-  end
-
-
-  class StructuredHeader < HeaderField
-
-    def comments
-      ensure_parsed
-      if @comments[0]
-        [Decoder.decode(@comments[0])]
-      else
-        @comments
-      end
-    end
-
-    private
-
-    def parse
-      save = nil
-
-      begin
-        parse_init
-        do_parse
-      rescue SyntaxError
-        if not save and mime_encoded? @body
-          save = @body
-          @body = Decoder.decode(save)
-          retry
-        elsif save
-          @body = save
-        end
-
-        @illegal = true
-        raise if @config.strict_parse?
-      end
-    end
-
-    def parse_init
-      @comments = []
-      init
-    end
-
-    def do_parse
-      quote_boundary
-      obj = Parser.parse(self.class::PARSE_TYPE, @body, @comments)
-      set obj if obj
-    end
-
-  end
-
-
-  class DateTimeHeader < StructuredHeader
-
-    PARSE_TYPE = :DATETIME
-
-    def date
-      ensure_parsed
-      @date
-    end
-
-    def date=( arg )
-      ensure_parsed
-      @date = arg
-    end
-
-    private
-
-    def init
-      @date = nil
-    end
-
-    def set( t )
-      @date = t
-    end
-
-    def isempty?
-      not @date
-    end
-
-    def do_accept( strategy )
-      strategy.meta time2str(@date)
-    end
-
-  end
-
-
-  class AddressHeader < StructuredHeader
-
-    PARSE_TYPE = :MADDRESS
-
-    def addrs
-      ensure_parsed
-      @addrs
-    end
-
-    private
-
-    def init
-      @addrs = []
-    end
-
-    def set( a )
-      @addrs = a
-    end
-
-    def isempty?
-      @addrs.empty?
-    end
-
-    def do_accept( strategy )
-      first = true
-      @addrs.each do |a|
-        if first
-          first = false
-        else
-          strategy.meta ','
-          strategy.space
-        end
-        a.accept strategy
-      end
-
-      @comments.each do |c|
-        strategy.space
-        strategy.meta '('
-        strategy.text c
-        strategy.meta ')'
-      end
-    end
-
-  end
-
-
-  class ReturnPathHeader < AddressHeader
-
-    PARSE_TYPE = :RETPATH
-
-    def addr
-      addrs()[0]
-    end
-
-    def spec
-      a = addr() or return nil
-      a.spec
-    end
-
-    def routes
-      a = addr() or return nil
-      a.routes
-    end
-
-    private
-
-    def do_accept( strategy )
-      a = addr()
-
-      strategy.meta '<'
-      unless a.routes.empty?
-        strategy.meta a.routes.map {|i| '@' + i }.join(',')
-        strategy.meta ':'
-      end
-      spec = a.spec
-      strategy.meta spec if spec
-      strategy.meta '>'
-    end
-
-  end
-
-
-  class SingleAddressHeader < AddressHeader
-
-    def addr
-      addrs()[0]
-    end
-
-    private
-
-    def do_accept( strategy )
-      a = addr()
-      a.accept strategy
-      @comments.each do |c|
-        strategy.space
-        strategy.meta '('
-        strategy.text c
-        strategy.meta ')'
-      end
-    end
-
-  end
-
-
-  class MessageIdHeader < StructuredHeader
-
-    def id
-      ensure_parsed
-      @id
-    end
-
-    def id=( arg )
-      ensure_parsed
-      @id = arg
-    end
-
-    private
-
-    def init
-      @id = nil
-    end
-
-    def isempty?
-      not @id
-    end
-
-    def do_parse
-      @id = @body.slice(MESSAGE_ID) or
-              raise SyntaxError, "wrong Message-ID format: #{@body}"
-    end
-
-    def do_accept( strategy )
-      strategy.meta @id
-    end
-
-  end
-
-
-  class ReferencesHeader < StructuredHeader
-
-    def refs
-      ensure_parsed
-      @refs
-    end
-
-    def each_id
-      self.refs.each do |i|
-        yield i if MESSAGE_ID === i
-      end
-    end
-
-    def ids
-      ensure_parsed
-      @ids
-    end
-
-    def each_phrase
-      self.refs.each do |i|
-        yield i unless MESSAGE_ID === i
-      end
-    end
-
-    def phrases
-      ret = []
-      each_phrase {|i| ret.push i }
-      ret
-    end
-
-    private
-
-    def init
-      @refs = []
-      @ids = []
-    end
-
-    def isempty?
-      @ids.empty?
-    end
-
-    def do_parse
-      str = @body
-      while m = MESSAGE_ID.match(str)
-        pre = m.pre_match.strip
-        @refs.push pre unless pre.empty?
-        @refs.push s = m[0]
-        @ids.push s
-        str = m.post_match
-      end
-      str = str.strip
-      @refs.push str unless str.empty?
-    end
-
-    def do_accept( strategy )
-      first = true
-      @ids.each do |i|
-        if first
-          first = false
-        else
-          strategy.space
-        end
-        strategy.meta i
-      end
-    end
-
-  end
-
-
-  class ReceivedHeader < StructuredHeader
-
-    PARSE_TYPE = :RECEIVED
-
-    def from
-      ensure_parsed
-      @from
-    end
-
-    def from=( arg )
-      ensure_parsed
-      @from = arg
-    end
-
-    def by
-      ensure_parsed
-      @by
-    end
-
-    def by=( arg )
-      ensure_parsed
-      @by = arg
-    end
-
-    def via
-      ensure_parsed
-      @via
-    end
-
-    def via=( arg )
-      ensure_parsed
-      @via = arg
-    end
-
-    def with
-      ensure_parsed
-      @with
-    end
-
-    def id
-      ensure_parsed
-      @id
-    end
-
-    def id=( arg )
-      ensure_parsed
-      @id = arg
-    end
-
-    def _for
-      ensure_parsed
-      @_for
-    end
-
-    def _for=( arg )
-      ensure_parsed
-      @_for = arg
-    end
-
-    def date
-      ensure_parsed
-      @date
-    end
-
-    def date=( arg )
-      ensure_parsed
-      @date = arg
-    end
-
-    private
-
-    def init
-      @from = @by = @via = @with = @id = @_for = nil
-      @with = []
-      @date = nil
-    end
-
-    def set( args )
-      @from, @by, @via, @with, @id, @_for, @date = *args
-    end
-
-    def isempty?
-      @with.empty? and not (@from or @by or @via or @id or @_for or @date)
-    end
-
-    def do_accept( strategy )
-      list = []
-      list.push 'from '  + @from       if @from
-      list.push 'by '    + @by         if @by
-      list.push 'via '   + @via        if @via
-      @with.each do |i|
-        list.push 'with ' + i
-      end
-      list.push 'id '    + @id         if @id
-      list.push 'for <'  + @_for + '>' if @_for
-
-      first = true
-      list.each do |i|
-        strategy.space unless first
-        strategy.meta i
-        first = false
-      end
-      if @date
-        strategy.meta ';'
-        strategy.space
-        strategy.meta time2str(@date)
-      end
-    end
-
-  end
-
-
-  class KeywordsHeader < StructuredHeader
-
-    PARSE_TYPE = :KEYWORDS
-
-    def keys
-      ensure_parsed
-      @keys
-    end
-
-    private
-
-    def init
-      @keys = []
-    end
-
-    def set( a )
-      @keys = a
-    end
-
-    def isempty?
-      @keys.empty?
-    end
-
-    def do_accept( strategy )
-      first = true
-      @keys.each do |i|
-        if first
-          first = false
-        else
-          strategy.meta ','
-        end
-        strategy.meta i
-      end
-    end
-
-  end
-
-
-  class EncryptedHeader < StructuredHeader
-
-    PARSE_TYPE = :ENCRYPTED
-
-    def encrypter
-      ensure_parsed
-      @encrypter
-    end
-
-    def encrypter=( arg )
-      ensure_parsed
-      @encrypter = arg
-    end
-
-    def keyword
-      ensure_parsed
-      @keyword
-    end
-
-    def keyword=( arg )
-      ensure_parsed
-      @keyword = arg
-    end
-
-    private
-
-    def init
-      @encrypter = nil
-      @keyword = nil
-    end
-
-    def set( args )
-      @encrypter, @keyword = args
-    end
-
-    def isempty?
-      not (@encrypter or @keyword)
-    end
-
-    def do_accept( strategy )
-      if @key
-        strategy.meta @encrypter + ','
-        strategy.space
-        strategy.meta @keyword
-      else
-        strategy.meta @encrypter
-      end
-    end
-
-  end
-
-
-  class MimeVersionHeader < StructuredHeader
-
-    PARSE_TYPE = :MIMEVERSION
-
-    def major
-      ensure_parsed
-      @major
-    end
-
-    def major=( arg )
-      ensure_parsed
-      @major = arg
-    end
-
-    def minor
-      ensure_parsed
-      @minor
-    end
-
-    def minor=( arg )
-      ensure_parsed
-      @minor = arg
-    end
-
-    def version
-      sprintf('%d.%d', major, minor)
-    end
-
-    private
-
-    def init
-      @major = nil
-      @minor = nil
-    end
-
-    def set( args )
-      @major, @minor = *args
-    end
-
-    def isempty?
-      not (@major or @minor)
-    end
-
-    def do_accept( strategy )
-      strategy.meta sprintf('%d.%d', @major, @minor)
-    end
-
-  end
-
-
-  class ContentTypeHeader < StructuredHeader
-
-    PARSE_TYPE = :CTYPE
-
-    def main_type
-      ensure_parsed
-      @main
-    end
-
-    def main_type=( arg )
-      ensure_parsed
-      @main = arg.downcase
-    end
-
-    def sub_type
-      ensure_parsed
-      @sub
-    end
-
-    def sub_type=( arg )
-      ensure_parsed
-      @sub = arg.downcase
-    end
-
-    def content_type
-      ensure_parsed
-      @sub ? sprintf('%s/%s', @main, @sub) : @main
-    end
-
-    def params
-      ensure_parsed
-      unless @params.blank?
-        @params.each do |k, v|
-          @params[k] = unquote(v)
-        end
-      end
-      @params
-    end
-
-    def []( key )
-      ensure_parsed
-      @params and unquote(@params[key])
-    end
-
-    def []=( key, val )
-      ensure_parsed
-      (@params ||= {})[key] = val
-    end
-
-    private
-
-    def init
-      @main = @sub = @params = nil
-    end
-
-    def set( args )
-      @main, @sub, @params = *args
-    end
-
-    def isempty?
-      not (@main or @sub)
-    end
-
-    def do_accept( strategy )
-      if @sub
-        strategy.meta sprintf('%s/%s', @main, @sub)
-      else
-        strategy.meta @main
-      end
-      @params.each do |k,v|
-        if v
-          strategy.meta ';'
-          strategy.space
-          strategy.kv_pair k, v
-        end
-      end
-    end
-
-  end
-
-
-  class ContentTransferEncodingHeader < StructuredHeader
-
-    PARSE_TYPE = :CENCODING
-
-    def encoding
-      ensure_parsed
-      @encoding
-    end
-
-    def encoding=( arg )
-      ensure_parsed
-      @encoding = arg
-    end
-
-    private
-
-    def init
-      @encoding = nil
-    end
-
-    def set( s )
-      @encoding = s
-    end
-
-    def isempty?
-      not @encoding
-    end
-
-    def do_accept( strategy )
-      strategy.meta @encoding.capitalize
-    end
-
-  end
-
-
-  class ContentDispositionHeader < StructuredHeader
-
-    PARSE_TYPE = :CDISPOSITION
-
-    def disposition
-      ensure_parsed
-      @disposition
-    end
-
-    def disposition=( str )
-      ensure_parsed
-      @disposition = str.downcase
-    end
-
-    def params
-      ensure_parsed
-      unless @params.blank?
-        @params.each do |k, v|
-          @params[k] = unquote(v)
-        end
-      end
-      @params
-    end
-
-    def []( key )
-      ensure_parsed
-      @params and unquote(@params[key])
-    end
-
-    def []=( key, val )
-      ensure_parsed
-      (@params ||= {})[key] = val
-    end
-
-    private
-
-    def init
-      @disposition = @params = nil
-    end
-
-    def set( args )
-      @disposition, @params = *args
-    end
-
-    def isempty?
-      not @disposition and (not @params or @params.empty?)
-    end
-
-    def do_accept( strategy )
-      strategy.meta @disposition
-      @params.each do |k,v|
-        strategy.meta ';'
-        strategy.space
-        strategy.kv_pair k, unquote(v)
-      end
-    end
-      
-  end
-
-
-  class HeaderField   # redefine
-
-    FNAME_TO_CLASS = {
-      'date'                      => DateTimeHeader,
-      'resent-date'               => DateTimeHeader,
-      'to'                        => AddressHeader,
-      'cc'                        => AddressHeader,
-      'bcc'                       => AddressHeader,
-      'from'                      => AddressHeader,
-      'reply-to'                  => AddressHeader,
-      'resent-to'                 => AddressHeader,
-      'resent-cc'                 => AddressHeader,
-      'resent-bcc'                => AddressHeader,
-      'resent-from'               => AddressHeader,
-      'resent-reply-to'           => AddressHeader,
-      'sender'                    => SingleAddressHeader,
-      'resent-sender'             => SingleAddressHeader,
-      'return-path'               => ReturnPathHeader,
-      'message-id'                => MessageIdHeader,
-      'resent-message-id'         => MessageIdHeader,
-      'in-reply-to'               => ReferencesHeader,
-      'received'                  => ReceivedHeader,
-      'references'                => ReferencesHeader,
-      'keywords'                  => KeywordsHeader,
-      'encrypted'                 => EncryptedHeader,
-      'mime-version'              => MimeVersionHeader,
-      'content-type'              => ContentTypeHeader,
-      'content-transfer-encoding' => ContentTransferEncodingHeader,
-      'content-disposition'       => ContentDispositionHeader,
-      'content-id'                => MessageIdHeader,
-      'subject'                   => UnstructuredHeader,
-      'comments'                  => UnstructuredHeader,
-      'content-description'       => UnstructuredHeader
-    }
-
-  end
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb
deleted file mode 100644
index 554e2fd696..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#:stopdoc:
-# This is here for Rolls. 
-# Rolls uses this instead of lib/tmail.rb.
-
-require 'tmail/version'
-require 'tmail/mail'
-require 'tmail/mailbox'
-require 'tmail/core_extensions'
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb
deleted file mode 100644
index 2fc2dbdfc7..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb
+++ /dev/null
@@ -1,1130 +0,0 @@
-=begin rdoc
-
-= interface.rb Provides an interface to the TMail object
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-# TMail::Mail objects get accessed primarily through the methods in this file.
-# 
-# 
-
-require 'tmail/utils'
-
-module TMail
-
-  class Mail
-
-    # Allows you to query the mail object with a string to get the contents
-    # of the field you want.
-    # 
-    # Returns a string of the exact contents of the field
-    # 
-    #  mail.from = "mikel <mikel@lindsaar.net>"
-    #  mail.header_string("From") #=> "mikel <mikel@lindsaar.net>"
-    def header_string( name, default = nil )
-      h = @header[name.downcase] or return default
-      h.to_s
-    end
-
-    #:stopdoc:
-    #--
-    #== Attributes
-
-    include TextUtils
-
-    def set_string_array_attr( key, strs )
-      strs.flatten!
-      if strs.empty?
-        @header.delete key.downcase
-      else
-        store key, strs.join(', ')
-      end
-      strs
-    end
-    private :set_string_array_attr
-
-    def set_string_attr( key, str )
-      if str
-        store key, str
-      else
-        @header.delete key.downcase
-      end
-      str
-    end
-    private :set_string_attr
-
-    def set_addrfield( name, arg )
-      if arg
-        h = HeaderField.internal_new(name, @config)
-        h.addrs.replace [arg].flatten
-        @header[name] = h
-      else
-        @header.delete name
-      end
-      arg
-    end
-    private :set_addrfield
-
-    def addrs2specs( addrs )
-      return nil unless addrs
-      list = addrs.map {|addr|
-          if addr.address_group?
-          then addr.map {|a| a.spec }
-          else addr.spec
-          end
-      }.flatten
-      return nil if list.empty?
-      list
-    end
-    private :addrs2specs
-
-    #:startdoc:
-
-    #== Date and Time methods
-
-    # Returns the date of the email message as per the "date" header value or returns
-    # nil by default (if no date field exists).  
-    # 
-    # You can also pass whatever default you want into this method and it will return 
-    # that instead of nil if there is no date already set. 
-    def date( default = nil )
-      if h = @header['date']
-        h.date
-      else
-        default
-      end
-    end
-
-    # Destructively sets the date of the mail object with the passed Time instance,
-    # returns a Time instance set to the date/time of the mail
-    # 
-    # Example:
-    # 
-    #  now = Time.now
-    #  mail.date = now
-    #  mail.date #=> Sat Nov 03 18:47:50 +1100 2007
-    #  mail.date.class #=> Time
-    def date=( time )
-      if time
-        store 'Date', time2str(time)
-      else
-        @header.delete 'date'
-      end
-      time
-    end
-
-    # Returns the time of the mail message formatted to your taste using a 
-    # strftime format string.  If no date set returns nil by default or whatever value
-    # you pass as the second optional parameter.
-    # 
-    #  time = Time.now # (on Nov 16 2007)
-    #  mail.date = time
-    #  mail.strftime("%D") #=> "11/16/07"
-    def strftime( fmt, default = nil )
-      if t = date
-        t.strftime(fmt)
-      else
-        default
-      end
-    end
-
-    #== Destination methods
-
-    # Return a TMail::Addresses instance for each entry in the "To:" field of the mail object header.
-    # 
-    # If the "To:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.to_addrs #=> nil
-    #  mail.to_addrs([]) #=> []
-    #  mail.to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.to_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def to_addrs( default = nil )
-      if h = @header['to']
-        h.addrs
-      else
-        default
-      end
-    end
-
-    # Return a TMail::Addresses instance for each entry in the "Cc:" field of the mail object header.
-    # 
-    # If the "Cc:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.cc_addrs #=> nil
-    #  mail.cc_addrs([]) #=> []
-    #  mail.cc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.cc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-     def cc_addrs( default = nil )
-      if h = @header['cc']
-        h.addrs
-      else
-        default
-      end
-    end
-
-    # Return a TMail::Addresses instance for each entry in the "Bcc:" field of the mail object header.
-    # 
-    # If the "Bcc:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.bcc_addrs #=> nil
-    #  mail.bcc_addrs([]) #=> []
-    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.bcc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def bcc_addrs( default = nil )
-      if h = @header['bcc']
-        h.addrs
-      else
-        default
-      end
-    end
-
-    # Destructively set the to field of the "To:" header to equal the passed in string.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.to_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def to_addrs=( arg )
-      set_addrfield 'to', arg
-    end
-
-    # Destructively set the to field of the "Cc:" header to equal the passed in string.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.cc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.cc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def cc_addrs=( arg )
-      set_addrfield 'cc', arg
-    end
-
-    # Destructively set the to field of the "Bcc:" header to equal the passed in string.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.bcc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def bcc_addrs=( arg )
-      set_addrfield 'bcc', arg
-    end
-
-    # Returns who the email is to as an Array of email addresses as opposed to an Array of 
-    # TMail::Address objects which is what Mail#to_addrs returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.to #=>  ["mikel@me.org", "mikel@you.org"]
-    def to( default = nil )
-      addrs2specs(to_addrs(nil)) || default
-    end
-
-    # Returns who the email cc'd as an Array of email addresses as opposed to an Array of 
-    # TMail::Address objects which is what Mail#to_addrs returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.cc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.cc #=>  ["mikel@me.org", "mikel@you.org"]
-    def cc( default = nil )
-      addrs2specs(cc_addrs(nil)) || default
-    end
-
-    # Returns who the email bcc'd as an Array of email addresses as opposed to an Array of 
-    # TMail::Address objects which is what Mail#to_addrs returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.bcc #=>  ["mikel@me.org", "mikel@you.org"]
-    def bcc( default = nil )
-      addrs2specs(bcc_addrs(nil)) || default
-    end
-
-    # Destructively sets the "To:" field to the passed array of strings (which should be valid 
-    # email addresses)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.to = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
-    #  mail.to #=>  ["mikel@abc.org", "mikel@xyz.org"]
-    #  mail['to'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def to=( *strs )
-      set_string_array_attr 'To', strs
-    end
-
-    # Destructively sets the "Cc:" field to the passed array of strings (which should be valid 
-    # email addresses)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.cc = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
-    #  mail.cc #=>  ["mikel@abc.org", "mikel@xyz.org"]
-    #  mail['cc'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def cc=( *strs )
-      set_string_array_attr 'Cc', strs
-    end
-
-    # Destructively sets the "Bcc:" field to the passed array of strings (which should be valid 
-    # email addresses)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.bcc = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
-    #  mail.bcc #=>  ["mikel@abc.org", "mikel@xyz.org"]
-    #  mail['bcc'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def bcc=( *strs )
-      set_string_array_attr 'Bcc', strs
-    end
-
-    #== Originator methods
-
-    # Return a TMail::Addresses instance for each entry in the "From:" field of the mail object header.
-    # 
-    # If the "From:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.from_addrs #=> nil
-    #  mail.from_addrs([]) #=> []
-    #  mail.from = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.from_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def from_addrs( default = nil )
-      if h = @header['from']
-        h.addrs
-      else
-        default
-      end
-    end
-
-    # Destructively set the to value of the "From:" header to equal the passed in string.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.from_addrs = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.from_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def from_addrs=( arg )
-      set_addrfield 'from', arg
-    end
-
-    # Returns who the email is from as an Array of email address strings instead to an Array of 
-    # TMail::Address objects which is what Mail#from_addrs returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.from = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.from #=>  ["mikel@me.org", "mikel@you.org"]
-    def from( default = nil )
-      addrs2specs(from_addrs(nil)) || default
-    end
-
-    # Destructively sets the "From:" field to the passed array of strings (which should be valid 
-    # email addresses)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.from = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
-    #  mail.from #=>  ["mikel@abc.org", "mikel@xyz.org"]
-    #  mail['from'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def from=( *strs )
-      set_string_array_attr 'From', strs
-    end
-
-    # Returns the "friendly" human readable part of the address
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.from = "Mikel Lindsaar <mikel@abc.com>"
-    #  mail.friendly_from #=> "Mikel Lindsaar"
-    def friendly_from( default = nil )
-      h = @header['from']
-      a, = h.addrs
-      return default unless a
-      return a.phrase if a.phrase
-      return h.comments.join(' ') unless h.comments.empty?
-      a.spec
-    end
-
-    # Return a TMail::Addresses instance for each entry in the "Reply-To:" field of the mail object header.
-    # 
-    # If the "Reply-To:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.reply_to_addrs #=> nil
-    #  mail.reply_to_addrs([]) #=> []
-    #  mail.reply_to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.reply_to_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def reply_to_addrs( default = nil )
-      if h = @header['reply-to']
-        h.addrs.blank? ? default : h.addrs
-      else
-        default
-      end
-    end
-
-    # Destructively set the to value of the "Reply-To:" header to equal the passed in argument.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.reply_to_addrs = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.reply_to_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def reply_to_addrs=( arg )
-      set_addrfield 'reply-to', arg
-    end
-
-    # Returns who the email is from as an Array of email address strings instead to an Array of 
-    # TMail::Address objects which is what Mail#reply_to_addrs returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.reply_to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.reply_to #=>  ["mikel@me.org", "mikel@you.org"]
-    def reply_to( default = nil )
-      addrs2specs(reply_to_addrs(nil)) || default
-    end
-
-    # Destructively sets the "Reply-To:" field to the passed array of strings (which should be valid 
-    # email addresses)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.reply_to = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
-    #  mail.reply_to #=>  ["mikel@abc.org", "mikel@xyz.org"]
-    #  mail['reply_to'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def reply_to=( *strs )
-      set_string_array_attr 'Reply-To', strs
-    end
-
-    # Return a TMail::Addresses instance of the "Sender:" field of the mail object header.
-    # 
-    # If the "Sender:" field does not exist, will return nil by default or the value you
-    # pass as the optional parameter.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.sender #=> nil
-    #  mail.sender([]) #=> []
-    #  mail.sender = "Mikel <mikel@me.org>"
-    #  mail.reply_to_addrs #=>  [#<TMail::Address mikel@me.org>]
-    def sender_addr( default = nil )
-      f = @header['sender'] or return default
-      f.addr                or return default
-    end
-
-    # Destructively set the to value of the "Sender:" header to equal the passed in argument.
-    # 
-    # TMail will parse your contents and turn each valid email address into a TMail::Address 
-    # object before assigning it to the mail message.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.sender_addrs = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
-    #  mail.sender_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def sender_addr=( addr )
-      if addr
-        h = HeaderField.internal_new('sender', @config)
-        h.addr = addr
-        @header['sender'] = h
-      else
-        @header.delete 'sender'
-      end
-      addr
-    end
-
-    # Returns who the sender of this mail is as string instead to an Array of 
-    # TMail::Address objects which is what Mail#sender_addr returns
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.sender = "Mikel <mikel@me.org>"
-    #  mail.sender #=>  "mikel@me.org"
-    def sender( default = nil )
-      f = @header['sender'] or return default
-      a = f.addr            or return default
-      a.spec
-    end
-
-    # Destructively sets the "Sender:" field to the passed string (which should be a valid 
-    # email address)
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.sender = "mikel@abc.com"
-    #  mail.sender #=>  "mikel@abc.org"
-    #  mail['sender'].to_s #=> "mikel@abc.com"
-    def sender=( str )
-      set_string_attr 'Sender', str
-    end
-
-    #== Subject methods
-
-    # Returns the subject of the mail instance.
-    # 
-    # If the subject field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.subject #=> nil
-    #  mail.subject("") #=> ""
-    #  mail.subject = "Hello"
-    #  mail.subject #=> "Hello"
-    def subject( default = nil )
-      if h = @header['subject']
-        h.body
-      else
-        default
-      end
-    end
-    alias quoted_subject subject
-
-    # Destructively sets the passed string as the subject of the mail message.
-    # 
-    # Example
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.subject #=> "This subject"
-    #  mail.subject = "Another subject"
-    #  mail.subject #=> "Another subject"
-    def subject=( str )
-      set_string_attr 'Subject', str
-    end
-
-    #== Message Identity & Threading Methods
-    
-    # Returns the message ID for this mail object instance.
-    # 
-    # If the message_id field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.message_id #=> nil
-    #  mail.message_id(TMail.new_message_id) #=> "<47404c5326d9c_2ad4fbb80161@baci.local.tmail>"
-    #  mail.message_id = TMail.new_message_id
-    #  mail.message_id #=> "<47404c5326d9c_2ad4fbb80161@baci.local.tmail>"
-    def message_id( default = nil )
-      if h = @header['message-id']
-        h.id || default
-      else
-        default
-      end
-    end
-
-    # Destructively sets the message ID of the mail object instance to the passed in string
-    # 
-    # Invalid message IDs are ignored (silently, unless configured otherwise) and result in 
-    # a nil message ID.  Left and right angle brackets are required.
-    #
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.message_id = "<348F04F142D69C21-291E56D292BC@xxxx.net>"
-    #  mail.message_id #=> "<348F04F142D69C21-291E56D292BC@xxxx.net>"
-    #  mail.message_id = "this_is_my_badly_formatted_message_id"
-    #  mail.message_id #=> nil
-    def message_id=( str )
-      set_string_attr 'Message-Id', str
-    end
-
-    # Returns the "In-Reply-To:" field contents as an array of this mail instance if it exists
-    # 
-    # If the in_reply_to field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.in_reply_to #=> nil
-    #  mail.in_reply_to([]) #=> []
-    #  TMail::Mail.load("../test/fixtures/raw_email_reply")
-    #  mail.in_reply_to #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def in_reply_to( default = nil )
-      if h = @header['in-reply-to']
-        h.ids
-      else
-        default
-      end
-    end
-
-    # Destructively sets the value of the "In-Reply-To:" field of an email.
-    # 
-    # Accepts an array of a single string of a message id
-    #
-    # Example: 
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.in_reply_to = ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    #  mail.in_reply_to #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def in_reply_to=( *idstrs )
-      set_string_array_attr 'In-Reply-To', idstrs
-    end
-
-    # Returns the references of this email (prior messages relating to this message)
-    # as an array of message ID strings.  Useful when you are trying to thread an
-    # email.
-    # 
-    # If the references field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    #
-    #  mail = TMail::Mail.new
-    #  mail.references #=> nil
-    #  mail.references([]) #=> []
-    #  mail = TMail::Mail.load("../test/fixtures/raw_email_reply")
-    #  mail.references #=> ["<473FF3B8.9020707@xxx.org>", "<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def references( default = nil )
-      if h = @header['references']
-        h.refs
-      else
-        default
-      end
-    end
-
-    # Destructively sets the value of the "References:" field of an email.
-    # 
-    # Accepts an array of strings of message IDs
-    #
-    # Example: 
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.references = ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    #  mail.references #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def references=( *strs )
-      set_string_array_attr 'References', strs
-    end
-
-    #== MIME header methods
-
-    # Returns the listed MIME version of this email from the "Mime-Version:" header field
-    # 
-    # If the mime_version field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    #
-    #  mail = TMail::Mail.new
-    #  mail.mime_version #=> nil
-    #  mail.mime_version([]) #=> []
-    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
-    #  mail.mime_version #=> "1.0"
-    def mime_version( default = nil )
-      if h = @header['mime-version']
-        h.version || default
-      else
-        default
-      end
-    end
-
-    def mime_version=( m, opt = nil )
-      if opt
-        if h = @header['mime-version']
-          h.major = m
-          h.minor = opt
-        else
-          store 'Mime-Version', "#{m}.#{opt}"
-        end
-      else
-        store 'Mime-Version', m
-      end
-      m
-    end
-
-    # Returns the current "Content-Type" of the mail instance.
-    #
-    # If the content_type field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    #
-    #  mail = TMail::Mail.new
-    #  mail.content_type #=> nil
-    #  mail.content_type([]) #=> []
-    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
-    #  mail.content_type #=> "text/plain"
-    def content_type( default = nil )
-      if h = @header['content-type']
-        h.content_type || default
-      else
-        default
-      end
-    end
-
-    # Returns the current main type of the "Content-Type" of the mail instance.
-    #
-    # If the content_type field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    #
-    #  mail = TMail::Mail.new
-    #  mail.main_type #=> nil
-    #  mail.main_type([]) #=> []
-    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
-    #  mail.main_type #=> "text"
-    def main_type( default = nil )
-      if h = @header['content-type']
-        h.main_type || default
-      else
-        default
-      end
-    end
-
-    # Returns the current sub type of the "Content-Type" of the mail instance.
-    #
-    # If the content_type field does not exist, returns nil by default or you can pass in as
-    # the parameter for what you want the default value to be.
-    # 
-    # Example:
-    #
-    #  mail = TMail::Mail.new
-    #  mail.sub_type #=> nil
-    #  mail.sub_type([]) #=> []
-    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
-    #  mail.sub_type #=> "plain"
-    def sub_type( default = nil )
-      if h = @header['content-type']
-        h.sub_type || default
-      else
-        default
-      end
-    end
-
-    # Destructively sets the "Content-Type:" header field of this mail object
-    # 
-    # Allows you to set the main type, sub type as well as parameters to the field.
-    # The main type and sub type need to be a string.
-    # 
-    # The optional params hash can be passed with keys as symbols and values as a string,
-    # or strings as keys and values.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.set_content_type("text", "plain")
-    #  mail.to_s #=> "Content-Type: text/plain\n\n"
-    # 
-    #  mail.set_content_type("text", "plain", {:charset => "EUC-KR", :format => "flowed"})
-    #  mail.to_s #=> "Content-Type: text/plain; charset=EUC-KR; format=flowed\n\n"
-    #
-    #  mail.set_content_type("text", "plain", {"charset" => "EUC-KR", "format" => "flowed"})
-    #  mail.to_s #=> "Content-Type: text/plain; charset=EUC-KR; format=flowed\n\n"
-    def set_content_type( str, sub = nil, param = nil )
-      if sub
-        main, sub = str, sub
-      else
-        main, sub = str.split(%r</>, 2)
-        raise ArgumentError, "sub type missing: #{str.inspect}" unless sub
-      end
-      if h = @header['content-type']
-        h.main_type = main
-        h.sub_type  = sub
-        h.params.clear
-      else
-        store 'Content-Type', "#{main}/#{sub}"
-      end
-      @header['content-type'].params.replace param if param
-      str
-    end
-
-    alias content_type= set_content_type
-    
-    # Returns the named type parameter as a string, from the "Content-Type:" header.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.type_param("charset") #=> nil
-    #  mail.type_param("charset", []) #=> []
-    #  mail.set_content_type("text", "plain", {:charset => "EUC-KR", :format => "flowed"})
-    #  mail.type_param("charset") #=> "EUC-KR"
-    #  mail.type_param("format") #=> "flowed"
-    def type_param( name, default = nil )
-      if h = @header['content-type']
-        h[name] || default
-      else
-        default
-      end
-    end
-
-    # Returns the character set of the email.  Returns nil if no encoding set or returns
-    # whatever default you pass as a parameter - note passing the parameter does NOT change
-    # the mail object in any way.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.load("path_to/utf8_email")
-    #  mail.charset #=> "UTF-8"
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.charset #=> nil
-    #  mail.charset("US-ASCII") #=> "US-ASCII"
-    def charset( default = nil )
-      if h = @header['content-type']
-        h['charset'] or default
-      else
-        default
-      end
-    end
-
-    # Destructively sets the character set used by this mail object to the passed string, you
-    # should note though that this does nothing to the mail body, just changes the header
-    # value, you will need to transliterate the body as well to match whatever you put 
-    # in this header value if you are changing character sets.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.charset #=> nil
-    #  mail.charset = "UTF-8"
-    #  mail.charset #=> "UTF-8"
-    def charset=( str )
-      if str
-        if h = @header[ 'content-type' ]
-          h['charset'] = str
-        else
-          store 'Content-Type', "text/plain; charset=#{str}"
-        end
-      end
-      str
-    end
-
-    # Returns the transfer encoding of the email.  Returns nil if no encoding set or returns
-    # whatever default you pass as a parameter - note passing the parameter does NOT change
-    # the mail object in any way.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.load("path_to/base64_encoded_email")
-    #  mail.transfer_encoding #=> "base64"
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.transfer_encoding #=> nil
-    #  mail.transfer_encoding("base64") #=> "base64"
-    def transfer_encoding( default = nil )
-      if h = @header['content-transfer-encoding']
-        h.encoding || default
-      else
-        default
-      end
-    end
-
-    # Destructively sets the transfer encoding of the mail object to the passed string, you
-    # should note though that this does nothing to the mail body, just changes the header
-    # value, you will need to encode or decode the body as well to match whatever you put 
-    # in this header value.
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.new
-    #  mail.transfer_encoding #=> nil
-    #  mail.transfer_encoding = "base64"
-    #  mail.transfer_encoding #=> "base64"
-    def transfer_encoding=( str )
-      set_string_attr 'Content-Transfer-Encoding', str
-    end
-
-    alias encoding                   transfer_encoding
-    alias encoding=                  transfer_encoding=
-    alias content_transfer_encoding  transfer_encoding
-    alias content_transfer_encoding= transfer_encoding=
-
-    # Returns the content-disposition of the mail object, returns nil or the passed 
-    # default value if given
-    # 
-    # Example:
-    # 
-    #  mail = TMail::Mail.load("path_to/raw_mail_with_attachment") 
-    #  mail.disposition #=> "attachment"
-    #
-    #  mail = TMail::Mail.load("path_to/plain_simple_email")
-    #  mail.disposition #=> nil
-    #  mail.disposition(false) #=> false
-    def disposition( default = nil )
-      if h = @header['content-disposition']
-        h.disposition || default
-      else
-        default
-      end
-    end
-
-    alias content_disposition     disposition
-
-    # Allows you to set the content-disposition of the mail object.  Accepts a type
-    # and a hash of parameters.
-    # 
-    # Example:
-    # 
-    #  mail.set_disposition("attachment", {:filename => "test.rb"})
-    #  mail.disposition #=> "attachment"
-    #  mail['content-disposition'].to_s #=> "attachment; filename=test.rb"
-    def set_disposition( str, params = nil )
-      if h = @header['content-disposition']
-        h.disposition = str
-        h.params.clear
-      else
-        store('Content-Disposition', str)
-        h = @header['content-disposition']
-      end
-      h.params.replace params if params
-    end
-
-    alias disposition=            set_disposition
-    alias set_content_disposition set_disposition
-    alias content_disposition=    set_disposition
-
-    # Returns the value of a parameter in an existing content-disposition header
-    # 
-    # Example:
-    # 
-    #  mail.set_disposition("attachment", {:filename => "test.rb"})
-    #  mail['content-disposition'].to_s #=> "attachment; filename=test.rb"
-    #  mail.disposition_param("filename") #=> "test.rb"
-    #  mail.disposition_param("missing_param_key") #=> nil
-    #  mail.disposition_param("missing_param_key", false) #=> false
-    #  mail.disposition_param("missing_param_key", "Nothing to see here") #=> "Nothing to see here"
-    def disposition_param( name, default = nil )
-      if h = @header['content-disposition']
-        h[name] || default
-      else
-        default
-      end
-    end
-
-    # Convert the Mail object's body into a Base64 encoded email
-    # returning the modified Mail object
-    def base64_encode!
-      store 'Content-Transfer-Encoding', 'Base64'
-      self.body = base64_encode
-    end
-
-    # Return the result of encoding the TMail::Mail object body
-    # without altering the current body
-    def base64_encode
-      Base64.folding_encode(self.body)
-    end
-
-    # Convert the Mail object's body into a Base64 decoded email
-    # returning the modified Mail object
-    def base64_decode!
-      if /base64/i === self.transfer_encoding('')
-        store 'Content-Transfer-Encoding', '8bit'
-        self.body = base64_decode
-      end
-    end
-
-    # Returns the result of decoding the TMail::Mail object body
-    # without altering the current body
-    def base64_decode
-      Base64.decode(self.body, @config.strict_base64decode?)
-    end
-
-    # Returns an array of each destination in the email message including to: cc: or bcc:
-    # 
-    # Example:
-    # 
-    #  mail.to = "Mikel <mikel@lindsaar.net>"
-    #  mail.cc = "Trans <t@t.com>"
-    #  mail.bcc = "bob <bob@me.com>"
-    #  mail.destinations #=> ["mikel@lindsaar.net", "t@t.com", "bob@me.com"]
-    def destinations( default = nil )
-      ret = []
-      %w( to cc bcc ).each do |nm|
-        if h = @header[nm]
-          h.addrs.each {|i| ret.push i.address }
-        end
-      end
-      ret.empty? ? default : ret
-    end
-
-    # Yields a block of destination, yielding each as a string.
-    #  (from the destinations example)
-    #  mail.each_destination { |d| puts "#{d.class}: #{d}" }
-    #  String: mikel@lindsaar.net
-    #  String: t@t.com
-    #  String: bob@me.com
-    def each_destination( &block )
-      destinations([]).each do |i|
-        if Address === i
-          yield i
-        else
-          i.each(&block)
-        end
-      end
-    end
-
-    alias each_dest each_destination
-
-    # Returns an array of reply to addresses that the Mail object has, 
-    # or if the Mail message has no reply-to, returns an array of the
-    # Mail objects from addresses.  Else returns the default which can
-    # either be passed as a parameter or defaults to nil
-    # 
-    # Example:
-    #  mail.from = "Mikel <mikel@lindsaar.net>"
-    #  mail.reply_to = nil
-    #  mail.reply_addresses #=> [""]  
-    # 
-    def reply_addresses( default = nil )
-      reply_to_addrs(nil) or from_addrs(nil) or default
-    end
-
-    # Returns the "sender" field as an array -> useful to find out who to 
-    # send an error email to.
-    def error_reply_addresses( default = nil )
-      if s = sender(nil)
-        [s]
-      else
-        from_addrs(default)
-      end
-    end
-
-    # Returns true if the Mail object is a multipart message
-    def multipart?
-      main_type('').downcase == 'multipart'
-    end
-
-    # Creates a new email in reply to self.  Sets the In-Reply-To and
-    # References headers for you automagically.
-    #
-    # Example:
-    #  mail = TMail::Mail.load("my_email")
-    #  reply_email = mail.create_reply
-    #  reply_email.class         #=> TMail::Mail
-    #  reply_email.references  #=> ["<d3b8cf8e49f04480850c28713a1f473e@lindsaar.net>"]
-    #  reply_email.in_reply_to #=> ["<d3b8cf8e49f04480850c28713a1f473e@lindsaar.net>"]
-    def create_reply
-      setup_reply create_empty_mail()
-    end
-
-    # Creates a new email in reply to self.  Sets the In-Reply-To and
-    # References headers for you automagically.
-    #
-    # Example:
-    #  mail = TMail::Mail.load("my_email")
-    #  forward_email = mail.create_forward
-    #  forward_email.class         #=> TMail::Mail
-    #  forward_email.content_type  #=> "multipart/mixed"
-    #  forward_email.body          #=> "Attachment: (unnamed)"
-    #  forward_email.encoded       #=> Returns the original email as a MIME attachment
-    def create_forward
-      setup_forward create_empty_mail()
-    end
-
-    #:stopdoc:
-    private
-
-    def create_empty_mail
-      self.class.new(StringPort.new(''), @config)
-    end
-
-    def setup_reply( mail )
-      if tmp = reply_addresses(nil)
-        mail.to_addrs = tmp
-      end
-
-      mid = message_id(nil)
-      tmp = references(nil) || []
-      tmp.push mid if mid
-      mail.in_reply_to = [mid] if mid
-      mail.references = tmp unless tmp.empty?
-      mail.subject = 'Re: ' + subject('').sub(/\A(?:\[[^\]]+\])?(?:\s*Re:)*\s*/i, '')
-      mail.mime_version = '1.0'
-      mail
-    end
-
-    def setup_forward( mail )
-      m = Mail.new(StringPort.new(''))
-      m.body = decoded
-      m.set_content_type 'message', 'rfc822'
-      m.encoding = encoding('7bit')
-      mail.parts.push m
-      # call encoded to reparse the message
-      mail.encoded
-      mail
-    end
-
-  #:startdoc:
-  end   # class Mail
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb
deleted file mode 100644
index 6c0e251102..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-#:stopdoc:
-require 'tmail/mailbox'
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb
deleted file mode 100644
index 23a3f75de3..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb
+++ /dev/null
@@ -1,579 +0,0 @@
-=begin rdoc
-
-= Mail class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
- 
-
-require 'tmail/interface'
-require 'tmail/encode'
-require 'tmail/header'
-require 'tmail/port'
-require 'tmail/config'
-require 'tmail/utils'
-require 'tmail/attachments'
-require 'tmail/quoting'
-require 'socket'
-
-module TMail
-
-  # == Mail Class
-  # 
-  # Accessing a TMail object done via the TMail::Mail class.  As email can be fairly complex
-  # creatures, you will find a large amount of accessor and setter methods in this class!
-  # 
-  # Most of the below methods handle the header, in fact, what TMail does best is handle the
-  # header of the email object.  There are only a few methods that deal directly with the body
-  # of the email, such as base64_encode and base64_decode.
-  # 
-  # === Using TMail inside your code
-  # 
-  # The usual way is to install the gem (see the {README}[link:/README] on how to do this) and
-  # then put at the top of your class:
-  # 
-  #  require 'tmail'
-  # 
-  # You can then create a new TMail object in your code with:
-  # 
-  #  @email = TMail::Mail.new
-  # 
-  # Or if you have an email as a string, you can initialize a new TMail::Mail object and get it
-  # to parse that string for you like so:
-  # 
-  #  @email = TMail::Mail.parse(email_text)
-  # 
-  # You can also read a single email off the disk, for example:
-  # 
-  #  @email = TMail::Mail.load('filename.txt')
-  # 
-  # Also, you can read a mailbox (usual unix mbox format) and end up with an array of TMail
-  # objects by doing something like this:
-  # 
-  #  # Note, we pass true as the last variable to open the mailbox read only
-  #  mailbox = TMail::UNIXMbox.new("mailbox", nil, true)
-  #  @emails = []
-  #  mailbox.each_port { |m| @emails << TMail::Mail.new(m) }
-  #
-  class Mail
-
-    class << self
-      
-      # Opens an email that has been saved out as a file by itself.
-      # 
-      # This function will read a file non-destructively and then parse
-      # the contents and return a TMail::Mail object.
-      # 
-      # Does not handle multiple email mailboxes (like a unix mbox) for that
-      # use the TMail::UNIXMbox class.
-      # 
-      # Example:
-      #  mail = TMail::Mail.load('filename')
-      # 
-      def load( fname )
-        new(FilePort.new(fname))
-      end
-
-      alias load_from load
-      alias loadfrom load
-      
-      # Parses an email from the supplied string and returns a TMail::Mail
-      # object.
-      # 
-      # Example:
-      #  require 'rubygems'; require 'tmail'
-      #  email_string =<<HEREDOC
-      #  To: mikel@lindsaar.net
-      #  From: mikel@me.com
-      #  Subject: This is a short Email
-      #  
-      #  Hello there Mikel!
-      #  
-      #  HEREDOC
-      #  mail = TMail::Mail.parse(email_string)
-      #  #=> #<TMail::Mail port=#<TMail::StringPort:id=0xa30ac0> bodyport=nil>
-      #  mail.body
-      #  #=> "Hello there Mikel!\n\n"
-      def parse( str )
-        new(StringPort.new(str))
-      end
-
-    end
-
-    def initialize( port = nil, conf = DEFAULT_CONFIG ) #:nodoc:
-      @port = port || StringPort.new
-      @config = Config.to_config(conf)
-
-      @header      = {}
-      @body_port   = nil
-      @body_parsed = false
-      @epilogue    = ''
-      @parts       = []
-
-      @port.ropen {|f|
-          parse_header f
-          parse_body f unless @port.reproducible?
-      }
-    end
-
-    # Provides access to the port this email is using to hold it's data
-    # 
-    # Example:
-    #  mail = TMail::Mail.parse(email_string)
-    #  mail.port
-    #  #=> #<TMail::StringPort:id=0xa2c952>
-    attr_reader :port
-
-    def inspect
-      "\#<#{self.class} port=#{@port.inspect} bodyport=#{@body_port.inspect}>"
-    end
-
-    #
-    # to_s interfaces
-    #
-
-    public
-
-    include StrategyInterface
-
-    def write_back( eol = "\n", charset = 'e' )
-      parse_body
-      @port.wopen {|stream| encoded eol, charset, stream }
-    end
-
-    def accept( strategy )
-      with_multipart_encoding(strategy) {
-          ordered_each do |name, field|
-            next if field.empty?
-            strategy.header_name canonical(name)
-            field.accept strategy
-            strategy.puts
-          end
-          strategy.puts
-          body_port().ropen {|r|
-              strategy.write r.read
-          }
-      }
-    end
-
-    private
-
-    def canonical( name )
-      name.split(/-/).map {|s| s.capitalize }.join('-')
-    end
-
-    def with_multipart_encoding( strategy )
-      if parts().empty?    # DO NOT USE @parts
-        yield
-
-      else
-        bound = ::TMail.new_boundary
-        if @header.key? 'content-type'
-          @header['content-type'].params['boundary'] = bound
-        else
-          store 'Content-Type', %<multipart/mixed; boundary="#{bound}">
-        end
-
-        yield
-
-        parts().each do |tm|
-          strategy.puts
-          strategy.puts '--' + bound
-          tm.accept strategy
-        end
-        strategy.puts
-        strategy.puts '--' + bound + '--'
-        strategy.write epilogue()
-      end
-    end
-
-    ###
-    ### header
-    ###
-
-    public
-
-    ALLOW_MULTIPLE = {
-      'received'          => true,
-      'resent-date'       => true,
-      'resent-from'       => true,
-      'resent-sender'     => true,
-      'resent-to'         => true,
-      'resent-cc'         => true,
-      'resent-bcc'        => true,
-      'resent-message-id' => true,
-      'comments'          => true,
-      'keywords'          => true
-    }
-    USE_ARRAY = ALLOW_MULTIPLE
-
-    def header
-      @header.dup
-    end
-
-    # Returns a TMail::AddressHeader object of the field you are querying.
-    # Examples:
-    #  @mail['from']  #=> #<TMail::AddressHeader "mikel@test.com.au">
-    #  @mail['to']    #=> #<TMail::AddressHeader "mikel@test.com.au">
-    #
-    # You can get the string value of this by passing "to_s" to the query:
-    # Example:
-    #  @mail['to'].to_s #=> "mikel@test.com.au"
-    def []( key )
-      @header[key.downcase]
-    end
-
-    def sub_header(key, param)
-      (hdr = self[key]) ? hdr[param] : nil
-    end
-
-    alias fetch []
-
-    # Allows you to set or delete TMail header objects at will.
-    # Examples:
-    #  @mail = TMail::Mail.new
-    #  @mail['to'].to_s       # => 'mikel@test.com.au'
-    #  @mail['to'] = 'mikel@elsewhere.org'
-    #  @mail['to'].to_s       # => 'mikel@elsewhere.org'
-    #  @mail.encoded          # => "To: mikel@elsewhere.org\r\n\r\n"
-    #  @mail['to'] = nil
-    #  @mail['to'].to_s       # => nil
-    #  @mail.encoded          # => "\r\n"
-    # 
-    # Note: setting mail[] = nil actually deletes the header field in question from the object,
-    # it does not just set the value of the hash to nil
-    def []=( key, val )
-      dkey = key.downcase
-
-      if val.nil?
-        @header.delete dkey
-        return nil
-      end
-
-      case val
-      when String
-        header = new_hf(key, val)
-      when HeaderField
-        ;
-      when Array
-        ALLOW_MULTIPLE.include? dkey or
-                raise ArgumentError, "#{key}: Header must not be multiple"
-        @header[dkey] = val
-        return val
-      else
-        header = new_hf(key, val.to_s)
-      end
-      if ALLOW_MULTIPLE.include? dkey
-        (@header[dkey] ||= []).push header
-      else
-        @header[dkey] = header
-      end
-
-      val
-    end
-
-    alias store []=
-    
-    # Allows you to loop through each header in the TMail::Mail object in a block
-    # Example:
-    #   @mail['to'] = 'mikel@elsewhere.org'
-    #   @mail['from'] = 'me@me.com'
-    #   @mail.each_header { |k,v| puts "#{k} = #{v}" }
-    #   # => from = me@me.com
-    #   # => to = mikel@elsewhere.org
-    def each_header
-      @header.each do |key, val|
-        [val].flatten.each {|v| yield key, v }
-      end
-    end
-
-    alias each_pair each_header
-
-    def each_header_name( &block )
-      @header.each_key(&block)
-    end
-
-    alias each_key each_header_name
-
-    def each_field( &block )
-      @header.values.flatten.each(&block)
-    end
-
-    alias each_value each_field
-
-    FIELD_ORDER = %w(
-      return-path received
-      resent-date resent-from resent-sender resent-to
-      resent-cc resent-bcc resent-message-id
-      date from sender reply-to to cc bcc
-      message-id in-reply-to references
-      subject comments keywords
-      mime-version content-type content-transfer-encoding
-      content-disposition content-description
-    )
-
-    def ordered_each
-      list = @header.keys
-      FIELD_ORDER.each do |name|
-        if list.delete(name)
-          [@header[name]].flatten.each {|v| yield name, v }
-        end
-      end
-      list.each do |name|
-        [@header[name]].flatten.each {|v| yield name, v }
-      end
-    end
-
-    def clear
-      @header.clear
-    end
-
-    def delete( key )
-      @header.delete key.downcase
-    end
-
-    def delete_if
-      @header.delete_if do |key,val|
-        if Array === val
-          val.delete_if {|v| yield key, v }
-          val.empty?
-        else
-          yield key, val
-        end
-      end
-    end
-
-    def keys
-      @header.keys
-    end
-
-    def key?( key )
-      @header.key? key.downcase
-    end
-
-    def values_at( *args )
-      args.map {|k| @header[k.downcase] }.flatten
-    end
-
-    alias indexes values_at
-    alias indices values_at
-
-    private
-
-    def parse_header( f )
-      name = field = nil
-      unixfrom = nil
-
-      while line = f.gets
-        case line
-        when /\A[ \t]/             # continue from prev line
-          raise SyntaxError, 'mail is began by space' unless field
-          field << ' ' << line.strip
-
-        when /\A([^\: \t]+):\s*/   # new header line
-          add_hf name, field if field
-          name = $1
-          field = $' #.strip
-
-        when /\A\-*\s*\z/          # end of header
-          add_hf name, field if field
-          name = field = nil
-          break
-
-        when /\AFrom (\S+)/
-          unixfrom = $1
-
-        when /^charset=.*/
-
-        else
-          raise SyntaxError, "wrong mail header: '#{line.inspect}'"
-        end
-      end
-      add_hf name, field if name
-
-      if unixfrom
-        add_hf 'Return-Path', "<#{unixfrom}>" unless @header['return-path']
-      end
-    end
-
-    def add_hf( name, field )
-      key = name.downcase
-      field = new_hf(name, field)
-
-      if ALLOW_MULTIPLE.include? key
-        (@header[key] ||= []).push field
-      else
-        @header[key] = field
-      end
-    end
-
-    def new_hf( name, field )
-      HeaderField.new(name, field, @config)
-    end
-
-    ###
-    ### body
-    ###
-
-    public
-
-    def body_port
-      parse_body
-      @body_port
-    end
-
-    def each( &block )
-      body_port().ropen {|f| f.each(&block) }
-    end
-
-    def quoted_body
-      body_port.ropen {|f| return f.read }
-    end
-
-    def quoted_body= str
-      body_port.wopen { |f| f.write str }
-      str
-    end
-
-    def body=( str )
-      # Sets the body of the email to a new (encoded) string.
-      # 
-      # We also reparses the email if the body is ever reassigned, this is a performance hit, however when
-      # you assign the body, you usually want to be able to make sure that you can access the attachments etc.
-      # 
-      # Usage:
-      # 
-      #  mail.body = "Hello, this is\nthe body text"
-      #  # => "Hello, this is\nthe body"
-      #  mail.body
-      #  # => "Hello, this is\nthe body"
-      @body_parsed = false
-      parse_body(StringInput.new(str))
-      parse_body
-      @body_port.wopen {|f| f.write str }
-      str
-    end
-
-    alias preamble  quoted_body
-    alias preamble= quoted_body=
-
-    def epilogue
-      parse_body
-      @epilogue.dup
-    end
-
-    def epilogue=( str )
-      parse_body
-      @epilogue = str
-      str
-    end
-
-    def parts
-      parse_body
-      @parts
-    end
-    
-    def each_part( &block )
-      parts().each(&block)
-    end
-    
-    # Returns true if the content type of this part of the email is
-    # a disposition attachment
-    def disposition_is_attachment?
-      (self['content-disposition'] && self['content-disposition'].disposition == "attachment")
-    end
-
-    # Returns true if this part's content main type is text, else returns false.
-    # By main type is meant "text/plain" is text.  "text/html" is text
-    def content_type_is_text?
-      self.header['content-type'] && (self.header['content-type'].main_type != "text")
-    end
-
-    private
-
-    def parse_body( f = nil )
-      return if @body_parsed
-      
-      if f
-        parse_body_0 f
-      else
-        @port.ropen {|f|
-            skip_header f
-            parse_body_0 f
-        }
-      end
-      @body_parsed = true
-    end
-
-    def skip_header( f )
-      while line = f.gets
-        return if /\A[\r\n]*\z/ === line
-      end
-    end
-
-    def parse_body_0( f )
-      if multipart?
-        read_multipart f
-      else
-        @body_port = @config.new_body_port(self)
-        @body_port.wopen {|w|
-            w.write f.read
-        }
-      end
-    end
-    
-    def read_multipart( src )
-      bound = @header['content-type'].params['boundary']
-      is_sep = /\A--#{Regexp.quote bound}(?:--)?[ \t]*(?:\n|\r\n|\r)/
-      lastbound = "--#{bound}--"
-
-      ports = [ @config.new_preamble_port(self) ]
-      begin
-        f = ports.last.wopen
-        while line = src.gets
-          if is_sep === line
-            f.close
-            break if line.strip == lastbound
-            ports.push @config.new_part_port(self)
-            f = ports.last.wopen
-          else
-            f << line
-          end
-        end
-        @epilogue = (src.read || '')
-      ensure
-        f.close if f and not f.closed?
-      end
-
-      @body_port = ports.shift
-      @parts = ports.map {|p| self.class.new(p, @config) }
-    end
-
-  end   # class Mail
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb
deleted file mode 100644
index b0bc6a7f74..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb
+++ /dev/null
@@ -1,495 +0,0 @@
-=begin rdoc
-
-= Mailbox and Mbox interaction class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-require 'tmail/port'
-require 'socket'
-require 'mutex_m'
-
-
-unless [].respond_to?(:sort_by)
-module Enumerable#:nodoc:
-  def sort_by
-    map {|i| [yield(i), i] }.sort {|a,b| a.first <=> b.first }.map {|i| i[1] }
-  end
-end
-end
-
-
-module TMail
-
-  class MhMailbox
-
-    PORT_CLASS = MhPort
-
-    def initialize( dir )
-      edir = File.expand_path(dir)
-      raise ArgumentError, "not directory: #{dir}"\
-                              unless FileTest.directory? edir
-      @dirname = edir
-      @last_file = nil
-      @last_atime = nil
-    end
-
-    def directory
-      @dirname
-    end
-
-    alias dirname directory
-
-    attr_accessor :last_atime
-
-    def inspect
-      "#<#{self.class} #{@dirname}>"
-    end
-
-    def close
-    end
-
-    def new_port
-      PORT_CLASS.new(next_file_name())
-    end
-
-    def each_port
-      mail_files().each do |path|
-        yield PORT_CLASS.new(path)
-      end
-      @last_atime = Time.now
-    end
-
-    alias each each_port
-
-    def reverse_each_port
-      mail_files().reverse_each do |path|
-        yield PORT_CLASS.new(path)
-      end
-      @last_atime = Time.now
-    end
-
-    alias reverse_each reverse_each_port
-
-    # old #each_mail returns Port
-    #def each_mail
-    #  each_port do |port|
-    #    yield Mail.new(port)
-    #  end
-    #end
-
-    def each_new_port( mtime = nil, &block )
-      mtime ||= @last_atime
-      return each_port(&block) unless mtime
-      return unless File.mtime(@dirname) >= mtime
-
-      mail_files().each do |path|
-        yield PORT_CLASS.new(path) if File.mtime(path) > mtime
-      end
-      @last_atime = Time.now
-    end
-
-    private
-
-    def mail_files
-      Dir.entries(@dirname)\
-              .select {|s| /\A\d+\z/ === s }\
-              .map {|s| s.to_i }\
-              .sort\
-              .map {|i| "#{@dirname}/#{i}" }\
-              .select {|path| FileTest.file? path }
-    end
-
-    def next_file_name
-      unless n = @last_file
-        n = 0
-        Dir.entries(@dirname)\
-                .select {|s| /\A\d+\z/ === s }\
-                .map {|s| s.to_i }.sort\
-        .each do |i|
-          next unless FileTest.file? "#{@dirname}/#{i}"
-          n = i
-        end
-      end
-      begin
-        n += 1
-      end while FileTest.exist? "#{@dirname}/#{n}"
-      @last_file = n
-
-      "#{@dirname}/#{n}"
-    end
-
-  end   # MhMailbox
-
-  MhLoader = MhMailbox
-
-
-  class UNIXMbox
-  
-    class << self
-      alias newobj new
-    end
-
-    # Creates a new mailbox object that you can iterate through to collect the
-    # emails from with "each_port".  
-    # 
-    # You need to pass it a filename of a unix mailbox format file, the format of this
-    # file can be researched at this page at {wikipedia}[link:http://en.wikipedia.org/wiki/Mbox]
-    # 
-    # ==== Parameters
-    # 
-    # +filename+: The filename of the mailbox you want to open
-    # 
-    # +tmpdir+: Can be set to override TMail using the system environment's temp dir. TMail will first
-    # use the temp dir specified by you (if any) or then the temp dir specified in the Environment's TEMP
-    # value then the value in the Environment's TMP value or failing all of the above, '/tmp'
-    # 
-    # +readonly+: If set to false, each email you take from the mail box will be removed from the mailbox.
-    # default is *false* - ie, it *WILL* truncate your mailbox file to ZERO once it has read the emails out.
-    # 
-    # ==== Options:
-    # 
-    # None
-    # 
-    # ==== Examples:
-    # 
-    #  # First show using readonly true:
-    # 
-    #  require 'ftools'
-    #  File.size("../test/fixtures/mailbox")
-    #  #=> 20426
-    #
-    #  mailbox = TMail::UNIXMbox.new("../test/fixtures/mailbox", nil, true) 
-    #  #=> #<TMail::UNIXMbox:0x14a2aa8 @readonly=true.....>
-    #
-    #  mailbox.each_port do |port| 
-    #    mail = TMail::Mail.new(port)
-    #    puts mail.subject
-    #  end
-    #  #Testing mailbox 1
-    #  #Testing mailbox 2
-    #  #Testing mailbox 3
-    #  #Testing mailbox 4
-    #  require 'ftools'
-    #  File.size?("../test/fixtures/mailbox")
-    #  #=> 20426
-    # 
-    #  # Now show with readonly set to the default false
-    # 
-    #  mailbox = TMail::UNIXMbox.new("../test/fixtures/mailbox") 
-    #  #=> #<TMail::UNIXMbox:0x14a2aa8 @readonly=false.....>
-    #
-    #  mailbox.each_port do |port| 
-    #    mail = TMail::Mail.new(port)
-    #    puts mail.subject
-    #  end
-    #  #Testing mailbox 1
-    #  #Testing mailbox 2
-    #  #Testing mailbox 3
-    #  #Testing mailbox 4
-    # 
-    #  File.size?("../test/fixtures/mailbox")
-    #  #=> nil
-    def UNIXMbox.new( filename, tmpdir = nil, readonly = false )
-      tmpdir = ENV['TEMP'] || ENV['TMP'] || '/tmp'
-      newobj(filename, "#{tmpdir}/ruby_tmail_#{$$}_#{rand()}", readonly, false)
-    end
-
-    def UNIXMbox.lock( fname )
-      begin
-        f = File.open(fname, 'r+')
-        f.flock File::LOCK_EX
-        yield f
-      ensure
-        f.flock File::LOCK_UN
-        f.close if f and not f.closed?
-      end
-    end
-
-    def UNIXMbox.static_new( fname, dir, readonly = false )
-      newobj(fname, dir, readonly, true)
-    end
-
-    def initialize( fname, mhdir, readonly, static )
-      @filename = fname
-      @readonly = readonly
-      @closed = false
-
-      Dir.mkdir mhdir
-      @real = MhMailbox.new(mhdir)
-      @finalizer = UNIXMbox.mkfinal(@real, @filename, !@readonly, !static)
-      ObjectSpace.define_finalizer self, @finalizer
-    end
-
-    def UNIXMbox.mkfinal( mh, mboxfile, writeback_p, cleanup_p )
-      lambda {
-          if writeback_p
-            lock(mboxfile) {|f|
-                mh.each_port do |port|
-                  f.puts create_from_line(port)
-                  port.ropen {|r|
-                      f.puts r.read
-                  }
-                end
-            }
-          end
-          if cleanup_p
-            Dir.foreach(mh.dirname) do |fname|
-              next if /\A\.\.?\z/ === fname
-              File.unlink "#{mh.dirname}/#{fname}"
-            end
-            Dir.rmdir mh.dirname
-          end
-      }
-    end
-
-    # make _From line
-    def UNIXMbox.create_from_line( port )
-      sprintf 'From %s %s',
-              fromaddr(), TextUtils.time2str(File.mtime(port.filename))
-    end
-
-    def UNIXMbox.fromaddr(port)
-      h = HeaderField.new_from_port(port, 'Return-Path') ||
-      HeaderField.new_from_port(port, 'From') ||
-      HeaderField.new_from_port(port, 'EnvelopeSender') or return 'nobody'
-      a = h.addrs[0] or return 'nobody'
-      a.spec
-    end
-
-    def close
-      return if @closed
-
-      ObjectSpace.undefine_finalizer self
-      @finalizer.call
-      @finalizer = nil
-      @real = nil
-      @closed = true
-      @updated = nil
-    end
-
-    def each_port( &block )
-      close_check
-      update
-      @real.each_port(&block)
-    end
-
-    alias each each_port
-
-    def reverse_each_port( &block )
-      close_check
-      update
-      @real.reverse_each_port(&block)
-    end
-
-    alias reverse_each reverse_each_port
-
-    # old #each_mail returns Port
-    #def each_mail( &block )
-    #  each_port do |port|
-    #    yield Mail.new(port)
-    #  end
-    #end
-
-    def each_new_port( mtime = nil )
-      close_check
-      update
-      @real.each_new_port(mtime) {|p| yield p }
-    end
-
-    def new_port
-      close_check
-      @real.new_port
-    end
-
-    private
-
-    def close_check
-      @closed and raise ArgumentError, 'accessing already closed mbox'
-    end
-
-    def update
-      return if FileTest.zero?(@filename)
-      return if @updated and File.mtime(@filename) < @updated
-      w = nil
-      port = nil
-      time = nil
-      UNIXMbox.lock(@filename) {|f|
-          begin
-            f.each do |line|
-              if /\AFrom / === line
-                w.close if w
-                File.utime time, time, port.filename if time
-
-                port = @real.new_port
-                w = port.wopen
-                time = fromline2time(line)
-              else
-                w.print line if w
-              end
-            end
-          ensure
-            if w and not w.closed?
-              w.close
-              File.utime time, time, port.filename if time
-            end
-          end
-          f.truncate(0) unless @readonly
-          @updated = Time.now
-      }
-    end
-
-    def fromline2time( line )
-      m = /\AFrom \S+ \w+ (\w+) (\d+) (\d+):(\d+):(\d+) (\d+)/.match(line) \
-              or return nil
-      Time.local(m[6].to_i, m[1], m[2].to_i, m[3].to_i, m[4].to_i, m[5].to_i)
-    end
-
-  end   # UNIXMbox
-
-  MboxLoader = UNIXMbox
-
-
-  class Maildir
-
-    extend Mutex_m
-
-    PORT_CLASS = MaildirPort
-
-    @seq = 0
-    def Maildir.unique_number
-      synchronize {
-          @seq += 1
-          return @seq
-      }
-    end
-
-    def initialize( dir = nil )
-      @dirname = dir || ENV['MAILDIR']
-      raise ArgumentError, "not directory: #{@dirname}"\
-                              unless FileTest.directory? @dirname
-      @new = "#{@dirname}/new"
-      @tmp = "#{@dirname}/tmp"
-      @cur = "#{@dirname}/cur"
-    end
-
-    def directory
-      @dirname
-    end
-
-    def inspect
-      "#<#{self.class} #{@dirname}>"
-    end
-
-    def close
-    end
-
-    def each_port
-      mail_files(@cur).each do |path|
-        yield PORT_CLASS.new(path)
-      end
-    end
-
-    alias each each_port
-
-    def reverse_each_port
-      mail_files(@cur).reverse_each do |path|
-        yield PORT_CLASS.new(path)
-      end
-    end
-
-    alias reverse_each reverse_each_port
-
-    def new_port
-      fname = nil
-      tmpfname = nil
-      newfname = nil
-
-      begin
-        fname = "#{Time.now.to_i}.#{$$}_#{Maildir.unique_number}.#{Socket.gethostname}"
-        
-        tmpfname = "#{@tmp}/#{fname}"
-        newfname = "#{@new}/#{fname}"
-      end while FileTest.exist? tmpfname
-
-      if block_given?
-        File.open(tmpfname, 'w') {|f| yield f }
-        File.rename tmpfname, newfname
-        PORT_CLASS.new(newfname)
-      else
-        File.open(tmpfname, 'w') {|f| f.write "\n\n" }
-        PORT_CLASS.new(tmpfname)
-      end
-    end
-
-    def each_new_port
-      mail_files(@new).each do |path|
-        dest = @cur + '/' + File.basename(path)
-        File.rename path, dest
-        yield PORT_CLASS.new(dest)
-      end
-
-      check_tmp
-    end
-
-    TOO_OLD = 60 * 60 * 36   # 36 hour
-
-    def check_tmp
-      old = Time.now.to_i - TOO_OLD
-      
-      each_filename(@tmp) do |full, fname|
-        if FileTest.file? full and
-           File.stat(full).mtime.to_i < old
-          File.unlink full
-        end
-      end
-    end
-
-    private
-
-    def mail_files( dir )
-      Dir.entries(dir)\
-              .select {|s| s[0] != ?. }\
-              .sort_by {|s| s.slice(/\A\d+/).to_i }\
-              .map {|s| "#{dir}/#{s}" }\
-              .select {|path| FileTest.file? path }
-    end
-
-    def each_filename( dir )
-      Dir.foreach(dir) do |fname|
-        path = "#{dir}/#{fname}"
-        if fname[0] != ?. and FileTest.file? path
-          yield path, fname
-        end
-      end
-    end
-    
-  end   # Maildir
-
-  MaildirLoader = Maildir
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb
deleted file mode 100644
index e52772793f..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#:stopdoc:
-require 'tmail/version'
-require 'tmail/mail'
-require 'tmail/mailbox'
-require 'tmail/core_extensions'
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb
deleted file mode 100644
index 6c0e251102..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-#:stopdoc:
-require 'tmail/mailbox'
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb
deleted file mode 100644
index 65147228a1..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb
+++ /dev/null
@@ -1,248 +0,0 @@
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-#:stopdoc:
-require 'nkf'
-#:startdoc:
-
-module TMail
-
-  class Mail
-    
-    def send_to( smtp )
-      do_send_to(smtp) do
-        ready_to_send
-      end
-    end
-
-    def send_text_to( smtp )
-      do_send_to(smtp) do
-        ready_to_send
-        mime_encode
-      end
-    end
-
-    def do_send_to( smtp )
-      from = from_address or raise ArgumentError, 'no from address'
-      (dests = destinations).empty? and raise ArgumentError, 'no receipient'
-      yield
-      send_to_0 smtp, from, dests
-    end
-    private :do_send_to
-
-    def send_to_0( smtp, from, to )
-      smtp.ready(from, to) do |f|
-        encoded "\r\n", 'j', f, ''
-      end
-    end
-
-    def ready_to_send
-      delete_no_send_fields
-      add_message_id
-      add_date
-    end
-
-    NOSEND_FIELDS = %w(
-      received
-      bcc
-    )
-
-    def delete_no_send_fields
-      NOSEND_FIELDS.each do |nm|
-        delete nm
-      end
-      delete_if {|n,v| v.empty? }
-    end
-
-    def add_message_id( fqdn = nil )
-      self.message_id = ::TMail::new_message_id(fqdn)
-    end
-
-    def add_date
-      self.date = Time.now
-    end
-
-    def mime_encode
-      if parts.empty?
-        mime_encode_singlepart
-      else
-        mime_encode_multipart true
-      end
-    end
-
-    def mime_encode_singlepart
-      self.mime_version = '1.0'
-      b = body
-      if NKF.guess(b) != NKF::BINARY
-        mime_encode_text b
-      else
-        mime_encode_binary b
-      end
-    end
-
-    def mime_encode_text( body )
-      self.body = NKF.nkf('-j -m0', body)
-      self.set_content_type 'text', 'plain', {'charset' => 'iso-2022-jp'}
-      self.encoding = '7bit'
-    end
-
-    def mime_encode_binary( body )
-      self.body = [body].pack('m')
-      self.set_content_type 'application', 'octet-stream'
-      self.encoding = 'Base64'
-    end
-
-    def mime_encode_multipart( top = true )
-      self.mime_version = '1.0' if top
-      self.set_content_type 'multipart', 'mixed'
-      e = encoding(nil)
-      if e and not /\A(?:7bit|8bit|binary)\z/i === e
-        raise ArgumentError,
-              'using C.T.Encoding with multipart mail is not permitted'
-      end
-    end
-  
-  end
-
-  #:stopdoc:
-  class DeleteFields
-
-    NOSEND_FIELDS = %w(
-      received
-      bcc
-    )
-
-    def initialize( nosend = nil, delempty = true )
-      @no_send_fields = nosend || NOSEND_FIELDS.dup
-      @delete_empty_fields = delempty
-    end
-
-    attr :no_send_fields
-    attr :delete_empty_fields, true
-
-    def exec( mail )
-      @no_send_fields.each do |nm|
-        delete nm
-      end
-      delete_if {|n,v| v.empty? } if @delete_empty_fields
-    end
-  
-  end
-  #:startdoc:
-
-  #:stopdoc:
-  class AddMessageId
-
-    def initialize( fqdn = nil )
-      @fqdn = fqdn
-    end
-
-    attr :fqdn, true
-
-    def exec( mail )
-      mail.message_id = ::TMail::new_msgid(@fqdn)
-    end
-  
-  end
-  #:startdoc:
-
-  #:stopdoc:
-  class AddDate
-
-    def exec( mail )
-      mail.date = Time.now
-    end
-  
-  end
-  #:startdoc:
-
-  #:stopdoc:
-  class MimeEncodeAuto
-
-    def initialize( s = nil, m = nil )
-      @singlepart_composer = s || MimeEncodeSingle.new
-      @multipart_composer  = m || MimeEncodeMulti.new
-    end
-
-    attr :singlepart_composer
-    attr :multipart_composer
-
-    def exec( mail )
-      if mail._builtin_multipart?
-      then @multipart_composer
-      else @singlepart_composer end.exec mail
-    end
-  
-  end
-  #:startdoc:
-  
-  #:stopdoc:
-  class MimeEncodeSingle
-
-    def exec( mail )
-      mail.mime_version = '1.0'
-      b = mail.body
-      if NKF.guess(b) != NKF::BINARY
-        on_text b
-      else
-        on_binary b
-      end
-    end
-
-    def on_text( body )
-      mail.body = NKF.nkf('-j -m0', body)
-      mail.set_content_type 'text', 'plain', {'charset' => 'iso-2022-jp'}
-      mail.encoding = '7bit'
-    end
-
-    def on_binary( body )
-      mail.body = [body].pack('m')
-      mail.set_content_type 'application', 'octet-stream'
-      mail.encoding = 'Base64'
-    end
-  
-  end
-  #:startdoc:
-  
-  #:stopdoc:
-  class MimeEncodeMulti
-
-    def exec( mail, top = true )
-      mail.mime_version = '1.0' if top
-      mail.set_content_type 'multipart', 'mixed'
-      e = encoding(nil)
-      if e and not /\A(?:7bit|8bit|binary)\z/i === e
-        raise ArgumentError,
-              'using C.T.Encoding with multipart mail is not permitted'
-      end
-      mail.parts.each do |m|
-        exec m, false if m._builtin_multipart?
-      end
-    end
-
-  end
-  #:startdoc:
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb
deleted file mode 100644
index def663b233..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-=begin rdoc
-
-= Obsolete methods that are deprecated
-
-If you really want to see them, go to lib/tmail/obsolete.rb and view to your
-heart's content.
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-#:stopdoc:
-module TMail #:nodoc:
-
-  class Mail
-    alias include? key?
-    alias has_key? key?
-
-    def values
-      ret = []
-      each_field {|v| ret.push v }
-      ret
-    end
-
-    def value?( val )
-      HeaderField === val or return false
-
-      [ @header[val.name.downcase] ].flatten.include? val
-    end
-
-    alias has_value? value?
-  end
-
-  class Mail
-    def from_addr( default = nil )
-      addr, = from_addrs(nil)
-      addr || default
-    end
-
-    def from_address( default = nil )
-      if a = from_addr(nil)
-        a.spec
-      else
-        default
-      end
-    end
-
-    alias from_address= from_addrs=
-
-    def from_phrase( default = nil )
-      if a = from_addr(nil)
-        a.phrase
-      else
-        default
-      end
-    end
-
-    alias msgid  message_id
-    alias msgid= message_id=
-
-    alias each_dest each_destination
-  end
-
-  class Address
-    alias route routes
-    alias addr spec
-
-    def spec=( str ) 
-      @local, @domain = str.split(/@/,2).map {|s| s.split(/\./) }
-    end
-
-    alias addr= spec=
-    alias address= spec=
-  end
-
-  class MhMailbox
-    alias new_mail new_port
-    alias each_mail each_port
-    alias each_newmail each_new_port
-  end
-  class UNIXMbox
-    alias new_mail new_port
-    alias each_mail each_port
-    alias each_newmail each_new_port
-  end
-  class Maildir
-    alias new_mail new_port
-    alias each_mail each_port
-    alias each_newmail each_new_port
-  end
-
-  extend TextUtils
-
-  class << self
-    alias msgid?    message_id?
-    alias boundary  new_boundary
-    alias msgid     new_message_id
-    alias new_msgid new_message_id
-  end
-
-  def Mail.boundary
-    ::TMail.new_boundary
-  end
-
-  def Mail.msgid
-    ::TMail.new_message_id
-  end
-
-end   # module TMail
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
deleted file mode 100644
index 0ddc525213..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
+++ /dev/null
@@ -1,1478 +0,0 @@
-#:stopdoc:
-# DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "parser.y".
-#
-#
-# parser.rb: generated by racc (runtime embedded)
-#
-###### racc/parser.rb begin
-unless $".index 'racc/parser.rb'
-$".push 'racc/parser.rb'
-
-self.class.module_eval <<'..end racc/parser.rb modeval..id8076474214', 'racc/parser.rb', 1
-#
-# $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
-#
-# Copyright (c) 1999-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-#
-# As a special exception, when this code is copied by Racc
-# into a Racc output file, you may use that output file
-# without restriction.
-#
-
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError
-end
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined?(::ParseError)
-  ParseError = Racc::ParseError
-end
-
-module Racc
-
-  unless defined?(Racc_No_Extentions)
-    Racc_No_Extentions = false
-  end
-
-  class Parser
-
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    Racc_Runtime_Version = '1.4.5'
-    Racc_Runtime_Revision = '$Revision: 1.7 $'.split[1]
-
-    Racc_Runtime_Core_Version_R = '1.4.5'
-    Racc_Runtime_Core_Revision_R = '$Revision: 1.7 $'.split[1]
-    begin
-      require 'racc/cparse'
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
-      unless new.respond_to?(:_racc_do_parse_c, true)
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extentions
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c
-      Racc_YY_Parse_Method         = :_racc_yyparse_c
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C
-      Racc_Runtime_Type            = 'c'
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-    $VERBOSE = old_verbose
-
-    def Parser.racc_runtime_type
-      Racc_Runtime_Type
-    end
-
-    private
-
-    def _racc_setup
-      @yydebug = false unless self.class::Racc_debug_parser
-      @yydebug = false unless defined?(@yydebug)
-      if @yydebug
-        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
-        @racc_debug_out ||= $stderr
-      end
-      arg = self.class::Racc_arg
-      arg[13] = true if arg.size < 14
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state  = [0]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
-
-    ###
-    ### do_parse
-    ###
-
-    def do_parse
-      __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
-    end
-
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb(arg, in_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            if @racc_read_next
-              if @racc_t != 0   # not EOF
-                tok, @racc_val = next_token()
-                unless tok      # EOF
-                  @racc_t = 0
-                else
-                  @racc_t = (token_table[tok] or 1)   # error token
-                end
-                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
-                @racc_read_next = false
-              end
-            end
-            i += @racc_t
-            unless i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-          else
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-        end
-      }
-    end
-
-    ###
-    ### yyparse
-    ###
-
-    def yyparse(recv, mid)
-      __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
-    end
-
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = nil
-      act = nil
-      i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        until i = action_pointer[@racc_state[-1]]
-          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
-            ;
-          end
-        end
-        recv.__send__(mid) do |tok, val|
-          unless tok
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          unless i >= 0 and
-                 act = action_table[i] and
-                 action_check[i] == @racc_state[-1]
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-
-          while not (i = action_pointer[@racc_state[-1]]) or
-                not @racc_read_next or
-                @racc_t == 0   # $
-            unless i and i += @racc_t and
-                   i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-            while act = _racc_evalact(act, arg)
-              ;
-            end
-          end
-        end
-      }
-    end
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact(act, arg)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      nerr = 0   # tmp
-
-      if act > 0 and act < shift_n
-        #
-        # shift
-        #
-        if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
-        end
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-        if @yydebug
-          @racc_tstack.push @racc_t
-          racc_shift @racc_t, @racc_tstack, @racc_vstack
-        end
-
-      elsif act < 0 and act > -reduce_n
-        #
-        # reduce
-        #
-        code = catch(:racc_jump) {
-          @racc_state.push _racc_do_reduce(arg, act)
-          false
-        }
-        if code
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n
-        #
-        # accept
-        #
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n
-        #
-        # error
-        #
-        case @racc_error_status
-        when 0
-          unless arg[21]    # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0   # is $
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            i += 1   # error token
-            if  i >= 0 and
-                (act = action_table[i]) and
-                action_check[i] == @racc_state[-1]
-              break
-            end
-          end
-          throw :racc_end_parse, nil if @racc_state.size <= 1
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug
-            @racc_tstack.pop
-            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
-          end
-        end
-        return act
-
-      else
-        raise "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce(arg, act)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[-len, len] if @yydebug
-      tmp_v = vstack[-len, len]
-      tstack[-len, len] = void_array if @yydebug
-      vstack[-len, len] = void_array
-      state[-len, len]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[k1]
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
-          return curstate
-        end
-      end
-      goto_default[k1]
-    end
-
-    def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect, token_to_str(t) || '?')
-    end
-
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-    #
-    # for debugging output
-    #
-
-    def racc_read_token(t, tok, val)
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift(tok, tstack, vstack)
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce(toks, sim, tstack, vstack)
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty?
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-          
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop(state, tstack, vstack)
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state(curstate, state)
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks(t, v)
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states(s)
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str(tok)
-      self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    def token_to_str(t)
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
-..end racc/parser.rb modeval..id8076474214
-end
-###### racc/parser.rb end
-
-
-#
-# parser.rb
-#
-# Copyright (c) 1998-2007 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2.1.
-#
-
-require 'tmail/scanner'
-require 'tmail/utils'
-
-
-module TMail
-
-  class Parser < Racc::Parser
-
-module_eval <<'..end parser.y modeval..id7b0b3dccb7', 'parser.y', 340
-
-  include TextUtils
-
-  def self.parse( ident, str, cmt = nil )
-    new.parse(ident, str, cmt)
-  end
-
-  MAILP_DEBUG = false
-
-  def initialize
-    self.debug = MAILP_DEBUG
-  end
-
-  def debug=( flag )
-    @yydebug = flag && Racc_debug_parser
-    @scanner_debug = flag
-  end
-
-  def debug
-    @yydebug
-  end
-
-  def parse( ident, str, comments = nil )
-    @scanner = Scanner.new(str, ident, comments)
-    @scanner.debug = @scanner_debug
-    @first = [ident, ident]
-    result = yyparse(self, :parse_in)
-    comments.map! {|c| to_kcode(c) } if comments
-    result
-  end
-
-  private
-
-  def parse_in( &block )
-    yield @first
-    @scanner.scan(&block)
-  end
-  
-  def on_error( t, val, vstack )
-    raise SyntaxError, "parse error on token #{racc_token2str t}"
-  end
-
-..end parser.y modeval..id7b0b3dccb7
-
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 2, 35, :_reduce_1,
- 2, 35, :_reduce_2,
- 2, 35, :_reduce_3,
- 2, 35, :_reduce_4,
- 2, 35, :_reduce_5,
- 2, 35, :_reduce_6,
- 2, 35, :_reduce_7,
- 2, 35, :_reduce_8,
- 2, 35, :_reduce_9,
- 2, 35, :_reduce_10,
- 2, 35, :_reduce_11,
- 2, 35, :_reduce_12,
- 6, 36, :_reduce_13,
- 0, 48, :_reduce_none,
- 2, 48, :_reduce_none,
- 3, 49, :_reduce_16,
- 5, 49, :_reduce_17,
- 1, 50, :_reduce_18,
- 7, 37, :_reduce_19,
- 0, 51, :_reduce_none,
- 2, 51, :_reduce_21,
- 0, 52, :_reduce_none,
- 2, 52, :_reduce_23,
- 1, 58, :_reduce_24,
- 3, 58, :_reduce_25,
- 2, 58, :_reduce_26,
- 0, 53, :_reduce_none,
- 2, 53, :_reduce_28,
- 0, 54, :_reduce_29,
- 3, 54, :_reduce_30,
- 0, 55, :_reduce_none,
- 2, 55, :_reduce_32,
- 2, 55, :_reduce_33,
- 0, 56, :_reduce_none,
- 2, 56, :_reduce_35,
- 1, 61, :_reduce_36,
- 1, 61, :_reduce_37,
- 0, 57, :_reduce_none,
- 2, 57, :_reduce_39,
- 1, 38, :_reduce_none,
- 1, 38, :_reduce_none,
- 3, 38, :_reduce_none,
- 1, 46, :_reduce_none,
- 1, 46, :_reduce_none,
- 1, 46, :_reduce_none,
- 1, 39, :_reduce_none,
- 2, 39, :_reduce_47,
- 1, 64, :_reduce_48,
- 3, 64, :_reduce_49,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 69, :_reduce_52,
- 3, 69, :_reduce_53,
- 1, 47, :_reduce_none,
- 1, 47, :_reduce_none,
- 2, 47, :_reduce_56,
- 2, 67, :_reduce_none,
- 3, 65, :_reduce_58,
- 2, 65, :_reduce_59,
- 1, 70, :_reduce_60,
- 2, 70, :_reduce_61,
- 4, 62, :_reduce_62,
- 3, 62, :_reduce_63,
- 2, 72, :_reduce_none,
- 2, 73, :_reduce_65,
- 4, 73, :_reduce_66,
- 3, 63, :_reduce_67,
- 1, 63, :_reduce_68,
- 1, 74, :_reduce_none,
- 2, 74, :_reduce_70,
- 1, 71, :_reduce_71,
- 3, 71, :_reduce_72,
- 1, 59, :_reduce_73,
- 3, 59, :_reduce_74,
- 1, 76, :_reduce_75,
- 2, 76, :_reduce_76,
- 1, 75, :_reduce_none,
- 1, 75, :_reduce_none,
- 1, 75, :_reduce_none,
- 1, 77, :_reduce_none,
- 1, 77, :_reduce_none,
- 1, 77, :_reduce_none,
- 1, 66, :_reduce_none,
- 2, 66, :_reduce_none,
- 3, 60, :_reduce_85,
- 1, 40, :_reduce_86,
- 3, 40, :_reduce_87,
- 1, 79, :_reduce_none,
- 2, 79, :_reduce_89,
- 1, 41, :_reduce_90,
- 2, 41, :_reduce_91,
- 3, 42, :_reduce_92,
- 5, 43, :_reduce_93,
- 3, 43, :_reduce_94,
- 0, 80, :_reduce_95,
- 5, 80, :_reduce_96,
- 5, 80, :_reduce_97,
- 1, 44, :_reduce_98,
- 3, 45, :_reduce_99,
- 0, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none,
- 1, 78, :_reduce_none ]
-
-racc_reduce_n = 109
-
-racc_shift_n = 167
-
-racc_action_table = [
-   -70,   -69,    23,    25,   145,   146,    29,    31,   105,   106,
-    16,    17,    20,    22,   136,    27,   -70,   -69,    32,   101,
-   -70,   -69,   153,   100,   113,   115,   -70,   -69,   -70,   109,
-    75,    23,    25,   101,   154,    29,    31,   142,   143,    16,
-    17,    20,    22,   107,    27,    23,    25,    32,    98,    29,
-    31,    96,    94,    16,    17,    20,    22,    78,    27,    23,
-    25,    32,   112,    29,    31,    74,    91,    16,    17,    20,
-    22,    88,   117,    92,    81,    32,    23,    25,    80,   123,
-    29,    31,   100,   125,    16,    17,    20,    22,   126,    23,
-    25,   109,    32,    29,    31,    91,   128,    16,    17,    20,
-    22,   129,    27,    23,    25,    32,   101,    29,    31,   101,
-   130,    16,    17,    20,    22,    79,    52,    23,    25,    32,
-    78,    29,    31,   133,    78,    16,    17,    20,    22,    77,
-    23,    25,    75,    32,    29,    31,    65,    62,    16,    17,
-    20,    22,   139,    23,    25,   101,    32,    29,    31,    60,
-   100,    16,    17,    20,    22,    44,    27,   101,   147,    32,
-    23,    25,   120,   148,    29,    31,   151,   152,    16,    17,
-    20,    22,    42,    27,   156,   158,    32,    23,    25,   120,
-    40,    29,    31,    15,   163,    16,    17,    20,    22,    40,
-    27,    23,    25,    32,    68,    29,    31,   165,   166,    16,
-    17,    20,    22,   nil,    27,    23,    25,    32,   nil,    29,
-    31,    74,   nil,    16,    17,    20,    22,   nil,    23,    25,
-   nil,    32,    29,    31,   nil,   nil,    16,    17,    20,    22,
-   nil,    23,    25,   nil,    32,    29,    31,   nil,   nil,    16,
-    17,    20,    22,   nil,    23,    25,   nil,    32,    29,    31,
-   nil,   nil,    16,    17,    20,    22,   nil,    23,    25,   nil,
-    32,    29,    31,   nil,   nil,    16,    17,    20,    22,   nil,
-    27,    23,    25,    32,   nil,    29,    31,   nil,   nil,    16,
-    17,    20,    22,   nil,    23,    25,   nil,    32,    29,    31,
-   nil,   nil,    16,    17,    20,    22,   nil,    23,    25,   nil,
-    32,    29,    31,   nil,   nil,    16,    17,    20,    22,   nil,
-    84,    25,   nil,    32,    29,    31,   nil,    87,    16,    17,
-    20,    22,     4,     6,     7,     8,     9,    10,    11,    12,
-    13,     1,     2,     3,    84,    25,   nil,   nil,    29,    31,
-   nil,    87,    16,    17,    20,    22,    84,    25,   nil,   nil,
-    29,    31,   nil,    87,    16,    17,    20,    22,    84,    25,
-   nil,   nil,    29,    31,   nil,    87,    16,    17,    20,    22,
-    84,    25,   nil,   nil,    29,    31,   nil,    87,    16,    17,
-    20,    22,    84,    25,   nil,   nil,    29,    31,   nil,    87,
-    16,    17,    20,    22,    84,    25,   nil,   nil,    29,    31,
-   nil,    87,    16,    17,    20,    22 ]
-
-racc_action_check = [
-    75,    28,    68,    68,   136,   136,    68,    68,    72,    72,
-    68,    68,    68,    68,   126,    68,    75,    28,    68,    67,
-    75,    28,   143,    66,    86,    86,    75,    28,    75,    75,
-    28,     3,     3,    86,   143,     3,     3,   134,   134,     3,
-     3,     3,     3,    73,     3,   151,   151,     3,    62,   151,
-   151,    60,    56,   151,   151,   151,   151,    51,   151,    52,
-    52,   151,    80,    52,    52,    52,    50,    52,    52,    52,
-    52,    45,    89,    52,    42,    52,    71,    71,    41,    96,
-    71,    71,    97,    98,    71,    71,    71,    71,   100,     7,
-     7,   101,    71,     7,     7,   102,   104,     7,     7,     7,
-     7,   105,     7,     8,     8,     7,   108,     8,     8,   111,
-   112,     8,     8,     8,     8,    40,     8,     9,     9,     8,
-    36,     9,     9,   117,   121,     9,     9,     9,     9,    33,
-    10,    10,    70,     9,    10,    10,    13,    12,    10,    10,
-    10,    10,   130,     2,     2,   131,    10,     2,     2,    11,
-   135,     2,     2,     2,     2,     6,     2,   138,   139,     2,
-    90,    90,    90,   140,    90,    90,   141,   142,    90,    90,
-    90,    90,     5,    90,   147,   150,    90,   127,   127,   127,
-     4,   127,   127,     1,   156,   127,   127,   127,   127,   158,
-   127,    26,    26,   127,    26,    26,    26,   162,   163,    26,
-    26,    26,    26,   nil,    26,    27,    27,    26,   nil,    27,
-    27,    27,   nil,    27,    27,    27,    27,   nil,   154,   154,
-   nil,    27,   154,   154,   nil,   nil,   154,   154,   154,   154,
-   nil,   122,   122,   nil,   154,   122,   122,   nil,   nil,   122,
-   122,   122,   122,   nil,    76,    76,   nil,   122,    76,    76,
-   nil,   nil,    76,    76,    76,    76,   nil,    38,    38,   nil,
-    76,    38,    38,   nil,   nil,    38,    38,    38,    38,   nil,
-    38,    55,    55,    38,   nil,    55,    55,   nil,   nil,    55,
-    55,    55,    55,   nil,    94,    94,   nil,    55,    94,    94,
-   nil,   nil,    94,    94,    94,    94,   nil,    59,    59,   nil,
-    94,    59,    59,   nil,   nil,    59,    59,    59,    59,   nil,
-   114,   114,   nil,    59,   114,   114,   nil,   114,   114,   114,
-   114,   114,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    77,    77,   nil,   nil,    77,    77,
-   nil,    77,    77,    77,    77,    77,    44,    44,   nil,   nil,
-    44,    44,   nil,    44,    44,    44,    44,    44,   113,   113,
-   nil,   nil,   113,   113,   nil,   113,   113,   113,   113,   113,
-    88,    88,   nil,   nil,    88,    88,   nil,    88,    88,    88,
-    88,    88,    74,    74,   nil,   nil,    74,    74,   nil,    74,
-    74,    74,    74,    74,   129,   129,   nil,   nil,   129,   129,
-   nil,   129,   129,   129,   129,   129 ]
-
-racc_action_pointer = [
-   320,   152,   129,    17,   165,   172,   137,    75,    89,   103,
-   116,   135,   106,   105,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   177,   191,     1,   nil,
-   nil,   nil,   nil,   109,   nil,   nil,    94,   nil,   243,   nil,
-    99,    64,    74,   nil,   332,    52,   nil,   nil,   nil,   nil,
-    50,    31,    45,   nil,   nil,   257,    36,   nil,   nil,   283,
-    22,   nil,    16,   nil,   nil,   nil,    -3,   -10,   -12,   nil,
-   103,    62,    -8,    15,   368,     0,   230,   320,   nil,   nil,
-    47,   nil,   nil,   nil,   nil,   nil,     4,   nil,   356,    50,
-   146,   nil,   nil,   nil,   270,   nil,    65,    56,    52,   nil,
-    57,    62,    79,   nil,    68,    81,   nil,   nil,    77,   nil,
-   nil,    80,    96,   344,   296,   nil,   nil,   108,   nil,   nil,
-   nil,    98,   217,   nil,   nil,   nil,   -19,   163,   nil,   380,
-   128,   116,   nil,   nil,    14,   124,   -26,   nil,   128,   141,
-   148,   141,   152,     7,   nil,   nil,   nil,   160,   nil,   nil,
-   149,    31,   nil,   nil,   204,   nil,   167,   nil,   174,   nil,
-   nil,   nil,   169,   184,   nil,   nil,   nil ]
-
-racc_action_default = [
-  -109,  -109,  -109,  -109,   -14,  -109,   -20,  -109,  -109,  -109,
-  -109,  -109,  -109,  -109,   -10,   -95,  -105,  -106,   -77,   -44,
-  -107,   -11,  -108,   -79,   -43,  -102,  -109,  -109,   -60,  -103,
-   -55,  -104,   -78,   -68,   -54,   -71,   -45,   -12,  -109,    -1,
-  -109,  -109,  -109,    -2,  -109,   -22,   -51,   -48,   -50,    -3,
-   -40,   -41,  -109,   -46,    -4,   -86,    -5,   -88,    -6,   -90,
-  -109,    -7,   -95,    -8,    -9,   -98,  -100,   -61,   -59,   -56,
-   -69,  -109,  -109,  -109,  -109,   -75,  -109,  -109,   -57,   -15,
-  -109,   167,   -73,   -80,   -82,   -21,   -24,   -81,  -109,   -27,
-  -109,   -83,   -47,   -89,  -109,   -91,  -109,  -100,  -109,   -99,
-  -101,   -75,   -58,   -52,  -109,  -109,   -64,   -63,   -65,   -76,
-   -72,   -67,  -109,  -109,  -109,   -26,   -23,  -109,   -29,   -49,
-   -84,   -42,   -87,   -92,   -94,   -95,  -109,  -109,   -62,  -109,
-  -109,   -25,   -74,   -28,   -31,  -100,  -109,   -53,   -66,  -109,
-  -109,   -34,  -109,  -109,   -93,   -96,   -97,  -109,   -18,   -13,
-   -38,  -109,   -30,   -33,  -109,   -32,   -16,   -19,   -14,   -35,
-   -36,   -37,  -109,  -109,   -39,   -85,   -17 ]
-
-racc_goto_table = [
-    39,    67,    70,    73,    38,    66,    69,    24,    37,    57,
-    59,    36,    55,    67,    99,    90,    85,   157,    69,   108,
-    83,   134,   111,    76,    49,    53,   141,    70,    73,   150,
-   118,    89,    45,   155,   159,   149,   140,    21,    14,    19,
-   119,   102,    64,    63,    61,   124,    70,   104,    58,   132,
-    83,    56,    97,    83,    54,    93,    43,     5,   131,    95,
-   116,   nil,    76,   nil,    83,    76,   nil,   127,   nil,    38,
-   nil,   nil,   nil,   103,   138,   nil,   110,   nil,   nil,   nil,
-   nil,   nil,   nil,   144,   nil,   nil,   nil,   nil,   nil,    83,
-    83,   nil,   nil,   nil,    57,   nil,   nil,   122,   nil,   121,
-   nil,   nil,   nil,   nil,   nil,    83,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   135,   nil,   nil,   nil,   nil,
-   nil,   nil,    93,   nil,   nil,   nil,    70,   161,    38,    70,
-   162,   160,   137,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   164 ]
-
-racc_goto_check = [
-     2,    37,    37,    29,    36,    46,    28,    13,    13,    41,
-    41,    31,    45,    37,    47,    32,    24,    23,    28,    25,
-    44,    20,    25,    42,     4,     4,    21,    37,    29,    22,
-    19,    18,    17,    26,    27,    16,    15,    12,    11,    33,
-    34,    35,    10,     9,     8,    47,    37,    29,     7,    43,
-    44,     6,    46,    44,     5,    41,     3,     1,    25,    41,
-    24,   nil,    42,   nil,    44,    42,   nil,    32,   nil,    36,
-   nil,   nil,   nil,    13,    25,   nil,    41,   nil,   nil,   nil,
-   nil,   nil,   nil,    47,   nil,   nil,   nil,   nil,   nil,    44,
-    44,   nil,   nil,   nil,    41,   nil,   nil,    45,   nil,    31,
-   nil,   nil,   nil,   nil,   nil,    44,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    46,   nil,   nil,   nil,   nil,
-   nil,   nil,    41,   nil,   nil,   nil,    37,    29,    36,    37,
-    29,    28,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     2 ]
-
-racc_goto_pointer = [
-   nil,    57,    -4,    50,    17,    46,    42,    38,    33,    31,
-    29,    37,    35,     5,   nil,   -94,  -105,    26,   -14,   -59,
-   -97,  -108,  -112,  -133,   -28,   -55,  -110,  -117,   -20,   -24,
-   nil,     9,   -35,    37,   -50,   -27,     1,   -25,   nil,   nil,
-   nil,     0,    -5,   -65,   -24,     3,   -10,   -52 ]
-
-racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    48,    41,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,    30,    34,
-    50,    51,   nil,    46,    47,   nil,    26,    28,    71,    72,
-    33,    35,   114,    82,    18,   nil,   nil,   nil ]
-
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :DATETIME => 2,
- :RECEIVED => 3,
- :MADDRESS => 4,
- :RETPATH => 5,
- :KEYWORDS => 6,
- :ENCRYPTED => 7,
- :MIMEVERSION => 8,
- :CTYPE => 9,
- :CENCODING => 10,
- :CDISPOSITION => 11,
- :ADDRESS => 12,
- :MAILBOX => 13,
- :DIGIT => 14,
- :ATOM => 15,
- "," => 16,
- ":" => 17,
- :FROM => 18,
- :BY => 19,
- "@" => 20,
- :DOMLIT => 21,
- :VIA => 22,
- :WITH => 23,
- :ID => 24,
- :FOR => 25,
- ";" => 26,
- "<" => 27,
- ">" => 28,
- "." => 29,
- :QUOTED => 30,
- :TOKEN => 31,
- "/" => 32,
- "=" => 33 }
-
-racc_use_result_var = false
-
-racc_nt_base = 34
-
-Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
-
-Racc_token_to_s_table = [
-'$end',
-'error',
-'DATETIME',
-'RECEIVED',
-'MADDRESS',
-'RETPATH',
-'KEYWORDS',
-'ENCRYPTED',
-'MIMEVERSION',
-'CTYPE',
-'CENCODING',
-'CDISPOSITION',
-'ADDRESS',
-'MAILBOX',
-'DIGIT',
-'ATOM',
-'","',
-'":"',
-'FROM',
-'BY',
-'"@"',
-'DOMLIT',
-'VIA',
-'WITH',
-'ID',
-'FOR',
-'";"',
-'"<"',
-'">"',
-'"."',
-'QUOTED',
-'TOKEN',
-'"/"',
-'"="',
-'$start',
-'content',
-'datetime',
-'received',
-'addrs_TOP',
-'retpath',
-'keys',
-'enc',
-'version',
-'ctype',
-'cencode',
-'cdisp',
-'addr_TOP',
-'mbox',
-'day',
-'hour',
-'zone',
-'from',
-'by',
-'via',
-'with',
-'id',
-'for',
-'received_datetime',
-'received_domain',
-'domain',
-'msgid',
-'received_addrspec',
-'routeaddr',
-'spec',
-'addrs',
-'group_bare',
-'commas',
-'group',
-'addr',
-'mboxes',
-'addr_phrase',
-'local_head',
-'routes',
-'at_domains',
-'local',
-'word',
-'dots',
-'domword',
-'atom',
-'phrase',
-'params',
-'opt_semicolon']
-
-Racc_debug_parser = false
-
-##### racc system variables end #####
-
- # reduce 0 omitted
-
-module_eval <<'.,.,', 'parser.y', 16
-  def _reduce_1( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 17
-  def _reduce_2( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 18
-  def _reduce_3( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 19
-  def _reduce_4( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 20
-  def _reduce_5( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 21
-  def _reduce_6( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 22
-  def _reduce_7( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 23
-  def _reduce_8( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 24
-  def _reduce_9( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 25
-  def _reduce_10( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 26
-  def _reduce_11( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 27
-  def _reduce_12( val, _values)
- val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 36
-  def _reduce_13( val, _values)
-                  t = Time.gm(val[3].to_i, val[2], val[1].to_i, 0, 0, 0)
-                  (t + val[4] - val[5]).localtime
-  end
-.,.,
-
- # reduce 14 omitted
-
- # reduce 15 omitted
-
-module_eval <<'.,.,', 'parser.y', 45
-  def _reduce_16( val, _values)
-                  (val[0].to_i * 60 * 60) +
-                  (val[2].to_i * 60)
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 51
-  def _reduce_17( val, _values)
-                  (val[0].to_i * 60 * 60) +
-                  (val[2].to_i * 60) +
-                  (val[4].to_i)
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 56
-  def _reduce_18( val, _values)
-                  timezone_string_to_unixtime(val[0])
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 61
-  def _reduce_19( val, _values)
-                  val
-  end
-.,.,
-
- # reduce 20 omitted
-
-module_eval <<'.,.,', 'parser.y', 67
-  def _reduce_21( val, _values)
-                  val[1]
-  end
-.,.,
-
- # reduce 22 omitted
-
-module_eval <<'.,.,', 'parser.y', 73
-  def _reduce_23( val, _values)
-                  val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 79
-  def _reduce_24( val, _values)
-                  join_domain(val[0])
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 83
-  def _reduce_25( val, _values)
-                  join_domain(val[2])
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 87
-  def _reduce_26( val, _values)
-                  join_domain(val[0])
-  end
-.,.,
-
- # reduce 27 omitted
-
-module_eval <<'.,.,', 'parser.y', 93
-  def _reduce_28( val, _values)
-                  val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 98
-  def _reduce_29( val, _values)
-                  []
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 103
-  def _reduce_30( val, _values)
-                  val[0].push val[2]
-                  val[0]
-  end
-.,.,
-
- # reduce 31 omitted
-
-module_eval <<'.,.,', 'parser.y', 109
-  def _reduce_32( val, _values)
-                  val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 113
-  def _reduce_33( val, _values)
-                  val[1]
-  end
-.,.,
-
- # reduce 34 omitted
-
-module_eval <<'.,.,', 'parser.y', 119
-  def _reduce_35( val, _values)
-                  val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 125
-  def _reduce_36( val, _values)
-                  val[0].spec
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 129
-  def _reduce_37( val, _values)
-                  val[0].spec
-  end
-.,.,
-
- # reduce 38 omitted
-
-module_eval <<'.,.,', 'parser.y', 136
-  def _reduce_39( val, _values)
-                  val[1]
-  end
-.,.,
-
- # reduce 40 omitted
-
- # reduce 41 omitted
-
- # reduce 42 omitted
-
- # reduce 43 omitted
-
- # reduce 44 omitted
-
- # reduce 45 omitted
-
- # reduce 46 omitted
-
-module_eval <<'.,.,', 'parser.y', 146
-  def _reduce_47( val, _values)
- [ Address.new(nil, nil) ]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 152
-  def _reduce_48( val, _values)
-                  val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 157
-  def _reduce_49( val, _values)
-                  val[0].push val[2]
-                  val[0]
-  end
-.,.,
-
- # reduce 50 omitted
-
- # reduce 51 omitted
-
-module_eval <<'.,.,', 'parser.y', 165
-  def _reduce_52( val, _values)
-                  val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 170
-  def _reduce_53( val, _values)
-                  val[0].push val[2]
-                  val[0]
-  end
-.,.,
-
- # reduce 54 omitted
-
- # reduce 55 omitted
-
-module_eval <<'.,.,', 'parser.y', 178
-  def _reduce_56( val, _values)
-                  val[1].phrase = Decoder.decode(val[0])
-                  val[1]
-  end
-.,.,
-
- # reduce 57 omitted
-
-module_eval <<'.,.,', 'parser.y', 185
-  def _reduce_58( val, _values)
-                  AddressGroup.new(val[0], val[2])
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 185
-  def _reduce_59( val, _values)
- AddressGroup.new(val[0], [])
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 188
-  def _reduce_60( val, _values)
- val[0].join('.')
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 189
-  def _reduce_61( val, _values)
- val[0] << ' ' << val[1].join('.')
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 196
-  def _reduce_62( val, _values)
-                  val[2].routes.replace val[1]
-                  val[2]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 200
-  def _reduce_63( val, _values)
-                  val[1]
-  end
-.,.,
-
- # reduce 64 omitted
-
-module_eval <<'.,.,', 'parser.y', 203
-  def _reduce_65( val, _values)
- [ val[1].join('.') ]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 204
-  def _reduce_66( val, _values)
- val[0].push val[3].join('.'); val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 206
-  def _reduce_67( val, _values)
- Address.new( val[0], val[2] )
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 207
-  def _reduce_68( val, _values)
- Address.new( val[0], nil )
-  end
-.,.,
-
- # reduce 69 omitted
-
-module_eval <<'.,.,', 'parser.y', 210
-  def _reduce_70( val, _values)
- val[0].push ''; val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 213
-  def _reduce_71( val, _values)
- val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 222
-  def _reduce_72( val, _values)
-                  val[1].times do
-                    val[0].push ''
-                  end
-                  val[0].push val[2]
-                  val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 224
-  def _reduce_73( val, _values)
- val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 233
-  def _reduce_74( val, _values)
-                  val[1].times do
-                    val[0].push ''
-                  end
-                  val[0].push val[2]
-                  val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 234
-  def _reduce_75( val, _values)
- 0
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 235
-  def _reduce_76( val, _values)
- 1
-  end
-.,.,
-
- # reduce 77 omitted
-
- # reduce 78 omitted
-
- # reduce 79 omitted
-
- # reduce 80 omitted
-
- # reduce 81 omitted
-
- # reduce 82 omitted
-
- # reduce 83 omitted
-
- # reduce 84 omitted
-
-module_eval <<'.,.,', 'parser.y', 253
-  def _reduce_85( val, _values)
-                  val[1] = val[1].spec
-                  val.join('')
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 254
-  def _reduce_86( val, _values)
- val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 255
-  def _reduce_87( val, _values)
- val[0].push val[2]; val[0]
-  end
-.,.,
-
- # reduce 88 omitted
-
-module_eval <<'.,.,', 'parser.y', 258
-  def _reduce_89( val, _values)
- val[0] << ' ' << val[1]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 265
-  def _reduce_90( val, _values)
-                  val.push nil
-                  val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 269
-  def _reduce_91( val, _values)
-                  val
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 274
-  def _reduce_92( val, _values)
-                  [ val[0].to_i, val[2].to_i ]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 279
-  def _reduce_93( val, _values)
-                  [ val[0].downcase, val[2].downcase, decode_params(val[3]) ]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 283
-  def _reduce_94( val, _values)
-                  [ val[0].downcase, nil, decode_params(val[1]) ]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 288
-  def _reduce_95( val, _values)
-                  {}
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 293
-  def _reduce_96( val, _values)
-                  val[0][ val[2].downcase ] = ('"' + val[4].to_s + '"')
-                  val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 298
-  def _reduce_97( val, _values)
-                  val[0][ val[2].downcase ] = val[4]
-                  val[0]
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 303
-  def _reduce_98( val, _values)
-                  val[0].downcase
-  end
-.,.,
-
-module_eval <<'.,.,', 'parser.y', 308
-  def _reduce_99( val, _values)
-                  [ val[0].downcase, decode_params(val[1]) ]
-  end
-.,.,
-
- # reduce 100 omitted
-
- # reduce 101 omitted
-
- # reduce 102 omitted
-
- # reduce 103 omitted
-
- # reduce 104 omitted
-
- # reduce 105 omitted
-
- # reduce 106 omitted
-
- # reduce 107 omitted
-
- # reduce 108 omitted
-
- def _reduce_none( val, _values)
-  val[0]
- end
-
-  end   # class Parser
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb
deleted file mode 100644
index 445f0e632b..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-=begin rdoc
-
-= Port class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-require 'tmail/stringio'
-
-
-module TMail
-
-  class Port
-    def reproducible?
-      false
-    end
-  end
-
-
-  ###
-  ### FilePort
-  ###
-
-  class FilePort < Port
-
-    def initialize( fname )
-      @filename = File.expand_path(fname)
-      super()
-    end
-
-    attr_reader :filename
-
-    alias ident filename
-
-    def ==( other )
-      other.respond_to?(:filename) and @filename == other.filename
-    end
-
-    alias eql? ==
-
-    def hash
-      @filename.hash
-    end
-
-    def inspect
-      "#<#{self.class}:#{@filename}>"
-    end
-
-    def reproducible?
-      true
-    end
-
-    def size
-      File.size @filename
-    end
-
-
-    def ropen( &block )
-      File.open(@filename, &block)
-    end
-
-    def wopen( &block )
-      File.open(@filename, 'w', &block)
-    end
-
-    def aopen( &block )
-      File.open(@filename, 'a', &block)
-    end
-
-
-    def read_all
-      ropen {|f|
-          return f.read
-      }
-    end
-
-
-    def remove
-      File.unlink @filename
-    end
-
-    def move_to( port )
-      begin
-        File.link @filename, port.filename
-      rescue Errno::EXDEV
-        copy_to port
-      end
-      File.unlink @filename
-    end
-
-    alias mv move_to
-
-    def copy_to( port )
-      if FilePort === port
-        copy_file @filename, port.filename
-      else
-        File.open(@filename) {|r|
-        port.wopen {|w|
-            while s = r.sysread(4096)
-              w.write << s
-            end
-        } }
-      end
-    end
-
-    alias cp copy_to
-
-    private
-
-    # from fileutils.rb
-    def copy_file( src, dest )
-      st = r = w = nil
-
-      File.open(src,  'rb') {|r|
-      File.open(dest, 'wb') {|w|
-          st = r.stat
-          begin
-            while true
-              w.write r.sysread(st.blksize)
-            end
-          rescue EOFError
-          end
-      } }
-    end
-
-  end
-
-
-  module MailFlags
-
-    def seen=( b )
-      set_status 'S', b
-    end
-
-    def seen?
-      get_status 'S'
-    end
-
-    def replied=( b )
-      set_status 'R', b
-    end
-
-    def replied?
-      get_status 'R'
-    end
-
-    def flagged=( b )
-      set_status 'F', b
-    end
-
-    def flagged?
-      get_status 'F'
-    end
-
-    private
-
-    def procinfostr( str, tag, true_p )
-      a = str.upcase.split(//)
-      a.push true_p ? tag : nil
-      a.delete tag unless true_p
-      a.compact.sort.join('').squeeze
-    end
-  
-  end
-
-
-  class MhPort < FilePort
-
-    include MailFlags
-
-    private
-    
-    def set_status( tag, flag )
-      begin
-        tmpfile = @filename + '.tmailtmp.' + $$.to_s
-        File.open(tmpfile, 'w') {|f|
-          write_status f, tag, flag
-        }
-        File.unlink @filename
-        File.link tmpfile, @filename
-      ensure
-        File.unlink tmpfile
-      end
-    end
-
-    def write_status( f, tag, flag )
-      stat = ''
-      File.open(@filename) {|r|
-        while line = r.gets
-          if line.strip.empty?
-            break
-          elsif m = /\AX-TMail-Status:/i.match(line)
-            stat = m.post_match.strip
-          else
-            f.print line
-          end
-        end
-
-        s = procinfostr(stat, tag, flag)
-        f.puts 'X-TMail-Status: ' + s unless s.empty?
-        f.puts
-
-        while s = r.read(2048)
-          f.write s
-        end
-      }
-    end
-
-    def get_status( tag )
-      File.foreach(@filename) {|line|
-        return false if line.strip.empty?
-        if m = /\AX-TMail-Status:/i.match(line)
-          return m.post_match.strip.include?(tag[0])
-        end
-      }
-      false
-    end
-  
-  end
-
-
-  class MaildirPort < FilePort
-
-    def move_to_new
-      new = replace_dir(@filename, 'new')
-      File.rename @filename, new
-      @filename = new
-    end
-
-    def move_to_cur
-      new = replace_dir(@filename, 'cur')
-      File.rename @filename, new
-      @filename = new
-    end
-
-    def replace_dir( path, dir )
-      "#{File.dirname File.dirname(path)}/#{dir}/#{File.basename path}"
-    end
-    private :replace_dir
-
-
-    include MailFlags
-
-    private
-
-    MAIL_FILE = /\A(\d+\.[\d_]+\.[^:]+)(?:\:(\d),(\w+)?)?\z/
-
-    def set_status( tag, flag )
-      if m = MAIL_FILE.match(File.basename(@filename))
-        s, uniq, type, info, = m.to_a
-        return if type and type != '2'  # do not change anything
-        newname = File.dirname(@filename) + '/' +
-                  uniq + ':2,' + procinfostr(info.to_s, tag, flag)
-      else
-        newname = @filename + ':2,' + tag
-      end
-
-      File.link @filename, newname
-      File.unlink @filename
-      @filename = newname
-    end
-
-    def get_status( tag )
-      m = MAIL_FILE.match(File.basename(@filename)) or return false
-      m[2] == '2' and m[3].to_s.include?(tag[0])
-    end
-  
-  end
-
-
-  ###
-  ###  StringPort
-  ###
-
-  class StringPort < Port
-
-    def initialize( str = '' )
-      @buffer = str
-      super()
-    end
-
-    def string
-      @buffer
-    end
-
-    def to_s
-      @buffer.dup
-    end
-
-    alias read_all to_s
-
-    def size
-      @buffer.size
-    end
-
-    def ==( other )
-      StringPort === other and @buffer.equal? other.string
-    end
-
-    alias eql? ==
-
-    def hash
-      @buffer.object_id.hash
-    end
-
-    def inspect
-      "#<#{self.class}:id=#{sprintf '0x%x', @buffer.object_id}>"
-    end
-
-    def reproducible?
-      true
-    end
-
-    def ropen( &block )
-      @buffer or raise Errno::ENOENT, "#{inspect} is already removed"
-      StringInput.open(@buffer, &block)
-    end
-
-    def wopen( &block )
-      @buffer = ''
-      StringOutput.new(@buffer, &block)
-    end
-
-    def aopen( &block )
-      @buffer ||= ''
-      StringOutput.new(@buffer, &block)
-    end
-
-    def remove
-      @buffer = nil
-    end
-
-    alias rm remove
-
-    def copy_to( port )
-      port.wopen {|f|
-          f.write @buffer
-      }
-    end
-
-    alias cp copy_to
-
-    def move_to( port )
-      if StringPort === port
-        str = @buffer
-        port.instance_eval { @buffer = str }
-      else
-        copy_to port
-      end
-      remove
-    end
-
-  end
-
-end   # module TMail
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb
deleted file mode 100644
index cb9f4288f1..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-=begin rdoc
-
-= Quoting methods
-
-=end
-module TMail
-  class Mail
-    def subject(to_charset = 'utf-8')
-      Unquoter.unquote_and_convert_to(quoted_subject, to_charset)
-    end
-
-    def unquoted_body(to_charset = 'utf-8')
-      from_charset = sub_header("content-type", "charset")
-      case (content_transfer_encoding || "7bit").downcase
-        when "quoted-printable"
-          # the default charset is set to iso-8859-1 instead of 'us-ascii'.
-          # This is needed as many mailer do not set the charset but send in ISO. This is only used if no charset is set.
-          if !from_charset.blank? && from_charset.downcase == 'us-ascii'
-            from_charset = 'iso-8859-1'
-          end
-
-          Unquoter.unquote_quoted_printable_and_convert_to(quoted_body,
-            to_charset, from_charset, true)
-        when "base64"
-          Unquoter.unquote_base64_and_convert_to(quoted_body, to_charset,
-            from_charset)
-        when "7bit", "8bit"
-          Unquoter.convert_to(quoted_body, to_charset, from_charset)
-        when "binary"
-          quoted_body
-        else
-          quoted_body
-      end
-    end
-
-    def body(to_charset = 'utf-8', &block)
-      attachment_presenter = block || Proc.new { |file_name| "Attachment: #{file_name}\n" }
-
-      if multipart?
-        parts.collect { |part|
-          header = part["content-type"]
-
-          if part.multipart?
-            part.body(to_charset, &attachment_presenter)
-          elsif header.nil?
-            ""
-          elsif !attachment?(part)
-            part.unquoted_body(to_charset)
-          else
-            attachment_presenter.call(header["name"] || "(unnamed)")
-          end
-        }.join
-      else
-        unquoted_body(to_charset)
-      end
-    end
-  end
-
-  class Unquoter
-    class << self
-      def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1", preserve_underscores=false)
-        return "" if text.nil?
-        text.gsub(/(.*?)(?:(?:=\?(.*?)\?(.)\?(.*?)\?=)|$)/) do
-          before = $1
-          from_charset = $2
-          quoting_method = $3
-          text = $4
-
-          before = convert_to(before, to_charset, from_charset) if before.length > 0
-          before + case quoting_method
-              when "q", "Q" then
-                unquote_quoted_printable_and_convert_to(text, to_charset, from_charset, preserve_underscores)
-              when "b", "B" then
-                unquote_base64_and_convert_to(text, to_charset, from_charset)
-              when nil then
-                # will be nil at the end of the string, due to the nature of
-                # the regex used.
-                ""
-              else
-                raise "unknown quoting method #{quoting_method.inspect}"
-            end
-        end
-      end
-
-      def unquote_quoted_printable_and_convert_to(text, to, from, preserve_underscores=false)
-        text = text.gsub(/_/, " ") unless preserve_underscores
-        text = text.gsub(/\r\n|\r/, "\n") # normalize newlines
-        convert_to(text.unpack("M*").first, to, from)
-      end
-
-      def unquote_base64_and_convert_to(text, to, from)
-        convert_to(Base64.decode(text), to, from)
-      end
-
-      begin
-        require 'iconv'
-        def convert_to(text, to, from)
-          return text unless to && from
-          text ? Iconv.iconv(to, from, text).first : ""
-        rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL
-          # the 'from' parameter specifies a charset other than what the text
-          # actually is...not much we can do in this case but just return the
-          # unconverted text.
-          #
-          # Ditto if either parameter represents an unknown charset, like
-          # X-UNKNOWN.
-          text
-        end
-      rescue LoadError
-        # Not providing quoting support
-        def convert_to(text, to, from)
-          warn "Action Mailer: iconv not loaded; ignoring conversion from #{from} to #{to} (#{__FILE__}:#{__LINE__})"
-          text
-        end
-      end
-    end
-  end
-end
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb
deleted file mode 100644
index b4fffb8abb..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#:stopdoc:
-require 'rbconfig'
-
-# Attempts to require anative extension.
-# Falls back to pure-ruby version, if it fails.
-#
-# This uses Config::CONFIG['arch'] from rbconfig.
-
-def require_arch(fname)
-  arch = Config::CONFIG['arch']
-  begin
-    path = File.join("tmail", arch, fname)
-    require path
-  rescue LoadError => e
-    # try pre-built Windows binaries
-    if arch =~ /mswin/
-      require File.join("tmail", 'mswin32', fname)
-    else
-      raise e
-    end
-  end
-end
-
-
-# def require_arch(fname)
-#   dext = Config::CONFIG['DLEXT']
-#   begin
-#     if File.extname(fname) == dext
-#       path = fname
-#     else
-#       path = File.join("tmail","#{fname}.#{dext}")
-#     end
-#     require path
-#   rescue LoadError => e
-#     begin
-#       arch = Config::CONFIG['arch']
-#       path = File.join("tmail", arch, "#{fname}.#{dext}")
-#       require path
-#     rescue LoadError
-#       case path
-#       when /i686/
-#         path.sub!('i686', 'i586')
-#       when /i586/
-#         path.sub!('i586', 'i486')
-#       when /i486/
-#         path.sub!('i486', 'i386')
-#       else
-#         begin
-#           require fname + '.rb'
-#         rescue LoadError
-#           raise e
-#         end
-#       end
-#       retry
-#     end
-#   end
-# end
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb
deleted file mode 100644
index a5d01396b8..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-=begin rdoc
-
-= Scanner for TMail
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-#:stopdoc:
-#require 'tmail/require_arch'
-require 'tmail/utils'
-require 'tmail/config'
-
-module TMail
-  # NOTE: It woiuld be nice if these two libs could boith be called "tmailscanner", and
-  # the native extension would have precedence. However RubyGems boffs that up b/c
-  # it does not gaurantee load_path order.
-  begin
-    raise LoadError, 'Turned off native extentions by user choice' if ENV['NORUBYEXT']
-    require('tmail/tmailscanner') # c extension
-    Scanner = TMailScanner
-  rescue LoadError
-    require 'tmail/scanner_r'
-    Scanner = TMailScanner
-  end
-end
-#:stopdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb
deleted file mode 100644
index f2075502d8..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-# scanner_r.rb
-#
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-#:stopdoc:
-require 'tmail/config'
-
-module TMail
-
-  class TMailScanner
-
-    Version = '1.2.3'
-    Version.freeze
-
-    MIME_HEADERS = {
-      :CTYPE        => true,
-      :CENCODING    => true,
-      :CDISPOSITION => true
-    }
-
-    alnum      = 'a-zA-Z0-9'
-    atomsyms   = %q[  _#!$%&`'*+-{|}~^/=?  ].strip
-    tokensyms  = %q[  _#!$%&`'*+-{|}~^@.    ].strip
-    atomchars  = alnum + Regexp.quote(atomsyms)
-    tokenchars = alnum + Regexp.quote(tokensyms)
-    iso2022str = '\e(?!\(B)..(?:[^\e]+|\e(?!\(B)..)*\e\(B'
-
-    eucstr  = "(?:[\xa1-\xfe][\xa1-\xfe])+"
-    sjisstr = "(?:[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc])+"
-    utf8str = "(?:[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf])+"
-
-    quoted_with_iso2022  = /\A(?:[^\\\e"]+|#{iso2022str})+/n
-    domlit_with_iso2022  = /\A(?:[^\\\e\]]+|#{iso2022str})+/n
-    comment_with_iso2022 = /\A(?:[^\\\e()]+|#{iso2022str})+/n
-
-    quoted_without_iso2022  = /\A[^\\"]+/n
-    domlit_without_iso2022  = /\A[^\\\]]+/n
-    comment_without_iso2022 = /\A[^\\()]+/n
-
-    PATTERN_TABLE = {}
-    PATTERN_TABLE['EUC'] =
-      [
-        /\A(?:[#{atomchars}]+|#{iso2022str}|#{eucstr})+/n,
-        /\A(?:[#{tokenchars}]+|#{iso2022str}|#{eucstr})+/n,
-        quoted_with_iso2022,
-        domlit_with_iso2022,
-        comment_with_iso2022
-      ]
-    PATTERN_TABLE['SJIS'] =
-      [
-        /\A(?:[#{atomchars}]+|#{iso2022str}|#{sjisstr})+/n,
-        /\A(?:[#{tokenchars}]+|#{iso2022str}|#{sjisstr})+/n,
-        quoted_with_iso2022,
-        domlit_with_iso2022,
-        comment_with_iso2022
-      ]
-    PATTERN_TABLE['UTF8'] =
-      [
-        /\A(?:[#{atomchars}]+|#{utf8str})+/n,
-        /\A(?:[#{tokenchars}]+|#{utf8str})+/n,
-        quoted_without_iso2022,
-        domlit_without_iso2022,
-        comment_without_iso2022
-      ]
-    PATTERN_TABLE['NONE'] =
-      [
-        /\A[#{atomchars}]+/n,
-        /\A[#{tokenchars}]+/n,
-        quoted_without_iso2022,
-        domlit_without_iso2022,
-        comment_without_iso2022
-      ]
-
-
-    def initialize( str, scantype, comments )
-      init_scanner str
-      @comments = comments || []
-      @debug    = false
-
-      # fix scanner mode
-      @received  = (scantype == :RECEIVED)
-      @is_mime_header = MIME_HEADERS[scantype]
-
-      atom, token, @quoted_re, @domlit_re, @comment_re = PATTERN_TABLE[TMail.KCODE]
-      @word_re = (MIME_HEADERS[scantype] ? token : atom)
-    end
-
-    attr_accessor :debug
-
-    def scan( &block )
-      if @debug
-        scan_main do |arr|
-          s, v = arr
-          printf "%7d %-10s %s\n",
-                 rest_size(),
-                 s.respond_to?(:id2name) ? s.id2name : s.inspect,
-                 v.inspect
-          yield arr
-        end
-      else
-        scan_main(&block)
-      end
-    end
-
-    private
-
-    RECV_TOKEN = {
-      'from' => :FROM,
-      'by'   => :BY,
-      'via'  => :VIA,
-      'with' => :WITH,
-      'id'   => :ID,
-      'for'  => :FOR
-    }
-
-    def scan_main
-      until eof?
-        if skip(/\A[\n\r\t ]+/n)   # LWSP
-          break if eof?
-        end
-
-        if s = readstr(@word_re)
-          if @is_mime_header
-            yield [:TOKEN, s]
-          else
-            # atom
-            if /\A\d+\z/ === s
-              yield [:DIGIT, s]
-            elsif @received
-              yield [RECV_TOKEN[s.downcase] || :ATOM, s]
-            else
-              yield [:ATOM, s]
-            end
-          end
-
-        elsif skip(/\A"/)
-          yield [:QUOTED, scan_quoted_word()]
-
-        elsif skip(/\A\[/)
-          yield [:DOMLIT, scan_domain_literal()]
-
-        elsif skip(/\A\(/)
-          @comments.push scan_comment()
-
-        else
-          c = readchar()
-          yield [c, c]
-        end
-      end
-
-      yield [false, '$']
-    end
-
-    def scan_quoted_word
-      scan_qstr(@quoted_re, /\A"/, 'quoted-word')
-    end
-
-    def scan_domain_literal
-      '[' + scan_qstr(@domlit_re, /\A\]/, 'domain-literal') + ']'
-    end
-
-    def scan_qstr( pattern, terminal, type )
-      result = ''
-      until eof?
-        if    s = readstr(pattern) then result << s
-        elsif skip(terminal)       then return result
-        elsif skip(/\A\\/)         then result << readchar()
-        else
-          raise "TMail FATAL: not match in #{type}"
-        end
-      end
-      scan_error! "found unterminated #{type}"
-    end
-
-    def scan_comment
-      result = ''
-      nest = 1
-      content = @comment_re
-
-      until eof?
-        if s = readstr(content) then result << s
-        elsif skip(/\A\)/)      then nest -= 1
-                                     return result if nest == 0
-                                     result << ')'
-        elsif skip(/\A\(/)      then nest += 1
-                                     result << '('
-        elsif skip(/\A\\/)      then result << readchar()
-        else
-          raise 'TMail FATAL: not match in comment'
-        end
-      end
-      scan_error! 'found unterminated comment'
-    end
-
-    # string scanner
-
-    def init_scanner( str )
-      @src = str
-    end
-
-    def eof?
-      @src.empty?
-    end
-
-    def rest_size
-      @src.size
-    end
-
-    def readstr( re )
-      if m = re.match(@src)
-        @src = m.post_match
-        m[0]
-      else
-        nil
-      end
-    end
-
-    def readchar
-      readstr(/\A./)
-    end
-
-    def skip( re )
-      if m = re.match(@src)
-        @src = m.post_match
-        true
-      else
-        false
-      end
-    end
-
-    def scan_error!( msg )
-      raise SyntaxError, msg
-    end
-
-  end
-
-end   # module TMail
-#:startdoc:
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb
deleted file mode 100644
index 8357398788..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-# encoding: utf-8
-=begin rdoc
-
-= String handling class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-class StringInput#:nodoc:
-
-  include Enumerable
-
-  class << self
-
-    def new( str )
-      if block_given?
-        begin
-          f = super
-          yield f
-        ensure
-          f.close if f
-        end
-      else
-        super
-      end
-    end
-
-    alias open new
-  
-  end
-
-  def initialize( str )
-    @src = str
-    @pos = 0
-    @closed = false
-    @lineno = 0
-  end
-
-  attr_reader :lineno
-
-  def string
-    @src
-  end
-
-  def inspect
-    "#<#{self.class}:#{@closed ? 'closed' : 'open'},src=#{@src[0,30].inspect}>"
-  end
-
-  def close
-    stream_check!
-    @pos = nil
-    @closed = true
-  end
-
-  def closed?
-    @closed
-  end
-
-  def pos
-    stream_check!
-    [@pos, @src.size].min
-  end
-
-  alias tell pos
-
-  def seek( offset, whence = IO::SEEK_SET )
-    stream_check!
-    case whence
-    when IO::SEEK_SET
-      @pos = offset
-    when IO::SEEK_CUR
-      @pos += offset
-    when IO::SEEK_END
-      @pos = @src.size - offset
-    else
-      raise ArgumentError, "unknown seek flag: #{whence}"
-    end
-    @pos = 0 if @pos < 0
-    @pos = [@pos, @src.size + 1].min
-    offset
-  end
-
-  def rewind
-    stream_check!
-    @pos = 0
-  end
-
-  def eof?
-    stream_check!
-    @pos > @src.size
-  end
-
-  def each( &block )
-    stream_check!
-    begin
-      @src.each(&block)
-    ensure
-      @pos = 0
-    end
-  end
-
-  def gets
-    stream_check!
-    if idx = @src.index(?\n, @pos)
-      idx += 1  # "\n".size
-      line = @src[ @pos ... idx ]
-      @pos = idx
-      @pos += 1 if @pos == @src.size
-    else
-      line = @src[ @pos .. -1 ]
-      @pos = @src.size + 1
-    end
-    @lineno += 1
-
-    line
-  end
-
-  def getc
-    stream_check!
-    ch = @src[@pos]
-    @pos += 1
-    @pos += 1 if @pos == @src.size
-    ch
-  end
-
-  def read( len = nil )
-    stream_check!
-    return read_all unless len
-    str = @src[@pos, len]
-    @pos += len
-    @pos += 1 if @pos == @src.size
-    str
-  end
-
-  alias sysread read
-
-  def read_all
-    stream_check!
-    return nil if eof?
-    rest = @src[@pos ... @src.size]
-    @pos = @src.size + 1
-    rest
-  end
-
-  def stream_check!
-    @closed and raise IOError, 'closed stream'
-  end
-
-end
-
-
-class StringOutput#:nodoc:
-
-  class << self
-
-    def new( str = '' )
-      if block_given?
-        begin
-          f = super
-          yield f
-        ensure
-          f.close if f
-        end
-      else
-        super
-      end
-    end
-
-    alias open new
-  
-  end
-
-  def initialize( str = '' )
-    @dest = str
-    @closed = false
-  end
-
-  def close
-    @closed = true
-  end
-
-  def closed?
-    @closed
-  end
-
-  def string
-    @dest
-  end
-
-  alias value string
-  alias to_str string
-
-  def size
-    @dest.size
-  end
-
-  alias pos size
-
-  def inspect
-    "#<#{self.class}:#{@dest ? 'open' : 'closed'},#{object_id}>"
-  end
-
-  def print( *args )
-    stream_check!
-    raise ArgumentError, 'wrong # of argument (0 for >1)' if args.empty?
-    args.each do |s|
-      raise ArgumentError, 'nil not allowed' if s.nil?
-      @dest << s.to_s
-    end
-    nil
-  end
-
-  def puts( *args )
-    stream_check!
-    args.each do |str|
-      @dest << (s = str.to_s)
-      @dest << "\n" unless s[-1] == ?\n
-    end
-    @dest << "\n" if args.empty?
-    nil
-  end
-
-  def putc( ch )
-    stream_check!
-    @dest << ch.chr
-    nil
-  end
-
-  def printf( *args )
-    stream_check!
-    @dest << sprintf(*args)
-    nil
-  end
-
-  def write( str )
-    stream_check!
-    s = str.to_s
-    @dest << s
-    s.size
-  end
-
-  alias syswrite write
-
-  def <<( str )
-    stream_check!
-    @dest << str.to_s
-    self
-  end
-
-  private
-
-  def stream_check!
-    @closed and raise IOError, 'closed stream'
-  end
-
-end
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb
deleted file mode 100644
index dc594a4229..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb
+++ /dev/null
@@ -1,337 +0,0 @@
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-# = TMail - The EMail Swiss Army Knife for Ruby
-# 
-# The TMail library provides you with a very complete way to handle and manipulate EMails
-# from within your Ruby programs.
-# 
-# Used as the backbone for email handling by the Ruby on Rails and Nitro web frameworks as
-# well as a bunch of other Ruby apps including the Ruby-Talk mailing list to newsgroup email
-# gateway, it is a proven and reliable email handler that won't let you down.
-# 
-# Originally created by Minero Aoki, TMail has been recently picked up by Mikel Lindsaar and
-# is being actively maintained.  Numerous backlogged bug fixes have been applied as well as
-# Ruby 1.9 compatibility and a swath of documentation to boot.
-# 
-# TMail allows you to treat an email totally as an object and allow you to get on with your
-# own programming without having to worry about crafting the perfect email address validation
-# parser, or assembling an email from all it's component parts.
-# 
-# TMail handles the most complex part of the email - the header.  It generates and parses
-# headers and provides you with instant access to their innards through simple and logically
-# named accessor and setter methods.
-# 
-# TMail also provides a wrapper to Net/SMTP as well as Unix Mailbox handling methods to
-# directly read emails from your unix mailbox, parse them and use them.
-# 
-# Following is the comprehensive list of methods to access TMail::Mail objects.  You can also
-# check out TMail::Mail, TMail::Address and TMail::Headers for other lists.
-module TMail
-
-  # Provides an exception to throw on errors in Syntax within TMail's parsers
-  class SyntaxError < StandardError; end
-
-  # Provides a new email boundary to separate parts of the email.  This is a random
-  # string based off the current time, so should be fairly unique.
-  # 
-  # For Example:
-  # 
-  #  TMail.new_boundary
-  #  #=> "mimepart_47bf656968207_25a8fbb80114"
-  #  TMail.new_boundary
-  #  #=> "mimepart_47bf66051de4_25a8fbb80240"
-  def TMail.new_boundary
-    'mimepart_' + random_tag
-  end
-
-  # Provides a new email message ID.  You can use this to generate unique email message
-  # id's for your email so you can track them.
-  # 
-  # Optionally takes a fully qualified domain name (default to the current hostname 
-  # returned by Socket.gethostname) that will be appended to the message ID.
-  # 
-  # For Example:
-  # 
-  #  email.message_id = TMail.new_message_id
-  #  #=> "<47bf66845380e_25a8fbb80332@baci.local.tmail>"
-  #  email.to_s
-  #  #=> "Message-Id: <47bf668b633f1_25a8fbb80475@baci.local.tmail>\n\n"
-  #  email.message_id = TMail.new_message_id("lindsaar.net")
-  #  #=> "<47bf668b633f1_25a8fbb80475@lindsaar.net.tmail>"
-  #  email.to_s
-  #  #=> "Message-Id: <47bf668b633f1_25a8fbb80475@lindsaar.net.tmail>\n\n"
-  def TMail.new_message_id( fqdn = nil )
-    fqdn ||= ::Socket.gethostname
-    "<#{random_tag()}@#{fqdn}.tmail>"
-  end
-
-  #:stopdoc:
-  def TMail.random_tag #:nodoc:
-    @uniq += 1
-    t = Time.now
-    sprintf('%x%x_%x%x%d%x',
-            t.to_i, t.tv_usec,
-            $$, Thread.current.object_id, @uniq, rand(255))
-  end
-  private_class_method :random_tag
-
-  @uniq = 0
-
-  #:startdoc:
-  
-  # Text Utils provides a namespace to define TOKENs, ATOMs, PHRASEs and CONTROL characters that
-  # are OK per RFC 2822.
-  # 
-  # It also provides methods you can call to determine if a string is safe
-  module TextUtils
-
-    aspecial     = %Q|()<>[]:;.\\,"|
-    tspecial     = %Q|()<>[];:\\,"/?=|
-    lwsp         = %Q| \t\r\n|
-    control      = %Q|\x00-\x1f\x7f-\xff|
-
-    CONTROL_CHAR  = /[#{control}]/n
-    ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n
-    PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
-    TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n
-    
-    # Returns true if the string supplied is free from characters not allowed as an ATOM
-    def atom_safe?( str )
-      not ATOM_UNSAFE === str
-    end
-
-    # If the string supplied has ATOM unsafe characters in it, will return the string quoted 
-    # in double quotes, otherwise returns the string unmodified
-    def quote_atom( str )
-      (ATOM_UNSAFE === str) ? dquote(str) : str
-    end
-
-    # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
-    # in double quotes, otherwise returns the string unmodified
-    def quote_phrase( str )
-      (PHRASE_UNSAFE === str) ? dquote(str) : str
-    end
-
-    # Returns true if the string supplied is free from characters not allowed as a TOKEN
-    def token_safe?( str )
-      not TOKEN_UNSAFE === str
-    end
-
-    # If the string supplied has TOKEN unsafe characters in it, will return the string quoted 
-    # in double quotes, otherwise returns the string unmodified
-    def quote_token( str )
-      (TOKEN_UNSAFE === str) ? dquote(str) : str
-    end
-
-    # Wraps supplied string in double quotes unless it is already wrapped
-    # Returns double quoted string
-    def dquote( str ) #:nodoc:
-      unless str =~ /^".*?"$/
-        '"' + str.gsub(/["\\]/n) {|s| '\\' + s } + '"'
-      else
-        str
-      end
-    end
-    private :dquote
-
-    # Unwraps supplied string from inside double quotes
-    # Returns unquoted string
-    def unquote( str )
-      str =~ /^"(.*?)"$/ ? $1 : str
-    end
-    
-    # Provides a method to join a domain name by it's parts and also makes it
-    # ATOM safe by quoting it as needed
-    def join_domain( arr )
-      arr.map {|i|
-          if /\A\[.*\]\z/ === i
-            i
-          else
-            quote_atom(i)
-          end
-      }.join('.')
-    end
-
-    #:stopdoc:
-    ZONESTR_TABLE = {
-      'jst' =>   9 * 60,
-      'eet' =>   2 * 60,
-      'bst' =>   1 * 60,
-      'met' =>   1 * 60,
-      'gmt' =>   0,
-      'utc' =>   0,
-      'ut'  =>   0,
-      'nst' => -(3 * 60 + 30),
-      'ast' =>  -4 * 60,
-      'edt' =>  -4 * 60,
-      'est' =>  -5 * 60,
-      'cdt' =>  -5 * 60,
-      'cst' =>  -6 * 60,
-      'mdt' =>  -6 * 60,
-      'mst' =>  -7 * 60,
-      'pdt' =>  -7 * 60,
-      'pst' =>  -8 * 60,
-      'a'   =>  -1 * 60,
-      'b'   =>  -2 * 60,
-      'c'   =>  -3 * 60,
-      'd'   =>  -4 * 60,
-      'e'   =>  -5 * 60,
-      'f'   =>  -6 * 60,
-      'g'   =>  -7 * 60,
-      'h'   =>  -8 * 60,
-      'i'   =>  -9 * 60,
-      # j not use
-      'k'   => -10 * 60,
-      'l'   => -11 * 60,
-      'm'   => -12 * 60,
-      'n'   =>   1 * 60,
-      'o'   =>   2 * 60,
-      'p'   =>   3 * 60,
-      'q'   =>   4 * 60,
-      'r'   =>   5 * 60,
-      's'   =>   6 * 60,
-      't'   =>   7 * 60,
-      'u'   =>   8 * 60,
-      'v'   =>   9 * 60,
-      'w'   =>  10 * 60,
-      'x'   =>  11 * 60,
-      'y'   =>  12 * 60,
-      'z'   =>   0 * 60
-    }
-    #:startdoc:
-
-    # Takes a time zone string from an EMail and converts it to Unix Time (seconds)
-    def timezone_string_to_unixtime( str )
-      if m = /([\+\-])(\d\d?)(\d\d)/.match(str)
-        sec = (m[2].to_i * 60 + m[3].to_i) * 60
-        m[1] == '-' ? -sec : sec
-      else
-        min = ZONESTR_TABLE[str.downcase] or
-                raise SyntaxError, "wrong timezone format '#{str}'"
-        min * 60
-      end
-    end
-
-    #:stopdoc:
-    WDAY = %w( Sun Mon Tue Wed Thu Fri Sat TMailBUG )
-    MONTH = %w( TMailBUG Jan Feb Mar Apr May Jun
-                         Jul Aug Sep Oct Nov Dec TMailBUG )
-
-    def time2str( tm )
-      # [ruby-list:7928]
-      gmt = Time.at(tm.to_i)
-      gmt.gmtime
-      offset = tm.to_i - Time.local(*gmt.to_a[0,6].reverse).to_i
-
-      # DO NOT USE strftime: setlocale() breaks it
-      sprintf '%s, %s %s %d %02d:%02d:%02d %+.2d%.2d',
-              WDAY[tm.wday], tm.mday, MONTH[tm.month],
-              tm.year, tm.hour, tm.min, tm.sec,
-              *(offset / 60).divmod(60)
-    end
-
-
-    MESSAGE_ID = /<[^\@>]+\@[^>\@]+>/
-    
-    def message_id?( str )
-      MESSAGE_ID === str
-    end
-
-
-    MIME_ENCODED = /=\?[^\s?=]+\?[QB]\?[^\s?=]+\?=/i
-
-    def mime_encoded?( str )
-      MIME_ENCODED === str
-    end
-  
-
-    def decode_params( hash )
-      new = Hash.new
-      encoded = nil
-      hash.each do |key, value|
-        if m = /\*(?:(\d+)\*)?\z/.match(key)
-          ((encoded ||= {})[m.pre_match] ||= [])[(m[1] || 0).to_i] = value
-        else
-          new[key] = to_kcode(value)
-        end
-      end
-      if encoded
-        encoded.each do |key, strings|
-          new[key] = decode_RFC2231(strings.join(''))
-        end
-      end
-
-      new
-    end
-
-    NKF_FLAGS = {
-      'EUC'  => '-e -m',
-      'SJIS' => '-s -m'
-    }
-
-    def to_kcode( str )
-      flag = NKF_FLAGS[TMail.KCODE] or return str
-      NKF.nkf(flag, str)
-    end
-
-    RFC2231_ENCODED = /\A(?:iso-2022-jp|euc-jp|shift_jis|us-ascii)?'[a-z]*'/in
-
-    def decode_RFC2231( str )
-      m = RFC2231_ENCODED.match(str) or return str
-      begin
-        to_kcode(m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
-      rescue
-        m.post_match.gsub(/%[\da-f]{2}/in, "")
-      end
-    end
-
-    def quote_boundary
-      # Make sure the Content-Type boundary= parameter is quoted if it contains illegal characters
-      # (to ensure any special characters in the boundary text are escaped from the parser
-      # (such as = in MS Outlook's boundary text))
-      if @body =~ /^(.*)boundary=(.*)$/m
-        preamble = $1
-        remainder = $2
-        if remainder =~ /;/
-          remainder =~ /^(.*?)(;.*)$/m
-          boundary_text = $1
-          post = $2.chomp
-        else
-          boundary_text = remainder.chomp
-        end
-        if boundary_text =~ /[\/\?\=]/
-          boundary_text = "\"#{boundary_text}\"" unless boundary_text =~ /^".*?"$/
-          @body = "#{preamble}boundary=#{boundary_text}#{post}"
-        end
-      end
-    end
-    #:startdoc:
-
-
-  end
-
-end
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb
deleted file mode 100644
index 95228497c0..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# version.rb
-#
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
-#
-# 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 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.
-#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
-
-#:stopdoc:
-module TMail
-  module VERSION
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 3
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end
diff --git a/actionmailer/lib/action_mailer/vendor/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail.rb
deleted file mode 100644
index 60555605f6..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
-  gem 'tmail', '~> 1.2.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.3"
-end
-
-module TMail
-end
-
-require 'tmail'
-
-require 'active_support/core_ext/kernel/reporting'
-silence_warnings do
-  TMail::Encoder.const_set("MAX_LINE_LEN", 200)
-end
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index e84b3b0d23..af6f1bc92e 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -1,12 +1,9 @@
-root = File.expand_path('../../..', __FILE__)
 begin
-  require "#{root}/vendor/gems/environment"
+  require File.expand_path('../../../vendor/gems/environment', __FILE__)
 rescue LoadError
-  $:.unshift("#{root}/activesupport/lib")
-  $:.unshift("#{root}/actionpack/lib")
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+lib = File.expand_path('../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'rubygems'
diff --git a/actionmailer/test/adv_attr_test.rb b/actionmailer/test/adv_attr_test.rb
index fd909a5627..f22d733bc5 100644
--- a/actionmailer/test/adv_attr_test.rb
+++ b/actionmailer/test/adv_attr_test.rb
@@ -1,18 +1,36 @@
 require 'abstract_unit'
 require 'action_mailer/adv_attr_accessor'
 
-class AdvAttrTest < Test::Unit::TestCase
+class AdvAttrTest < ActiveSupport::TestCase
   class Person
-    include ActionMailer::AdvAttrAccessor
+    cattr_reader :protected_instance_variables
+    @@protected_instance_variables = []
+
+    extend ActionMailer::AdvAttrAccessor
     adv_attr_accessor :name
   end
 
+  def setup
+    @person = Person.new
+  end
+
   def test_adv_attr
-    bob = Person.new
-    assert_nil bob.name
-    bob.name 'Bob'
-    assert_equal 'Bob', bob.name
+    assert_nil @person.name
+    @person.name 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_adv_attr_writer
+    assert_nil @person.name
+    @person.name = 'Bob'
+    assert_equal 'Bob', @person.name
+  end
+
+  def test_raise_an_error_with_multiple_args
+    assert_raise(ArgumentError) { @person.name('x', 'y') }
+  end
 
-    assert_raise(ArgumentError) {bob.name 'x', 'y'}
+  def test_ivar_is_added_to_protected_instnace_variables
+    assert Person.protected_instance_variables.include?('@name')
   end
 end
diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index 1c92dd266d..f3383e5608 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -24,7 +24,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)
-    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.strip
+    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
   def test_asset_host_as_one_arguement_proc
@@ -36,7 +36,7 @@ class AssetHostTest < Test::Unit::TestCase
       end
     }
     mail = AssetHostMailer.deliver_email_with_asset(@recipient)
-    assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.strip
+    assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.to_s.strip
   end
 
   def test_asset_host_as_two_arguement_proc
@@ -49,6 +49,6 @@ class AssetHostTest < Test::Unit::TestCase
     }
     mail = nil
     assert_nothing_raised { mail = AssetHostMailer.deliver_email_with_asset(@recipient) }
-    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.strip
+    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/fixtures/attachments/foo.jpg b/actionmailer/test/fixtures/attachments/foo.jpg
new file mode 100644
index 0000000000..b976fe5e00
--- /dev/null
+++ b/actionmailer/test/fixtures/attachments/foo.jpg
diff --git a/actionmailer/test/fixtures/attachments/test.jpg b/actionmailer/test/fixtures/attachments/test.jpg
new file mode 100644
index 0000000000..b976fe5e00
--- /dev/null
+++ b/actionmailer/test/fixtures/attachments/test.jpg
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index f8b002e0a7..2d3565d159 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -55,7 +55,7 @@ end
 
 class MailerHelperTest < Test::Unit::TestCase
   def new_mail( charset="utf-8" )
-    mail = TMail::Mail.new
+    mail = Mail.new
     mail.set_content_type "text", "plain", { "charset" => charset } if charset
     mail
   end
@@ -90,7 +90,7 @@ class MailerHelperTest < Test::Unit::TestCase
   def test_use_mail_helper
     mail = HelperMailer.create_use_mail_helper(@recipient)
     assert_match %r{  But soft!}, mail.encoded
-    assert_match %r{east, and\n  Juliet}, mail.encoded
+    assert_match %r{east, and\r\n  Juliet}, mail.encoded
   end
 end
 
diff --git a/actionmailer/test/mail_layout_test.rb b/actionmailer/test/mail_layout_test.rb
index f37c26ff69..0877e7b2cb 100644
--- a/actionmailer/test/mail_layout_test.rb
+++ b/actionmailer/test/mail_layout_test.rb
@@ -65,63 +65,85 @@ class LayoutMailerTest < Test::Unit::TestCase
 
   def test_should_pickup_default_layout
     mail = AutoLayoutMailer.create_hello(@recipient)
-    assert_equal "Hello from layout Inside", mail.body.strip
+    assert_equal "Hello from layout Inside", mail.body.to_s.strip
   end
 
   def test_should_pickup_multipart_layout
     mail = AutoLayoutMailer.create_multipart(@recipient)
-    assert_equal "multipart/alternative", mail.content_type
+    # CHANGED: content_type returns an object
+    # assert_equal "multipart/alternative", mail.content_type
+    assert_equal "multipart/alternative", mail.mime_type
     assert_equal 2, mail.parts.size
 
-    assert_equal 'text/plain', mail.parts.first.content_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+    # 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
 
-    assert_equal 'text/html', mail.parts.last.content_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+    # CHANGED: content_type returns an object
+    # assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal 'text/html', mail.parts.last.mime_type
+
+    # CHANGED: body returns an object
+    # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
   def test_should_pickup_multipartmixed_layout
     mail = AutoLayoutMailer.create_multipart(@recipient, "multipart/mixed")
-    assert_equal "multipart/mixed", mail.content_type
+    # CHANGED: content_type returns an object
+    # assert_equal "multipart/mixed", mail.content_type
+    assert_equal "multipart/mixed", mail.mime_type
     assert_equal 2, mail.parts.size
 
-    assert_equal 'text/plain', mail.parts.first.content_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+    # 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
 
-    assert_equal 'text/html', mail.parts.last.content_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+    # CHANGED: content_type returns an object
+    # assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal 'text/html', mail.parts.last.mime_type
+    # CHANGED: body returns an object
+    # assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
   def test_should_fix_multipart_layout
     mail = AutoLayoutMailer.create_multipart(@recipient, "text/plain")
-    assert_equal "multipart/alternative", mail.content_type
+    assert_equal "multipart/alternative", mail.mime_type
     assert_equal 2, mail.parts.size
 
-    assert_equal 'text/plain', mail.parts.first.content_type
-    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+    assert_equal 'text/plain', mail.parts.first.mime_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s
 
-    assert_equal 'text/html', mail.parts.last.content_type
-    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+    assert_equal 'text/html', mail.parts.last.mime_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body.to_s
   end
 
 
   def test_should_pickup_layout_given_to_render
     mail = AutoLayoutMailer.create_spam(@recipient)
-    assert_equal "Spammer layout Hello, Earth", mail.body.strip
+    assert_equal "Spammer layout Hello, Earth", mail.body.to_s.strip
   end
 
   def test_should_respect_layout_false
     mail = AutoLayoutMailer.create_nolayout(@recipient)
-    assert_equal "Hello, Earth", mail.body.strip
+    assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_explicit_class_layout
     mail = ExplicitLayoutMailer.create_signup(@recipient)
-    assert_equal "Spammer layout We do not spam", mail.body.strip
+    assert_equal "Spammer layout We do not spam", mail.body.to_s.strip
   end
 
   def test_explicit_layout_exceptions
     mail = ExplicitLayoutMailer.create_logout(@recipient)
-    assert_equal "You logged out", mail.body.strip
+    assert_equal "You logged out", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index 514f7ed798..09ce5e4854 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -40,13 +40,22 @@ class RenderMailer < ActionMailer::Base
     from       "tester@example.com"
   end
 
-  def included_old_subtemplate(recipient)
+  def mailer_accessor(recipient)
     recipients recipient
-    subject    "Including another template in the one being rendered"
+    subject    "Mailer Accessor"
     from       "tester@example.com"
 
-    @world = "Earth"
-    render :inline => "Hello, <%= render \"subtemplate\" %>"
+    render :inline => "Look, <%= mailer.subject %>!"
+  end
+
+  def no_instance_variable(recipient)
+    recipients recipient
+    subject    "No Instance Variable"
+    from       "tester@example.com"
+
+    silence_warnings do
+      render :inline => "Look, subject.nil? is <%= @subject.nil? %>!"
+    end
   end
 
   def initialize_defaults(method_name)
@@ -71,6 +80,8 @@ class SecondMailer < ActionMailer::Base
   end
 end
 
+# CHANGED: Those tests were changed because body returns an object now
+# Instead of mail.body.strip, we should mail.body.to_s.strip
 class RenderHelperTest < Test::Unit::TestCase
   def setup
     set_delivery_method :test
@@ -86,27 +97,37 @@ class RenderHelperTest < Test::Unit::TestCase
 
   def test_implicit_body
     mail = RenderMailer.create_implicit_body(@recipient)
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
+    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
   end
 
   def test_inline_template
     mail = RenderMailer.create_inline_template(@recipient)
-    assert_equal "Hello, Earth", mail.body.strip
+    assert_equal "Hello, Earth", mail.body.to_s.strip
   end
 
   def test_file_template
     mail = RenderMailer.create_file_template(@recipient)
-    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.strip
+    assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
   end
 
   def test_rxml_template
     mail = RenderMailer.deliver_rxml_template(@recipient)
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.strip
+    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)
-    assert_equal "Hey Ho, let's go!", mail.body.strip
+    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)
+    assert_equal "Look, subject.nil? is true!", mail.body.to_s.strip
   end
 end
 
@@ -125,12 +146,12 @@ class FirstSecondHelperTest < Test::Unit::TestCase
 
   def test_ordering
     mail = FirstMailer.create_share(@recipient)
-    assert_equal "first mail", mail.body.strip
+    assert_equal "first mail", mail.body.to_s.strip
     mail = SecondMailer.create_share(@recipient)
-    assert_equal "second mail", mail.body.strip
+    assert_equal "second mail", mail.body.to_s.strip
     mail = FirstMailer.create_share(@recipient)
-    assert_equal "first mail", mail.body.strip
+    assert_equal "first mail", mail.body.to_s.strip
     mail = SecondMailer.create_share(@recipient)
-    assert_equal "second mail", mail.body.strip
+    assert_equal "second mail", mail.body.to_s.strip
   end
 end
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index c98f0a7601..f66b4a174b 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -9,7 +9,7 @@ class FunkyPathMailer < ActionMailer::Base
     subject    "This path has dots"
     from       "Chad Fowler <chad@chadfowler.com>"
     attachment :content_type => "text/plain",
-      :body => "dots dots dots..."
+      :data => "dots dots dots..."
   end
 end
 
@@ -31,6 +31,18 @@ class TestMailer < ActionMailer::Base
     render :text => "Goodbye, Mr. #{recipient}"
   end
 
+  def from_with_name
+    from       "System <system@loudthinking.com>"
+    recipients "root@loudthinking.com"
+    render :text => "Nothing to see here."
+  end
+
+  def from_without_name
+    from       "system@loudthinking.com"
+    recipients "root@loudthinking.com"
+    render :text => "Nothing to see here."
+  end
+
   def cc_bcc(recipient)
     recipients recipient
     subject    "testing bcc/cc"
@@ -95,7 +107,7 @@ class TestMailer < ActionMailer::Base
     cc         "Foo áëô îü <extended@example.net>"
     bcc        "Foo áëô îü <extended@example.net>"
     charset    "utf-8"
-
+    
     render :text => "åœö blah"
   end
 
@@ -143,8 +155,8 @@ class TestMailer < ActionMailer::Base
       p.body = "blah"
     end
 
-    attachment :content_type => "image/jpeg", :filename => "foo.jpg",
-      :body => "123456789"
+    attachment :content_type => "image/jpeg", :filename => File.join(File.dirname(__FILE__), "fixtures", "attachments", "foo.jpg"),
+      :data => "123456789"
 
     render :text => "plain text default"
   end
@@ -227,12 +239,12 @@ class TestMailer < ActionMailer::Base
     from         "test@example.com"
     content_type "multipart/mixed"
 
-    part :content_type => "multipart/alternative", :content_disposition => "inline", :headers => { "foo" => "bar" } do |p|
+    part :content_type => "multipart/alternative", :content_disposition => "inline", "foo" => "bar" do |p|
       p.part :content_type => "text/plain", :body => "test text\nline #2"
       p.part :content_type => "text/html", :body => "<b>test</b> HTML<br/>\nline #2"
     end
 
-    attachment :content_type => "application/octet-stream",:filename => "test.txt", :body => "test abcdefghijklmnopqstuvwxyz"
+    attachment :content_type => "application/octet-stream", :filename => "test.txt", :data => "test abcdefghijklmnopqstuvwxyz"
   end
 
   def nested_multipart_with_body(recipient)
@@ -251,8 +263,8 @@ class TestMailer < ActionMailer::Base
     subject      "custom header in attachment"
     from         "test@example.com"
     content_type "multipart/related"
-    part :content_type => "text/html", :body => 'yo'
-    attachment :content_type => "image/jpeg",:filename => "test.jpeg", :body => "i am not a real picture", :headers => { 'Content-ID' => '<test@test.com>' }
+    part         :content_type => "text/html", :body => 'yo'
+    attachment   :content_type => "image/jpeg", :filename => File.join(File.dirname(__FILE__), "fixtures", "attachments", "test.jpg"), :data => "i am not a real picture", 'Content-ID' => '<test@test.com>'
   end
 
   def unnamed_attachment(recipient)
@@ -261,7 +273,7 @@ class TestMailer < ActionMailer::Base
     from         "test@example.com"
     content_type "multipart/mixed"
     part :content_type => "text/plain", :body => "hullo"
-    attachment :content_type => "application/octet-stream", :body => "test abcdefghijklmnopqstuvwxyz"
+    attachment :content_type => "application/octet-stream", :data => "test abcdefghijklmnopqstuvwxyz"
   end
 
   def headers_with_nonalpha_chars(recipient)
@@ -289,6 +301,7 @@ class TestMailer < ActionMailer::Base
     render :text => "testing"
   end
 
+  # This tests body calls accepeting a hash, which is deprecated.
   def body_ivar(recipient)
     recipients   recipient
     subject      "Body as a local variable"
@@ -319,10 +332,10 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def new_mail( charset="utf-8" )
-    mail = TMail::Mail.new
+    mail = Mail.new
     mail.mime_version = "1.0"
     if charset
-      mail.set_content_type "text", "plain", { "charset" => charset }
+      mail.content_type ["text", "plain", { "charset" => charset }]
     end
     mail
   end
@@ -346,30 +359,33 @@ class ActionMailerTest < Test::Unit::TestCase
   def test_nested_parts
     created = nil
     assert_nothing_raised { created = TestMailer.create_nested_multipart(@recipient)}
-    assert_equal 2,created.parts.size
-    assert_equal 2,created.parts.first.parts.size
-
-    assert_equal "multipart/mixed", created.content_type
-    assert_equal "multipart/alternative", created.parts.first.content_type
-    assert_equal "bar", created.parts.first.header['foo'].to_s
-    assert_nil created.parts.first.charset
-    assert_equal "text/plain", created.parts.first.parts.first.content_type
-    assert_equal "text/html", created.parts.first.parts[1].content_type
-    assert_equal "application/octet-stream", created.parts[1].content_type
+    assert_equal 2, created.parts.size
+    assert_equal 2, created.parts.first.parts.size
+
+    assert_equal "multipart/mixed", created.mime_type
+    assert_equal "multipart/alternative", created.parts[0].mime_type
+    assert_equal "bar", created.parts[0].header['foo'].to_s
+    assert_nil created.parts[0].charset
+    assert_equal "text/plain", created.parts[0].parts[0].mime_type
+    assert_equal "text/html", created.parts[0].parts[1].mime_type
+    assert_equal "application/octet-stream", created.parts[1].mime_type
+    
   end
 
   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)}
+
     assert_equal 1,created.parts.size
     assert_equal 2,created.parts.first.parts.size
 
-    assert_equal "multipart/mixed", created.content_type
-    assert_equal "multipart/alternative", created.parts.first.content_type
-    assert_equal "Nothing to see here.", created.parts.first.parts.first.body
-    assert_equal "text/plain", created.parts.first.parts.first.content_type
-    assert_equal "text/html", created.parts.first.parts[1].content_type
+    assert_equal "multipart/mixed", created.mime_type
+    assert_equal "multipart/alternative", created.parts.first.mime_type
+    assert_equal "text/plain", created.parts.first.parts.first.mime_type
+    assert_equal "Nothing to see here.", created.parts.first.parts.first.body.to_s
+    assert_equal "text/html", created.parts.first.parts.second.mime_type
+    assert_equal "<b>test</b> HTML<br/>", created.parts.first.parts.second.body.to_s
   end
 
   def test_attachment_with_custom_header
@@ -391,20 +407,30 @@ class ActionMailerTest < Test::Unit::TestCase
     created = nil
     assert_nothing_raised { created = TestMailer.create_signed_up(@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(@recipient) }
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+
+    delivered = ActionMailer::Base.deliveries.first
+    assert_not_nil delivered
+
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+
+    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
+    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
+    assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject.to_s
   end
 
   def test_custom_template
@@ -418,6 +444,8 @@ class ActionMailerTest < Test::Unit::TestCase
     created = nil
     assert_nothing_raised { created = TestMailer.create_custom_template(@recipient) }
     assert_not_nil created
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
     assert_equal expected.encoded, created.encoded
   end
 
@@ -440,8 +468,8 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_nothing_raised { created = TestMailer.create_custom_templating_extension(@recipient) }
     assert_not_nil created
     assert_equal 2, created.parts.length
-    assert_equal 'text/plain', created.parts[0].content_type
-    assert_equal 'text/html', created.parts[1].content_type
+    assert_equal 'text/plain', created.parts[0].mime_type
+    assert_equal 'text/html', created.parts[1].mime_type
   end
 
   def test_cancelled_account
@@ -455,11 +483,17 @@ class ActionMailerTest < Test::Unit::TestCase
     created = nil
     assert_nothing_raised { created = TestMailer.create_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_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+
+    assert_equal expected.encoded, delivered.encoded
   end
 
   def test_cc_bcc
@@ -477,6 +511,8 @@ class ActionMailerTest < Test::Unit::TestCase
       created = TestMailer.create_cc_bcc @recipient
     end
     assert_not_nil created
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
@@ -484,7 +520,33 @@ class ActionMailerTest < Test::Unit::TestCase
     end
 
     assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+    
+    assert_equal expected.encoded, delivered.encoded
+  end
+
+  def test_from_without_name_for_smtp
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_from_without_name
+
+    mail = MockSMTP.deliveries.first
+    assert_not_nil mail
+    mail, from, to = mail
+
+    assert_equal 'system@loudthinking.com', from.to_s
+  end
+
+  def test_from_with_name_for_smtp
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_from_with_name
+
+    mail = MockSMTP.deliveries.first
+    assert_not_nil mail
+    mail, from, to = mail
+
+    assert_equal 'system@loudthinking.com', from.addresses.first
   end
 
   def test_reply_to
@@ -502,14 +564,23 @@ class ActionMailerTest < Test::Unit::TestCase
       created = TestMailer.create_different_reply_to @recipient
     end
     assert_not_nil created
+    
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
+    
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
       TestMailer.deliver_different_reply_to @recipient
     end
 
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    assert_not_nil delivered
+    
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+    
+    assert_equal expected.encoded, delivered.encoded
   end
 
   def test_iso_charset
@@ -527,14 +598,23 @@ class ActionMailerTest < Test::Unit::TestCase
       created = TestMailer.create_iso_charset @recipient
     end
     assert_not_nil created
+    
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
+
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
       TestMailer.deliver_iso_charset @recipient
     end
 
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    assert_not_nil delivered
+
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+    
+    assert_equal expected.encoded, delivered.encoded
   end
 
   def test_unencoded_subject
@@ -552,14 +632,23 @@ class ActionMailerTest < Test::Unit::TestCase
       created = TestMailer.create_unencoded_subject @recipient
     end
     assert_not_nil created
+
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
+
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
       TestMailer.deliver_unencoded_subject @recipient
     end
 
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    assert_not_nil delivered
+
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+    
+    assert_equal expected.encoded, delivered.encoded
   end
 
   def test_instances_are_nil
@@ -625,7 +714,12 @@ class ActionMailerTest < Test::Unit::TestCase
     TestMailer.logger = FakeLogger.new
     TestMailer.deliver_signed_up(@recipient)
     assert(TestMailer.logger.info_contents =~ /Sent mail to #{@recipient}/)
-    assert_equal(TestMailer.logger.debug_contents, "\n#{mail.encoded}")
+    expected = TestMailer.logger.debug_contents
+    actual = "\n#{mail.encoded}"
+    expected.gsub!(/Message-ID:.*\r\n/, "Message-ID: <123@456>\r\n")
+    actual.gsub!(/Message-ID:.*\r\n/, "Message-ID: <123@456>\r\n")
+    
+    assert_equal(expected, actual)
   end
 
   def test_unquote_quoted_printable_subject
@@ -636,9 +730,9 @@ Content-Type: text/plain; charset=iso-8859-1
 
 The body
 EOF
-    mail = TMail::Mail.parse(msg)
+    mail = Mail.new(msg)
     assert_equal "testing testing \326\244", mail.subject
-    assert_equal "=?utf-8?Q?testing_testing_=D6=A4?=", mail.quoted_subject
+    assert_equal "Subject: =?utf-8?Q?testing_testing_=D6=A4?=\r\n", mail[:subject].encoded
   end
 
   def test_unquote_7bit_subject
@@ -649,9 +743,9 @@ Content-Type: text/plain; charset=iso-8859-1
 
 The body
 EOF
-    mail = TMail::Mail.parse(msg)
+    mail = Mail.new(msg)
     assert_equal "this == working?", mail.subject
-    assert_equal "this == working?", mail.quoted_subject
+    assert_equal "Subject: this == working?\r\n", mail[:subject].encoded
   end
 
   def test_unquote_7bit_body
@@ -663,9 +757,9 @@ Content-Transfer-Encoding: 7bit
 
 The=3Dbody
 EOF
-    mail = TMail::Mail.parse(msg)
-    assert_equal "The=3Dbody", mail.body.strip
-    assert_equal "The=3Dbody", mail.quoted_body.strip
+    mail = Mail.new(msg)
+    assert_equal "The=3Dbody", mail.body.to_s.strip
+    assert_equal "The=3Dbody", mail.body.encoded.strip
   end
 
   def test_unquote_quoted_printable_body
@@ -677,9 +771,9 @@ Content-Transfer-Encoding: quoted-printable
 
 The=3Dbody
 EOF
-    mail = TMail::Mail.parse(msg)
-    assert_equal "The=body", mail.body.strip
-    assert_equal "The=3Dbody", mail.quoted_body.strip
+    mail = Mail.new(msg)
+    assert_equal "The=body", mail.body.to_s.strip
+    assert_equal "The=3Dbody", mail.body.encoded.strip
   end
 
   def test_unquote_base64_body
@@ -691,9 +785,9 @@ Content-Transfer-Encoding: base64
 
 VGhlIGJvZHk=
 EOF
-    mail = TMail::Mail.parse(msg)
-    assert_equal "The body", mail.body.strip
-    assert_equal "VGhlIGJvZHk=", mail.quoted_body.strip
+    mail = Mail.new(msg)
+    assert_equal "The body", mail.body.to_s.strip
+    assert_equal "VGhlIGJvZHk=", mail.body.encoded.strip
   end
 
   def test_extended_headers
@@ -714,14 +808,22 @@ EOF
     end
 
     assert_not_nil created
+    expected.message_id = '<123@456>'
+    created.message_id = '<123@456>'
+
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
       TestMailer.deliver_extended_headers @recipient
     end
 
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    delivered = ActionMailer::Base.deliveries.first
+    assert_not_nil delivered
+    
+    expected.message_id = '<123@456>'
+    delivered.message_id = '<123@456>'
+    
+    assert_equal expected.encoded, delivered.encoded
   end
 
   def test_utf8_body_is_not_quoted
@@ -752,40 +854,40 @@ EOF
 
     created = TestMailer.create_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>, Example Recipient <me/, 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")
     TestMailer.receive(fixture)
-    assert_match(/Jamis/, TestMailer.received_body)
+    assert_match(/Jamis/, TestMailer.received_body.to_s)
   end
 
   def test_receive_attachments
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email2")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     attachment = mail.attachments.last
     assert_equal "smime.p7s", attachment.original_filename
-    assert_equal "application/pkcs7-signature", attachment.content_type
+    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")
-    mail = TMail::Mail.parse(fixture)
+    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")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     assert_equal 1, mail.attachments.length
     assert_equal "Photo25.jpg", mail.attachments.first.original_filename
   end
 
   def test_attachment_with_text_type
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email13")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     assert mail.has_attachments?
     assert_equal 1, mail.attachments.length
     assert_equal "hello.rb", mail.attachments.first.original_filename
@@ -793,19 +895,19 @@ EOF
 
   def test_decode_part_without_content_type
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email4")
-    mail = TMail::Mail.parse(fixture)
+    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")
-    mail = TMail::Mail.parse(fixture)
+    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")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
@@ -827,30 +929,29 @@ EOF
   def test_explicitly_multipart_messages
     mail = TestMailer.create_explicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
-    assert_nil mail.content_type
-    assert_equal "text/plain", mail.parts[0].content_type
+    assert_equal 'multipart/mixed', mail.mime_type
+    assert_equal "text/plain", mail.parts[0].mime_type
 
-    assert_equal "text/html", mail.parts[1].content_type
-    assert_equal "iso-8859-1", mail.parts[1].sub_header("content-type", "charset")
-    assert_equal "inline", mail.parts[1].content_disposition
+    assert_equal "text/html", mail.parts[1].mime_type
+    assert_equal "iso-8859-1", mail.parts[1].charset
 
-    assert_equal "image/jpeg", mail.parts[2].content_type
-    assert_equal "attachment", mail.parts[2].content_disposition
-    assert_equal "foo.jpg", mail.parts[2].sub_header("content-disposition", "filename")
-    assert_equal "foo.jpg", mail.parts[2].sub_header("content-type", "name")
-    assert_nil mail.parts[2].sub_header("content-type", "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
+    assert_nil mail.parts[2].charset
   end
 
   def test_explicitly_multipart_with_content_type
     mail = TestMailer.create_explicitly_multipart_example(@recipient, "multipart/alternative")
     assert_equal 3, mail.parts.length
-    assert_equal "multipart/alternative", mail.content_type
+    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")
     assert_equal 3, mail.parts.length
-    assert_nil mail.content_type
+    assert_equal 'multipart/mixed', mail.mime_type
   end
 
   def test_implicitly_multipart_messages
@@ -858,14 +959,14 @@ EOF
 
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
-    assert_equal "1.0", mail.mime_version
-    assert_equal "multipart/alternative", mail.content_type
-    assert_equal "application/x-yaml", mail.parts[0].content_type
-    assert_equal "utf-8", mail.parts[0].sub_header("content-type", "charset")
-    assert_equal "text/plain", mail.parts[1].content_type
-    assert_equal "utf-8", mail.parts[1].sub_header("content-type", "charset")
-    assert_equal "text/html", mail.parts[2].content_type
-    assert_equal "utf-8", mail.parts[2].sub_header("content-type", "charset")
+    assert_equal "1.0", mail.mime_version.to_s
+    assert_equal "multipart/alternative", mail.mime_type
+    assert_equal "text/plain", mail.parts[0].mime_type
+    assert_equal "utf-8", mail.parts[0].charset
+    assert_equal "text/html", mail.parts[1].mime_type
+    assert_equal "utf-8", mail.parts[1].charset
+    assert_equal "application/x-yaml", mail.parts[2].mime_type
+    assert_equal "utf-8", mail.parts[2].charset
   end
 
   def test_implicitly_multipart_messages_with_custom_order
@@ -873,41 +974,43 @@ EOF
 
     mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["application/x-yaml", "text/plain"])
     assert_equal 3, mail.parts.length
-    assert_equal "text/html", mail.parts[0].content_type
-    assert_equal "text/plain", mail.parts[1].content_type
-    assert_equal "application/x-yaml", mail.parts[2].content_type
+    assert_equal "application/x-yaml", mail.parts[0].mime_type
+    assert_equal "text/plain", mail.parts[1].mime_type
+    assert_equal "text/html", mail.parts[2].mime_type
   end
 
   def test_implicitly_multipart_messages_with_charset
     mail = TestMailer.create_implicitly_multipart_example(@recipient, 'iso-8859-1')
 
-    assert_equal "multipart/alternative", mail.header['content-type'].body
+    assert_equal "multipart/alternative", mail.header['content-type'].content_type
 
-    assert_equal 'iso-8859-1', mail.parts[0].sub_header("content-type", "charset")
-    assert_equal 'iso-8859-1', mail.parts[1].sub_header("content-type", "charset")
-    assert_equal 'iso-8859-1', mail.parts[2].sub_header("content-type", "charset")
+    assert_equal 'iso-8859-1', mail.parts[0].content_type_parameters[:charset]
+    assert_equal 'iso-8859-1', mail.parts[1].content_type_parameters[:charset]
+    assert_equal 'iso-8859-1', mail.parts[2].content_type_parameters[:charset]
   end
 
   def test_html_mail
     mail = TestMailer.create_html_mail(@recipient)
-    assert_equal "text/html", mail.content_type
+    assert_equal "text/html", mail.mime_type
   end
 
   def test_html_mail_with_underscores
     mail = TestMailer.create_html_mail_with_underscores(@recipient)
-    assert_equal %{<a href="http://google.com" target="_blank">_Google</a>}, mail.body
+    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)
     assert_equal("line #1\nline #2\nline #3\nline #4\n\n" +
-                 "line #5\n\nline#6\n\nline #7", mail.body)
+                 "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)
-    assert_equal "line #1\nline #2\nline #3\nline #4\n\n", mail.parts[0].body
-    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
+    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
+    assert_equal "<p>line #1</p>\r\n<p>line #2</p>\r\n<p>line #3</p>\r\n<p>line #4</p>\r\n\r\n", mail.parts[1].body.encoded
   end
 
   def test_headers_removed_on_smtp_delivery
@@ -935,35 +1038,41 @@ EOF
 
   def test_recursive_multipart_processing
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7")
-    mail = TMail::Mail.parse(fixture)
-    assert_equal "This is the first part.\n\nAttachment: test.rb\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
+    mail = Mail.new(fixture)
+    assert_equal(2, mail.parts.length)
+    assert_equal(4, mail.parts.first.parts.length)
+    assert_equal("This is the first part.", mail.parts.first.parts.first.body.to_s)
+    assert_equal("test.rb", mail.parts.first.parts.second.filename)
+    assert_equal("flowed", mail.parts.first.parts.fourth.content_type_parameters[:format])
+    assert_equal('smime.p7s', mail.parts.second.filename)
   end
 
   def test_decode_encoded_attachment_filename
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     attachment = mail.attachments.last
 
     expected = "01 Quien Te Dij\212at. Pitbull.mp3"
-    expected.force_encoding(Encoding::ASCII_8BIT) if expected.respond_to?(:force_encoding)
-
-    assert_equal expected, attachment.original_filename
-  end
-
-  def test_wrong_mail_header
-    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email9")
-    assert_raise(TMail::SyntaxError) { TMail::Mail.parse(fixture) }
+    
+    if expected.respond_to?(:force_encoding)
+      result = attachment.original_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
+    end
   end
 
   def test_decode_message_with_unknown_charset
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email10")
-    mail = TMail::Mail.parse(fixture)
+    mail = Mail.new(fixture)
     assert_nothing_raised { mail.body }
   end
 
   def test_empty_header_values_omitted
     result = TestMailer.create_unnamed_attachment(@recipient).encoded
-    assert_match %r{Content-Type: application/octet-stream[^;]}, result
+    assert_match %r{Content-Type: application/octet-stream;}, result
     assert_match %r{Content-Disposition: attachment[^;]}, result
   end
 
@@ -972,9 +1081,9 @@ EOF
     assert !mail.from_addrs.empty?
     assert !mail.cc_addrs.empty?
     assert !mail.bcc_addrs.empty?
-    assert_match(/:/, mail.from_addrs.to_s)
-    assert_match(/:/, mail.cc_addrs.to_s)
-    assert_match(/:/, mail.bcc_addrs.to_s)
+    assert_match(/:/, mail[:from].decoded)
+    assert_match(/:/, mail[:cc].decoded)
+    assert_match(/:/, mail[:bcc].decoded)
   end
 
   def test_deliver_with_mail_object
@@ -986,31 +1095,32 @@ EOF
   def test_multipart_with_template_path_with_dots
     mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
     assert_equal 2, mail.parts.length
-    assert "text/plain", mail.parts[1].content_type
+    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
-    assert_match %r{format=flowed}, mail['content-type'].to_s
-    assert_match %r{charset=utf-8}, mail['content-type'].to_s
+    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
+    assert_equal "another@somewhere.test", mail['return-path'].to_s
   end
 
   def test_return_path_with_deliver
     ActionMailer::Base.delivery_method = :smtp
     TestMailer.deliver_return_path
-    assert_match %r{^Return-Path: <another@somewhere.test>}, MockSMTP.deliveries[0][0]
+    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
+    mail = nil
+    ActiveSupport::Deprecation.silence { mail = TestMailer.create_body_ivar(@recipient) }
+    assert_equal "body: foo\nbar: baz", mail.body.to_s
   end
 
   def test_starttls_is_enabled_if_supported
@@ -1139,6 +1249,6 @@ class RespondToTest < Test::Unit::TestCase
       RespondToMailer.not_a_method
     end
 
-    assert_match /undefined method.*not_a_method/, error.message
+    assert_match(/undefined method.*not_a_method/, error.message)
   end
 end
diff --git a/actionmailer/test/mail_test.rb b/actionmailer/test/mail_test.rb
new file mode 100644
index 0000000000..ea6f25d157
--- /dev/null
+++ b/actionmailer/test/mail_test.rb
@@ -0,0 +1,24 @@
+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/quoting_test.rb b/actionmailer/test/quoting_test.rb
index 2fee1379db..7640f4b086 100644
--- a/actionmailer/test/quoting_test.rb
+++ b/actionmailer/test/quoting_test.rb
@@ -6,37 +6,37 @@ class QuotingTest < Test::Unit::TestCase
   # Move some tests from TMAIL here
   def test_unquote_quoted_printable
     a ="=?ISO-8859-1?Q?[166417]_Bekr=E6ftelse_fra_Rejsefeber?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'utf-8')
     assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
   end
 
   def test_unquote_base64
     a ="=?ISO-8859-1?B?WzE2NjQxN10gQmVrcuZmdGVsc2UgZnJhIFJlanNlZmViZXI=?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'utf-8')
     assert_equal "[166417] Bekr\303\246ftelse fra Rejsefeber", b
   end
 
   def test_unquote_without_charset
     a ="[166417]_Bekr=E6ftelse_fra_Rejsefeber"
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'utf-8')
     assert_equal "[166417]_Bekr=E6ftelse_fra_Rejsefeber", b
   end
 
   def test_unqoute_multiple
     a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'utf-8')
     assert_equal "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\"", b
   end
 
   def test_unqoute_in_the_middle
     a ="Re: Photos =?ISO-8859-1?Q?Brosch=FCre_Rand?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'utf-8')
     assert_equal "Re: Photos Brosch\303\274re Rand", b
   end
 
   def test_unqoute_iso
     a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'iso-8859-1')
+    b = Mail::Encodings.unquote_and_convert_to(a, 'iso-8859-1')
     expected = "Brosch\374re Rand"
     expected.force_encoding 'iso-8859-1' if expected.respond_to?(:force_encoding)
     assert_equal expected, b
@@ -50,14 +50,17 @@ class QuotingTest < Test::Unit::TestCase
       $:.unshift(File.dirname(__FILE__) + "/../lib/")
       if RUBY_VERSION < '1.9'
         $KCODE = 'u'
-        require 'jcode'
       end
       require 'action_mailer/quoting'
       include ActionMailer::Quoting
       quoted_printable(#{original.inspect}, "UTF-8")
     CODE
 
-    unquoted = TMail::Unquoter.unquote_and_convert_to(result, nil)
+    unquoted = Mail::Encodings.unquote_and_convert_to(result, nil)
+
+    unquoted.force_encoding(Encoding::ASCII_8BIT) if unquoted.respond_to?(:force_encoding)
+    original.force_encoding(Encoding::ASCII_8BIT) if original.respond_to?(:force_encoding)
+
     assert_equal unquoted, original
   end
 
@@ -65,12 +68,16 @@ class QuotingTest < Test::Unit::TestCase
   # test an email that has been created using \r\n newlines, instead of
   # \n newlines.
   def test_email_quoted_with_0d0a
-    mail = TMail::Mail.parse(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_quoted_with_0d0a"))
-    assert_match %r{Elapsed time}, mail.body
+    mail = Mail.new(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_quoted_with_0d0a"))
+    # CHANGED: subject returns an object now
+    # assert_match %r{Elapsed time}, mail.body
+    assert_match %r{Elapsed time}, mail.body.to_s
   end
 
   def test_email_with_partially_quoted_subject
-    mail = TMail::Mail.parse(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_partially_quoted_subject"))
+    mail = Mail.new(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_partially_quoted_subject"))
+    # CHANGED: subject returns an object now
+    # assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
     assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
   end
 
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 34c5243936..1fed26f78f 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -18,9 +18,9 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
 
   def test_setup_creates_the_expected_mailer
-    assert @expected.is_a?(TMail::Mail)
+    assert @expected.is_a?(Mail::Message)
     assert_equal "1.0", @expected.mime_version
-    assert_equal "text/plain", @expected.content_type
+    assert_equal "text/plain", @expected.mime_type
   end
 
   def test_mailer_class_is_correctly_inferred
@@ -92,7 +92,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /2 .* but 1/, error.message
+    assert_match(/2 .* but 1/, error.message)
   end
   
   def test_assert_emails_too_many_sent
@@ -103,7 +103,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /1 .* but 2/, error.message
+    assert_match(/1 .* but 2/, error.message)
   end
   
   def test_assert_no_emails_failure
@@ -113,7 +113,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
       end
     end
     
-    assert_match /0 .* but 1/, error.message
+    assert_match(/0 .* but 1/, error.message)
   end
 end
 
@@ -125,7 +125,7 @@ class AnotherTestHelperMailerTest < ActionMailer::TestCase
   end
 
   def test_setup_shouldnt_conflict_with_mailer_setup
-    assert @expected.is_a?(TMail::Mail)
+    assert @expected.is_a?(Mail::Message)
     assert_equal 'a value', @test_var
   end
 end
diff --git a/actionmailer/test/tmail_compat_test.rb b/actionmailer/test/tmail_compat_test.rb
new file mode 100644
index 0000000000..a1ca6a7243
--- /dev/null
+++ b/actionmailer/test/tmail_compat_test.rb
@@ -0,0 +1,23 @@
+require 'abstract_unit'
+
+class TmailCompatTest < Test::Unit::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"
+    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"
+    end
+    assert_equal mail.content_transfer_encoding, "base64"
+  end
+  
+end
diff --git a/actionmailer/test/tmail_test.rb b/actionmailer/test/tmail_test.rb
deleted file mode 100644
index 718990e79e..0000000000
--- a/actionmailer/test/tmail_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'abstract_unit'
-
-class TMailMailTest < Test::Unit::TestCase
-  def test_body
-    m = TMail::Mail.new
-    expected = 'something_with_underscores'
-    m.encoding = 'quoted-printable'
-    quoted_body = [expected].pack('*M')
-    m.body = quoted_body
-    assert_equal "something_with_underscores=\n", m.quoted_body
-    assert_equal expected, m.body
-  end
-
-  def test_nested_attachments_are_recognized_correctly
-    fixture = File.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_nested_attachment")
-    mail = TMail::Mail.parse(fixture)
-    assert_equal 2, mail.attachments.length
-    assert_equal "image/png", mail.attachments.first.content_type
-    assert_equal 1902, mail.attachments.first.length
-    assert_equal "application/pkcs7-signature", mail.attachments.last.content_type
-  end
-end
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 2224f6321c..12bf609dce 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -1,7 +1,9 @@
 require 'abstract_unit'
 
-class TestMailer < ActionMailer::Base
+class WelcomeController < ActionController::Base
+end
 
+class TestMailer < ActionMailer::Base
   default_url_options[:host] = 'www.basecamphq.com'
 
   def signed_up_with_url(recipient)
@@ -10,8 +12,8 @@ class TestMailer < ActionMailer::Base
     @from         = "system@loudthinking.com"
     @sent_on      = Time.local(2004, 12, 12)
 
-    @body["recipient"]   = recipient
-    @body["welcome_url"] = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
+    @recipient   = recipient
+    @welcome_url = url_for :host => "example.com", :controller => "welcome", :action => "greeting"
   end
 
   class <<self
@@ -31,10 +33,10 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def new_mail( charset="utf-8" )
-    mail = TMail::Mail.new
+    mail = Mail.new
     mail.mime_version = "1.0"
     if charset
-      mail.set_content_type "text", "plain", { "charset" => charset }
+      mail.content_type ["text", "plain", { "charset" => charset }]
     end
     mail
   end
@@ -52,27 +54,31 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def test_signed_up_with_url
-    ActionController::Routing.use_controllers! ['welcome'] do
-      ActionController::Routing::Routes.draw do |map|
-        map.connect ':controller/:action/:id'
-        map.welcome 'welcome', :controller=>"foo", :action=>"bar"
-      end
-
-      expected = new_mail
-      expected.to      = @recipient
-      expected.subject = "[Signed up] Welcome #{@recipient}"
-      expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
-      expected.from    = "system@loudthinking.com"
-      expected.date    = Time.local(2004, 12, 12)
-
-      created = nil
-      assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
-      assert_not_nil created
-      assert_equal expected.encoded, created.encoded
-
-      assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
-      assert_not_nil ActionMailer::Base.deliveries.first
-      assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    ActionController::Routing::Routes.draw do |map|
+      map.connect ':controller/:action/:id'
+      map.welcome 'welcome', :controller=>"foo", :action=>"bar"
     end
+
+    expected = new_mail
+    expected.to      = @recipient
+    expected.subject = "[Signed up] Welcome #{@recipient}"
+    expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
+    expected.from    = "system@loudthinking.com"
+    expected.date    = Time.local(2004, 12, 12)
+
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_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_not_nil ActionMailer::Base.deliveries.first
+    delivered = ActionMailer::Base.deliveries.first
+    
+    delivered.message_id = '<123@456>'
+    assert_equal expected.encoded, delivered.encoded
   end
 end