0
@@ -84,11 +84,8 @@ module ActionMailer
0
         end        
0
       else
0
         if String === body
0
-          part = TMail::Mail.new
0
-          part.body = body
0
-          part.set_content_type(real_content_type, nil, ctype_attrs)
0
-          part.set_content_disposition "inline"
0
-          m.parts << part
0
+          @parts.unshift Part.new(:charset => charset, :body => @body, :content_type => 'text/plain')
0
+          @body = nil
0
         end
0
           
0
         @parts.each do |p|

0
@@ -210,6 +210,16 @@ class TestMailer < ActionMailer::Base
0
     attachment :content_type => "application/octet-stream",:filename => "test.txt", :body => "test abcdefghijklmnopqstuvwxyz"
0
   end
0
   
0
+  def nested_multipart_with_body(recipient)
0
+    recipients   recipient
0
+    subject      "nested multipart with body"
0
+    from         "test@example.com"
0
+    content_type "multipart/mixed"
0
+    part :content_type => "multipart/alternative", :content_disposition => "inline", :body => "Nothing to see here." do |p|
0
+      p.part :content_type => "text/html", :body => "<b>test</b> HTML<br/>"
0
+    end
0
+  end
0
+
0
   def attachment_with_custom_header(recipient)
0
     recipients   recipient
0
     subject      "custom header in attachment"
0
@@ -310,6 +320,19 @@ class ActionMailerTest < Test::Unit::TestCase
0
     assert_equal "application/octet-stream", created.parts[1].content_type
0
   end
0
 
0
+  def test_nested_parts_with_body
0
+    created = nil
0
+    assert_nothing_raised { created = TestMailer.create_nested_multipart_with_body(@recipient)}
0
+    assert_equal 1,created.parts.size
0
+    assert_equal 2,created.parts.first.parts.size
0
+
0
+    assert_equal "multipart/mixed", created.content_type
0
+    assert_equal "multipart/alternative", created.parts.first.content_type
0
+    assert_equal "Nothing to see here.", created.parts.first.parts.first.body
0
+    assert_equal "text/plain", created.parts.first.parts.first.content_type
0
+    assert_equal "text/html", created.parts.first.parts[1].content_type
0
+  end
0
+
0
   def test_attachment_with_custom_header
0
     created = nil
0
     assert_nothing_raised { created = TestMailer.create_attachment_with_custom_header(@recipient)}