Fixed a couple possible bugs.

lib/mime/entity.rb

@@ -89,11 +89,12 @@ def multipart_boundary
       end
     end
     def attachment?
-      headers['content-disposition'] =~ /^attachment(?=;|$)/
+      headers['content-disposition'] =~ /^attachment(?=;|$)/ || headers['content-disposition'] =~ /^form-data;.* filename=[\"\']?[^\"\']+[\"\']?/
     end
-    def attachment_filename
+    alias :file? :attachment?
+    def part_filename
       # Content-Disposition: attachment; filename="summary.txt"
-      if headers['content-disposition'] =~ /^attachment; filename=[\"\']?([^\"\']+)/
+      if headers['content-disposition'] =~ /; filename=[\"\']?([^\"\']+)/
         $1
       end
     end
@@ -120,8 +121,8 @@ def find_parts(options)
 
     def save_to_file(path=nil)
       filename = path if path && !File.exists?(path) # If path doesn't exist, assume it's a filename
-      filename ||= path + '/' + attachment_filename if path && attachment? # If path does exist, and we're saving an attachment, use the attachment filename
-      filename ||= (attachment? ? attachment_filename : path) # If there is no path and we're saving an attachment, use the attachment filename; otherwise use path (whether it is present or not)
+      filename ||= path + '/' + part_filename if path && attachment? # If path does exist, and we're saving an attachment, use the attachment filename
+      filename ||= (attachment? ? part_filename : path) # If there is no path and we're saving an attachment, use the attachment filename; otherwise use path (whether it is present or not)
       filename ||= '.' # No path supplied, and not saving an attachment. We'll just save it in the current directory.
       if File.directory?(filename)
         i = 0

lib/mime/message.rb

@@ -28,6 +28,15 @@ def attachments
       find_parts(:content_disposition => 'attachment')
     end
 
+    def text
+      part = find_part(:content_type => 'text/plain')
+      part.content if part
+    end
+    def html
+      part = find_part(:content_type => 'text/html')
+      part.content if part
+    end
+
     def save_attachments_to(path=nil)
       attachments.each {|a| a.save_to_file(path) }
     end