0
@@ -41,7 +41,11 @@
0
     private
0
     
0
       def parse_content_type(defaults=nil)
0
-        return [defaults && defaults.content_type, {}] if content_type.blank?
0
+        if content_type.blank? 
0
+          return defaults                                                ? 
0
+            [ defaults.content_type, { 'charset' => defaults.charset } ] : 
0
+            [ nil, {} ] 
0
+        end 
0
         ctype, *attrs = content_type.split(/;\s*/)
0
         attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
0
         [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]

0
@@ -883,6 +883,8 @@
0
   def test_multipart_with_template_path_with_dots
0
     mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
0
     assert_equal 2, mail.parts.length
0
+    assert_equal 'text/plain', mail.parts[0].content_type
0
+    assert_equal 'utf-8', mail.parts[0].charset
0
   end
0
 
0
   def test_custom_content_type_attributes