131 tests, 309 assertions, 0 failures, 0 errors

1 files changed, 4 insertions, 3 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index d0924f714a..3d0ac49c34 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -384,8 +384,9 @@ module ActionMailer #:nodoc:
     # content-disposition set to "attachment".
     def attachment(params, &block)
       params = { :content_type => params } if String === params
-      params = { :disposition => "attachment",
-                 :transfer_encoding => "base64" }.merge(params)
+      params = { :content_disposition => "attachment",
+                 :content_transfer_encoding => "base64" }.merge(params)
+      params[:data] = params.delete(:body) if params[:body]
       part(params, &block)
     end
 
@@ -623,7 +624,7 @@ module ActionMailer #:nodoc:
           m.body = normalize_new_lines(@parts.first.body)
         else
           @parts.each do |p|
-            m.parts << p
+            m.add_part(p)
           end
 
           if real_content_type =~ /multipart/