mail 1.4.3 → 1.5.0

data/lib/mail/fields/resent_sender_field.rb

@@ -38,7 +38,7 @@ module Mail
     end
 
     def addresses
-      [address]
+      [address.address]
     end
 
     def address

data/lib/mail/fields/resent_to_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.resent_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_to    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
+#  mail.resent_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:resent_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
 #  mail['resent-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
 #  mail['Resent-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
 # 
-#  mail.resent_to.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_to.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.resent_to.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:resent_to].encoded   #=> 'Resent-To: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:resent_to].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:resent_to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:resent_to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ResentToField < StructuredField

data/lib/mail/fields/sender_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.sender    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
+#  mail.sender    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 #  mail['sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 #  mail['Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 # 
-#  mail.sender.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.sender.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.sender.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:sender].encoded   #=> 'Sender: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:sender].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class SenderField < StructuredField
@@ -38,7 +39,7 @@ module Mail
     end
 
     def addresses
-      [address]
+      [address.address]
     end
 
     def address

data/lib/mail/fields/structured_field.rb

@@ -28,5 +28,9 @@ module Mail
       self
     end
     
+    def default
+      decoded
+    end
+
   end
 end

data/lib/mail/fields/to_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.to    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
+#  mail.to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
 #  mail['to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
 #  mail['To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
 # 
-#  mail.to.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.to.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.to.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:to].encoded   #=> 'To: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:to].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ToField < StructuredField

data/lib/mail/fields/unstructured_field.rb

@@ -31,6 +31,10 @@ module Mail
       do_decode
     end
 
+    def default
+      decoded
+    end
+
     private
     
     def do_encode(name)

data/lib/mail/header.rb

@@ -107,6 +107,7 @@ module Mail
     #  h['To']          #=> 'mikel@me.com'
     #  h['X-Mail-SPAM'] #=> ['15', '20']
     def [](name)
+      name = dasherize(name)
       selected = select_field_for(name)
       case
       when selected.length > 1
@@ -132,8 +133,9 @@ module Mail
     #  h['X-Mail-SPAM'] = nil
     #  h['X-Mail-SPAM'] # => nil
     def []=(name, value)
+      name = dasherize(name)
       selected = select_field_for(name)
-
+      
       case
       # User wants to delete the field
       when !selected.blank? && value == nil
@@ -141,7 +143,6 @@ module Mail
         
       # User wants to change the field
       when !selected.blank? && limited_field?(name)
-
         selected.first.update(name, value)
         
       # User wants to create the field
@@ -223,7 +224,7 @@ module Mail
     end
     
     def select_field_for(name)
-      fields.select { |f| f.responsible_for?(name) }
+      fields.select { |f| f.responsible_for?(name.to_s) }
     end
     
     def limited_field?(name)

data/lib/mail/message.rb

@@ -152,6 +152,582 @@ module Mail
       end
     end
     
+    # Returns the Bcc value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Bcc.
+    #
+    # Example:
+    # 
+    #  mail.bcc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.bcc #=> 'mikel@test.lindsaar.net'
+    #  mail.bcc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.bcc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.bcc 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.bcc #=> 'mikel@test.lindsaar.net'
+    def bcc( val = nil )
+      default :bcc, val
+    end
+    
+    # Sets the Bcc value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.bcc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.bcc #=> 'mikel@test.lindsaar.net'
+    #  mail.bcc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.bcc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def bcc=( val )
+      header[:bcc] = val
+    end
+    
+    # Returns the Cc value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Cc.
+    #
+    # Example:
+    # 
+    #  mail.cc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.cc #=> 'mikel@test.lindsaar.net'
+    #  mail.cc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.cc 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.cc #=> 'mikel@test.lindsaar.net'
+    def cc( val = nil )
+      default :cc, val
+    end
+    
+    # Sets the Cc value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.cc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.cc #=> 'mikel@test.lindsaar.net'
+    #  mail.cc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def cc=( val )
+      header[:cc] = val
+    end
+    
+    def comments( val = nil )
+      default :comments, val
+    end
+    
+    def comments=( val )
+      header[:comments] = val
+    end
+    
+    def content_description( val = nil )
+      default :content_description, val
+    end
+    
+    def content_description=( val )
+      header[:content_description] = val
+    end
+    
+    def content_disposition( val = nil )
+      default :content_disposition, val
+    end
+    
+    def content_disposition=( val )
+      header[:content_disposition] = val
+    end
+    
+    def content_id( val = nil )
+      default :content_id, val
+    end
+    
+    def content_id=( val )
+      header[:content_id] = val
+    end
+    
+    def content_location( val = nil )
+      default :content_location, val
+    end
+    
+    def content_location=( val )
+      header[:content_location] = val
+    end
+    
+    def content_transfer_encoding( val = nil )
+      default :content_transfer_encoding, val
+    end
+    
+    def content_transfer_encoding=( val )
+      header[:content_transfer_encoding] = val
+    end
+    
+    def content_type( val = nil )
+      default :content_type, val
+    end
+    
+    def content_type=( val )
+      header[:content_type] = val
+    end
+    
+    def date( val = nil )
+      default :date, val
+    end
+    
+    def date=( val )
+      header[:date] = val
+    end
+    
+    # Returns the From value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the From.
+    #
+    # Example:
+    # 
+    #  mail.from = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.from #=> 'mikel@test.lindsaar.net'
+    #  mail.from = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.from #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.from 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.from #=> 'mikel@test.lindsaar.net'
+    def from( val = nil )
+      default :from, val
+    end
+    
+    # Sets the From value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.from = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.from #=> 'mikel@test.lindsaar.net'
+    #  mail.from = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.from #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def from=( val )
+      header[:from] = val
+    end
+    
+    def in_reply_to( val = nil )
+      default :in_reply_to, val
+    end
+    
+    def in_reply_to=( val )
+      header[:in_reply_to] = val
+    end
+    
+    def keywords( val = nil )
+      default :keywords, val
+    end
+    
+    def keywords=( val )
+      header[:keywords] = val
+    end
+    
+    # Returns the Message-ID of the mail object.  Note, per RFC 2822 the Message ID
+    # consists of what is INSIDE the < > usually seen in the mail header, so this method
+    # will return only what is inside.
+    # 
+    # Example:
+    # 
+    #  mail.message_id = '<1234@message.id>'
+    #  mail.message_id #=> '1234@message.id'
+    # 
+    # Also allows you to set the Message-ID by passing a string as a parameter
+    # 
+    #  mail.message_id '<1234@message.id>'
+    #  mail.message_id #=> '1234@message.id'
+    def message_id( val = nil )
+      default :message_id, val
+    end
+    
+    # Sets the Message-ID. Note, per RFC 2822 the Message ID consists of what is INSIDE
+    # the < > usually seen in the mail header, so this method will return only what is inside.
+    # 
+    #  mail.message_id = '<1234@message.id>'
+    #  mail.message_id #=> '1234@message.id'
+    def message_id=( val )
+      header[:message_id] = val
+    end
+    
+    # Returns the mime version of the email as a string
+    # 
+    # Example:
+    # 
+    #  mail.mime_version = '1.0'
+    #  mail.mime_version #=> '1.0'
+    # 
+    # Also allows you to set the mime version by passing a string as a parameter.
+    # 
+    # Example:
+    # 
+    #  mail.mime_version '1.0'
+    #  mail.mime_version #=> '1.0'
+    def mime_version( val = nil )
+      default :mime_version, val
+    end
+    
+    # Sets the mime version of the email by accepting a string
+    # 
+    # Example:
+    # 
+    #  mail.mime_version = '1.0'
+    #  mail.mime_version #=> '1.0'
+    def mime_version=( val )
+      header[:mime_version] = val
+    end
+    
+    def received( val = nil )
+      if val
+        header[:received] = val
+      else
+        header[:received]
+      end
+    end
+    
+    def received=( val )
+      header[:received] = val
+    end
+    
+    def references( val = nil )
+      default :references, val
+    end
+    
+    def references=( val )
+      header[:references] = val
+    end
+    
+    # Returns the Reply-To value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Reply-To.
+    #
+    # Example:
+    # 
+    #  mail.reply_to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.reply_to #=> 'mikel@test.lindsaar.net'
+    #  mail.reply_to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.reply_to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.reply_to 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.reply_to #=> 'mikel@test.lindsaar.net'
+    def reply_to( val = nil )
+      default :reply_to, val
+    end
+    
+    # Sets the Reply-To value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.reply_to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.reply_to #=> 'mikel@test.lindsaar.net'
+    #  mail.reply_to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.reply_to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def reply_to=( val )
+      header[:reply_to] = val
+    end
+    
+    # Returns the Resent-Bcc value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Resent-Bcc.
+    # 
+    # Example:
+    # 
+    #  mail.resent_bcc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_bcc #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_bcc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_bcc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.resent_bcc 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_bcc #=> 'mikel@test.lindsaar.net'
+    def resent_bcc( val = nil )
+      default :resent_bcc, val
+    end
+    
+    # Sets the Resent-Bcc value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.resent_bcc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_bcc #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_bcc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_bcc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']    
+    def resent_bcc=( val )
+      header[:resent_bcc] = val
+    end
+    
+    # Returns the Resent-Cc value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Resent-Cc.
+    # 
+    # Example:
+    # 
+    #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_cc #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.resent_cc 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_cc #=> 'mikel@test.lindsaar.net'
+    def resent_cc( val = nil )
+      default :resent_cc, val
+    end
+    
+    # Sets the Resent-Cc value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_cc #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']    
+    def resent_cc=( val )
+      header[:resent_cc] = val
+    end
+    
+    def resent_date( val = nil )
+      default :resent_date, val
+    end
+    
+    def resent_date=( val )
+      header[:resent_date] = val
+    end
+    
+    # Returns the Resent-From value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Resent-From.
+    #
+    # Example:
+    # 
+    #  mail.resent_from = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_from #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_from = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_from #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.resent_from 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_from #=> 'mikel@test.lindsaar.net'
+    def resent_from( val = nil )
+      default :resent_from, val
+    end
+    
+    # Sets the Resent-From value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.resent_from = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_from #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_from = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_from #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def resent_from=( val )
+      header[:resent_from] = val
+    end
+    
+    def resent_message_id( val = nil )
+      default :resent_message_id, val
+    end
+    
+    def resent_message_id=( val )
+      header[:resent_message_id] = val
+    end
+    
+    # Returns the Resent-Sender value of the mail object, as a single string of an address
+    # spec.  A sender per RFC 2822 must be a single address
+    #
+    # Example:
+    # 
+    #  mail.resent_sender = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_sender #=> 'mikel@test.lindsaar.net'
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.resent_sender 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_sender #=> 'mikel@test.lindsaar.net'
+    def resent_sender( val = nil )
+      default :resent_sender, val
+    end
+
+    # Sets the Resent-Sender value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.sender = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.sender #=> 'mikel@test.lindsaar.net'
+    def resent_sender=( val )
+      header[:resent_sender] = val
+    end
+    
+    # Returns the Resent-To value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the Resent-To.
+    #
+    # Example:
+    # 
+    #  mail.resent_to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_to #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.resent_to 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_to #=> 'mikel@test.lindsaar.net'
+    def resent_to( val = nil )
+      default :resent_to, val
+    end
+    
+    # Sets the Resent-To value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.resent_to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.resent_to #=> 'mikel@test.lindsaar.net'
+    #  mail.resent_to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.resent_to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def resent_to=( val )
+      header[:resent_to] = val
+    end
+    
+    # Returns the return path of the mail object, or sets it if you pass a string
+    def return_path( val = nil )
+      default :return_path, val
+    end
+    
+    # Sets the return path of the object
+    def return_path=( val )
+      header[:return_path] = val
+    end
+    
+    # Returns the Sender value of the mail object, as a single string of an address
+    # spec.  A sender per RFC 2822 must be a single address
+    #
+    # Example:
+    # 
+    #  mail.sender = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.sender #=> 'mikel@test.lindsaar.net'
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.sender 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.sender #=> 'mikel@test.lindsaar.net'
+    def sender( val = nil )
+      default :sender, val
+    end
+    
+    # Sets the Sender value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.sender = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.sender #=> 'mikel@test.lindsaar.net'
+    def sender=( val )
+      header[:sender] = val
+    end
+    
+    # Returns the decoded value of the subject field, as a single string.
+    #
+    # Example:
+    # 
+    #  mail.subject = "G'Day mate"
+    #  mail.subject #=> "G'Day mate"
+    #  mail.subject = '=?UTF-8?Q?This_is_=E3=81=82_string?='
+    #  mail.subject #=> "This is あ string"
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.subject "G'Day mate"
+    #  mail.subject #=> "G'Day mate"
+    def subject( val = nil )
+      default :subject, val
+    end
+    
+    # Sets the Subject value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.subject = '=?UTF-8?Q?This_is_=E3=81=82_string?='
+    #  mail.subject #=> "This is あ string"
+    def subject=( val )
+      header[:subject] = val
+    end
+    
+    # Returns the To value of the mail object, either a single string of an address
+    # spec or an array of strings of address specs if there is more than one address
+    # in the To.
+    #
+    # Example:
+    # 
+    #  mail.to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.to #=> 'mikel@test.lindsaar.net'
+    #  mail.to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    # 
+    # Also allows you to set the value by passing a value as a parameter
+    #
+    # Example:
+    # 
+    #  mail.to 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.to #=> 'mikel@test.lindsaar.net'
+    def to( val = nil )
+      default :to, val
+    end
+    
+    # Sets the To value of the mail object, pass in a string of the field
+    #
+    # Example:
+    # 
+    #  mail.to = 'Mikel <mikel@test.lindsaar.net>'
+    #  mail.to #=> 'mikel@test.lindsaar.net'
+    #  mail.to = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+    #  mail.to #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+    def to=( val )
+      header[:to] = val
+    end
+
+    # Returns the default value of the field requested as a symbol.
+    #
+    # Each header field has a :default method which returns the most common use case for 
+    # that field, for example, the date field types will return a DateTime object when
+    # sent :default, the subject, or unstructured fields will return a decoded string of
+    # their value, the address field types will return a single addr_spec or an array of
+    # addr_specs if there is more than one.
+    def default( sym, val = nil )
+      if val
+        header[sym] = val
+      else
+        header[sym].default if header[sym]
+      end
+    end
+    
     # Sets the body object of the message object.
     # 
     # Example:
@@ -207,56 +783,7 @@ module Mail
         @body
       end
     end
-    
-    # Sets the to filed of the message header.
-    # 
-    # Example:
-    # 
-    #  mail.to = '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    #  mail.to #=> '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    def to=(value)
-      header[:to] = value
-    end
-    
-    # Returns the to field in the message header. Or, if passed
-    # a parameter sets the value.
-    # 
-    # Example:
-    # 
-    #  mail.to = '"M L" <mikel@test.lindsaar.net>'
-    #  mail.to.to_s #=> '"M L" <mikel@test.lindsaar.net>'
-    #  mail.to.formatted #=> ['"M L" <mikel@test.lindsaar.net>']
-    #  mail.to.addresses #=> ['mikel@test.lindsaar.net']
-    def to(value = nil)
-      value ? self.to = value : header[:to]
-    end
-
-    # Sets the from field in the message header.
-    # 
-    # Example:
-    # 
-    #  mail.from = '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    #  mail.from.to_s #=> '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    def from=(value)
-      header[:from] = value
-    end
-    
-    # Returns the from field in the message header. Or, if passed
-    # a parameter sets the value.
-    # 
-    # Example:
-    # 
-    #  mail.from = '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    #  mail.from.to_s #=> '"Mikel Lindsaar" <mikel@test.lindsaar.net>'
-    # 
-    #  mail.from '"M L" <mikel@test.lindsaar.net>'
-    #  mail.from.to_s #=> '"M L" <mikel@test.lindsaar.net>'
-    #  mail.from.formatted #=> ['"M L" <mikel@test.lindsaar.net>']
-    #  mail.from.addresses #=> ['mikel@test.lindsaar.net']
-    def from(value = nil)
-      value ? self.from = value : header[:from]
-    end
-    
+     
     # Returns the list of addresses this message should be sent to by
     # collecting the addresses off the to, cc and bcc fields.
     # 
@@ -268,55 +795,31 @@ module Mail
     #  mail.destinations.length #=> 3
     #  mail.destinations.first #=> 'mikel@test.lindsaar.net'
     def destinations
-      [to, cc, bcc].map { |f| f.addresses if f }.compact.flatten
+      [to_addrs, cc_addrs, bcc_addrs].compact.flatten
     end
 
     # Returns an array of addresses (the encoded value) in the From field,
     # if no From field, returns an empty array
     def from_addrs
-      from ? from.formatted.compact.flatten : []
+      from ? [from].flatten : []
     end
     
     # Returns an array of addresses (the encoded value) in the To field,
     # if no To field, returns an empty array
     def to_addrs
-      to ? to.formatted.compact.flatten : []
+      to ? [to].flatten : []
     end
     
     # Returns an array of addresses (the encoded value) in the Cc field,
     # if no Cc field, returns an empty array
     def cc_addrs
-      cc ? cc.formatted.compact.flatten : []
+      cc ? [cc].flatten : []
     end
     
     # Returns an array of addresses (the encoded value) in the Bcc field,
     # if no Bcc field, returns an empty array
     def bcc_addrs
-      bcc ? bcc.formatted.compact.flatten : []
-    end
-    
-    # Sets the subject field in the message header.
-    # 
-    # Example:
-    # 
-    #  mail.subject = 'This is the subject'
-    #  mail.subject.to_s #=> 'This is the subject'
-    def subject=(value)
-      header[:subject] = value
-    end
-    
-    # Returns the subject field in the message header. Or, if passed
-    # a parameter sets the value.
-    # 
-    # Example:
-    # 
-    #  mail.subject = 'This is the subject'
-    #  mail.subject.to_s #=> 'This is the subject'
-    # 
-    #  mail.subject 'This is another subject'
-    #  mail.subject.to_s #=> 'This is another subject'
-    def subject(value = nil)
-      value ? self.subject = value : header[:subject]
+      bcc ? [bcc].flatten : []
     end
     
     # Allows you to add an arbitrary header
@@ -366,10 +869,10 @@ module Mail
     # Examples:
     # 
     #  mail.comments = 'These are some comments'
-    #  mail.comments.to_s #=> 'These are some comments'
+    #  mail.comments #=> 'These are some comments'
     # 
     #  mail.comments 'These are other comments'
-    #  mail.comments.to_s #=> 'These are other comments'
+    #  mail.comments #=> 'These are other comments'
     # 
     # 
     #  mail.date = 'Tue, 1 Jul 2003 10:52:37 +0200'
@@ -380,10 +883,10 @@ module Mail
     # 
     #
     #  mail.resent_msg_id = '<1234@resent_msg_id.lindsaar.net>'
-    #  mail.resent_msg_id.to_s #=> '<1234@resent_msg_id.lindsaar.net>'
+    #  mail.resent_msg_id #=> '<1234@resent_msg_id.lindsaar.net>'
     # 
     #  mail.resent_msg_id '<4567@resent_msg_id.lindsaar.net>'
-    #  mail.resent_msg_id.to_s #=> '<4567@resent_msg_id.lindsaar.net>'
+    #  mail.resent_msg_id #=> '<4567@resent_msg_id.lindsaar.net>'
     def method_missing(name, *args, &block)
       #:nodoc:
       # Only take the structured fields, as we could take _anything_ really
@@ -476,7 +979,7 @@ module Mail
     # 
     # Otherwise raises a warning
     def add_content_type
-      header['Content-Type'] = 'text/plain'
+      header[:content_type] = 'text/plain'
     end
     
     # Adds a content type and charset if the body is US-ASCII
@@ -484,11 +987,11 @@ module Mail
     # Otherwise raises a warning
     def add_charset
       if body.only_us_ascii?
-        content_type.parameters['charset'] = 'US-ASCII'
+        header[:content_type].parameters['charset'] = 'US-ASCII'
       else
         warning = "Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.\nCalled from:\n#{caller.join("\n")}"
         STDERR.puts(warning)
-        content_type.parameters['charset'] = 'UTF-8'
+        header[:content_type].parameters['charset'] = 'UTF-8'
       end
     end
     
@@ -497,11 +1000,11 @@ module Mail
     # Otherwise raises a warning
     def add_content_transfer_encoding
       if body.only_us_ascii?
-        header['Content-Transfer-Encoding'] = '7bit'
+        header[:content_transfer_encoding] = '7bit'
       else
         warning = "Non US-ASCII detected and no content-transfer-encoding defined.\nDefaulting to 8bit, set your own if this is incorrect.\nCalled from:\n#{caller.join("\n")}"
         STDERR.puts(warning)
-        header['Content-Transfer-Encoding'] = '8bit'
+        header[:content_transfer_encoding] = '8bit'
       end
     end
     
@@ -515,21 +1018,26 @@ module Mail
       content_transfer_encoding
     end
     
-    # Returns the content type
+    # Returns the mime type of part we are on, this is taken from the content-type header
+    def mime_type
+      content_type ? header[:content_type].string : nil
+    end
+    
     def message_content_type
-      content_type ? content_type.content_type : nil
+      STDERR.puts(":message_content_type is deprecated in Mail 1.4.3.  Please use mime_type\n#{caller}")
+      mime_type
     end
     
     # Returns the character set defined in the content type field
     def charset
-      content_type ? content_type.parameters['charset'] : nil
+      content_type ? content_type_parameters['charset'] : nil
     end
 
     # Sets the charset to the supplied value.  Will set the content type to text/plain if
     # it does not already exist
     def charset=(value)
       if content_type
-        content_type.parameters['charset'] = value
+        content_type_parameters['charset'] = value
       else
         self.content_type ['text', 'plain', {'charset' => value}]
       end
@@ -537,17 +1045,23 @@ module Mail
     
     # Returns the main content type
     def main_type
-      has_content_type? ? content_type.main_type : nil
+      has_content_type? ? header[:content_type].main_type : nil
     end
     
     # Returns the sub content type
     def sub_type
-      has_content_type? ? content_type.sub_type : nil
+      has_content_type? ? header[:content_type].sub_type : nil
     end
     
     # Returns the content type parameters
     def mime_parameters
-      has_content_type? ? content_type.parameters : nil
+      STDERR.puts(':mime_parameters is deprecated in Mail 1.4.3, please use :content_type_parameters instead')
+      content_type_parameters
+    end
+    
+    # Returns the content type parameters
+    def content_type_parameters
+      has_content_type? ? header[:content_type].parameters : nil
     end
     
     # Returns true if the message is multipart
@@ -562,7 +1076,7 @@ module Mail
     
     # Returns true if the message is a multipart/report; report-type=delivery-status;
     def delivery_status_report?
-      multipart_report? && mime_parameters['report-type'] =~ /^delivery-status$/i
+      multipart_report? && content_type_parameters['report-type'] =~ /^delivery-status$/i
     end
     
     # returns the part in a multipart/report email that has the content-type delivery-status
@@ -600,7 +1114,7 @@ module Mail
     
     # Returns the current boundary for this message part
     def boundary
-      mime_parameters ? mime_parameters['boundary'] : nil
+      content_type_parameters ? content_type_parameters['boundary'] : nil
     end
     
     # Returns an array of parts in the message
@@ -829,7 +1343,7 @@ module Mail
     
     def add_encoding_to_body
       unless content_transfer_encoding.blank?
-        body.encoding = content_transfer_encoding.decoded
+        body.encoding = content_transfer_encoding
       end
     end
     
@@ -907,7 +1421,7 @@ module Mail
       parse_message
       separate_parts if multipart?
       if filename = attachment?
-        encoding = content_transfer_encoding.encoding if content_transfer_encoding
+        encoding = header[:content_transfer_encoding].encoding if content_transfer_encoding
         @attachment = Mail::Attachment.new(:filename => filename,
                                            :data => body.encoded,
                                            :encoding => encoding)
@@ -917,12 +1431,12 @@ module Mail
     # Returns the filename of the attachment (if it exists) or returns nil
     def find_attachment
       case
-      when content_type && content_type.filename
-        filename = content_type.filename
-      when content_disposition && content_disposition.filename
-        filename = content_disposition.filename
-      when content_location && content_location.location
-        filename = content_location.location
+      when content_type && header[:content_type].filename
+        filename = header[:content_type].filename
+      when content_disposition && header[:content_disposition].filename
+        filename = header[:content_disposition].filename
+      when content_location && header[:content_location].location
+        filename = header[:content_location].location
       else
         filename = nil
       end