mail 2.4.4 → 2.6.3

data/lib/mail/fields/content_disposition_field.rb

@@ -9,6 +9,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/content_id_field.rb

@@ -55,8 +55,7 @@ module Mail
     private
     
     def generate_content_id
-      fqdn = ::Socket.gethostname
-      "<#{Mail.random_tag}@#{fqdn}.mail>"
+      "<#{Mail.random_tag}@#{::Socket.gethostname}.mail>"
     end
     
   end

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -10,8 +10,8 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      value = '7bit' if value.to_s =~ /7-bit/i
-      value = '8bit' if value.to_s =~ /8-bit/i
+      value = '7bit' if value.to_s =~ /7-?bits?/i
+      value = '8bit' if value.to_s =~ /8-?bits?/i
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
@@ -23,12 +23,6 @@ module Mail
       end
     end
     
-    def tree
-      STDERR.puts("tree is deprecated.  Please use encoding to get parse result\n#{caller}")
-      @element ||= Mail::ContentTransferEncodingElement.new(value)
-      @tree ||= @element.tree
-    end
-    
     def element
       @element ||= Mail::ContentTransferEncodingElement.new(value)
     end

data/lib/mail/fields/content_type_field.rb

@@ -19,6 +19,7 @@ module Mail
         @parameters = nil
         value = strip_field(FIELD_NAME, value)
       end
+      ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
@@ -141,7 +142,9 @@ module Mail
     def sanatize( val )
 
       # TODO: check if there are cases where whitespace is not a separator
-      val = val.tr(' ',';').
+      val = val.
+        gsub(/\s*=\s*/,'='). # remove whitespaces around equal sign
+        tr(' ',';').
         squeeze(';').
         gsub(';', '; '). #use '; ' as a separator (or EOL)
         gsub(/;\s*$/,'') #remove trailing to keep examples below
@@ -177,7 +180,7 @@ module Mail
         params = $2.to_s.split(/\s+/)
         params = params.map { |i| i.to_s.chomp.strip }
         params = params.map { |i| i.split(/\s*\=\s*/) }
-        params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s)}" }.join('; ')
+        params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s.gsub(/;$/,""))}" }.join('; ')
         "#{type}; #{params}"
       when val =~ /^\s*$/
         'text/plain'

data/lib/mail/fields/date_field.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
-# 
+#
 # = Date Field
-# 
+#
 # The Date field inherits from StructuredField and handles the Date: header
 # field in the email.
-# 
+#
 # Sending date to a mail message will instantiate a Mail::Field object that
-# has a DateField as it's field type.  This includes all Mail::CommonAddress
+# has a DateField as its field type.  This includes all Mail::CommonAddress
 # module instance methods.
-# 
+#
 # There must be excatly one Date field in an RFC2822 email.
-# 
+#
 # == Examples:
-# 
+#
 #  mail = Mail.new
 #  mail.date = 'Mon, 24 Nov 1997 14:22:01 -0800'
 #  mail.date       #=> #<DateTime: 211747170121/86400,-1/3,2299161>
@@ -20,17 +20,17 @@
 #  mail[:date]     #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
 #  mail['date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
 #  mail['Date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-# 
+#
 require 'mail/fields/common/common_date'
 
 module Mail
   class DateField < StructuredField
-    
+
     include Mail::CommonDate
-    
+
     FIELD_NAME = 'date'
     CAPITALIZED_FIELD = "Date"
-    
+
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       if value.blank?
@@ -44,14 +44,14 @@ module Mail
     rescue ArgumentError => e
       raise e unless "invalid date"==e.message
     end
-    
+
     def encoded
       do_encode(CAPITALIZED_FIELD)
     end
-    
+
     def decoded
       do_decode
     end
-    
+
   end
 end

data/lib/mail/fields/from_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending from to a mail message will instantiate a Mail::Field object that
-# has a FromField as it's field type.  This includes all Mail::CommonAddress
+# has a FromField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one From field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.from    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
 #  mail['from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
 #  mail['From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4

data/lib/mail/fields/in_reply_to_field.rb

@@ -6,7 +6,7 @@
 # In-Reply-To: header field in the email.
 # 
 # Sending in_reply_to to a mail message will instantiate a Mail::Field object that
-# has a InReplyToField as it's field type.  This includes all Mail::CommonMessageId
+# has a InReplyToField as its field type.  This includes all Mail::CommonMessageId
 # module instance metods.
 # 
 # Note that, the #message_ids method will return an array of message IDs without the
@@ -38,6 +38,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      value = value.join("\r\n\s") if value.is_a?(Array)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/keywords_field.rb

@@ -29,7 +29,7 @@ module Mail
     end
     
     def encoded
-      "#{CAPITALIZED_FIELD}: #{keywords.join(', ')}\r\n"
+      "#{CAPITALIZED_FIELD}: #{keywords.join(",\r\n ")}\r\n"
     end
     
     def decoded

data/lib/mail/fields/message_id_field.rb

@@ -6,7 +6,7 @@
 # Message-ID: header field in the email.
 # 
 # Sending message_id to a mail message will instantiate a Mail::Field object that
-# has a MessageIdField as it's field type.  This includes all Mail::CommonMessageId
+# has a MessageIdField as its field type.  This includes all Mail::CommonMessageId
 # module instance metods.
 # 
 # Only one MessageId field can appear in a header, and syntactically it can only have
@@ -75,8 +75,7 @@ module Mail
     private
     
     def generate_message_id
-      fqdn = ::Socket.gethostname
-      "<#{Mail.random_tag}@#{fqdn}.mail>"
+      "<#{Mail.random_tag}@#{::Socket.gethostname}.mail>"
     end
     
   end

data/lib/mail/fields/references_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending references to a mail message will instantiate a Mail::Field object that
-# has a ReferencesField as it's field type.  This includes all Mail::CommonAddress
+# has a ReferencesField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Note that, the #message_ids method will return an array of message IDs without the
@@ -38,6 +38,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      value = value.join("\r\n\s") if value.is_a?(Array)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/reply_to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending reply_to to a mail message will instantiate a Mail::Field object that
-# has a ReplyToField as it's field type.  This includes all Mail::CommonAddress
+# has a ReplyToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Reply-To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.reply_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.reply_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.reply_to    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:reply_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
 #  mail['reply-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
 #  mail['Reply-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4

data/lib/mail/fields/resent_bcc_field.rb

@@ -6,7 +6,7 @@
 # Resent-Bcc: header field in the email.
 # 
 # Sending resent_bcc to a mail message will instantiate a Mail::Field object that
-# has a ResentBccField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentBccField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Bcc field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_bcc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_bcc    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_bcc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
 #  mail['resent-bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
 #  mail['Resent-Bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4

data/lib/mail/fields/resent_cc_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_cc to a mail message will instantiate a Mail::Field object that
-# has a ResentCcField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentCcField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Cc field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_cc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_cc    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_cc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['resent-cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['Resent-Cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4

data/lib/mail/fields/resent_from_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_from to a mail message will instantiate a Mail::Field object that
-# has a ResentFromField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentFromField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-From field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 #
 #  mail = Mail.new
 #  mail.resent_from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_from    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['resent-from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['Resent-From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4

data/lib/mail/fields/resent_sender_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_sender to a mail message will instantiate a Mail::Field object that
-# has a ResentSenderField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentSenderField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Sender field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_sender    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
+#  mail.resent_sender    #=> ['mikel@test.lindsaar.net']
 #  mail[:resent_sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
 #  mail['resent-sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
 #  mail['Resent-Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
@@ -47,7 +47,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/resent_to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_to to a mail message will instantiate a Mail::Field object that
-# has a ResentToField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_to    #=> ['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

data/lib/mail/fields/sender_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending sender to a mail message will instantiate a Mail::Field object that
-# has a SenderField as it's field type.  This includes all Mail::CommonAddress
+# has a SenderField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Sender field can appear in a header, though it can have multiple
@@ -15,16 +15,16 @@
 # == Examples:
 # 
 #  mail = Mail.new
-#  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.sender    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+#  mail.sender    #=> 'mikel@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].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']
+#  mail[:sender].encoded   #=> "Sender: Mikel Lindsaar <mikel@test.lindsaar.net>\r\n"
+#  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+#  mail[:sender].addresses #=> ['mikel@test.lindsaar.net']
+#  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>']
 # 
 require 'mail/fields/common/common_address'
 
@@ -48,7 +48,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending to to a mail message will instantiate a Mail::Field object that
-# has a ToField as it's field type.  This includes all Mail::CommonAddress
+# has a ToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.to    #=> ['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

data/lib/mail/fields/unstructured_field.rb

@@ -6,7 +6,7 @@ module Mail
   #
   # ===Per RFC 2822:
   #  2.2.1. Unstructured Header Field Bodies
-  #  
+  #
   #     Some field bodies in this standard are defined simply as
   #     "unstructured" (which is specified below as any US-ASCII characters,
   #     except for CR and LF) with no further restrictions.  These are
@@ -15,20 +15,29 @@ module Mail
   #     with no further processing (except for header "folding" and
   #     "unfolding" as described in section 2.2.3).
   class UnstructuredField
-    
+
     include Mail::CommonField
     include Mail::Utilities
-   
+
     attr_accessor :charset
     attr_reader :errors
- 
+
     def initialize(name, value, charset = nil)
       @errors = []
+
+      if value.is_a?(Array)
+        # Probably has arrived here from a failed parse of an AddressList Field
+        value = value.join(', ')
+      else
+        # Ensure we are dealing with a string
+        value = value.to_s
+      end
+
       if charset
         self.charset = charset
       else
-        if value.to_s.respond_to?(:encoding)
-          self.charset = value.to_s.encoding
+        if value.respond_to?(:encoding)
+          self.charset = value.encoding
         else
           self.charset = $KCODE
         end
@@ -37,11 +46,11 @@ module Mail
       self.value = value
       self
     end
-   
+
     def encoded
       do_encode
     end
-    
+
     def decoded
       do_decode
     end
@@ -49,25 +58,23 @@ module Mail
     def default
       decoded
     end
-    
+
     def parse # An unstructured field does not parse
       self
     end
 
     private
-    
+
     def do_encode
       value.nil? ? '' : "#{wrapped_value}\r\n"
     end
-    
+
     def do_decode
-      result = value.blank? ? nil : Encodings.decode_encode(value, :decode)
-      result.encode!(value.encoding || "UTF-8") if RUBY_VERSION >= '1.9' && !result.blank?
-      result
+      value.blank? ? nil : Encodings.decode_encode(value, :decode)
     end
-    
+
     # 2.2.3. Long Header Fields
-    # 
+    #
     #  Each header field is logically a single line of characters comprising
     #  the field name, the colon, and the field body.  For convenience
     #  however, and to deal with the 998/78 character limitations per line,
@@ -76,14 +83,14 @@ module Mail
     #  that wherever this standard allows for folding white space (not
     #  simply WSP characters), a CRLF may be inserted before any WSP.  For
     #  example, the header field:
-    #  
+    #
     #          Subject: This is a test
-    #  
+    #
     #  can be represented as:
-    #  
+    #
     #          Subject: This
     #           is a test
-    #  
+    #
     #  Note: Though structured field bodies are defined in such a way that
     #  folding can take place between many of the lexical tokens (and even
     #  within some of the lexical tokens), folding SHOULD be limited to
@@ -95,9 +102,9 @@ module Mail
     def wrapped_value # :nodoc:
       wrap_lines(name, fold("#{name}: ".length))
     end
-   
+
     # 6.2. Display of 'encoded-word's
-    # 
+    #
     #  When displaying a particular header field that contains multiple
     #  'encoded-word's, any 'linear-white-space' that separates a pair of
     #  adjacent 'encoded-word's is ignored.  (This is to allow the use of
@@ -131,29 +138,35 @@ module Mail
       else
         words = decoded_string.split(/[ \t]/)
       end
-      
+
       folded_lines   = []
       while !words.empty?
         limit = 78 - prepend
         limit = limit - 7 - encoding.length if should_encode
         line = ""
+        first_word = true
         while !words.empty?
           break unless word = words.first.dup
-          word.encode!(charset) if defined?(Encoding) && charset
+          word.encode!(charset) if charset && word.respond_to?(:encode!)
           word = encode(word) if should_encode
           word = encode_crlf(word)
           # Skip to next line if we're going to go past the limit
           # Unless this is the first word, in which case we're going to add it anyway
           # Note: This means that a word that's longer than 998 characters is going to break the spec. Please fix if this is a problem for you.
-          # (The fix, it seems, would be to use encoded-word encoding on it, because that way you can break it across multiple lines and 
+          # (The fix, it seems, would be to use encoded-word encoding on it, because that way you can break it across multiple lines and
           # the linebreak will be ignored)
           break if !line.empty? && (line.length + word.length + 1 > limit)
           # Remove the word from the queue ...
           words.shift
           # Add word separator
-          line << " " unless (line.empty? || should_encode)
+          if first_word
+            first_word = false
+          else
+            line << " " if !should_encode
+          end
+
           # ... add it in encoded form to the current line
-          line << word          
+          line << word
         end
         # Encode the line if necessary
         line = "=?#{encoding}?Q?#{line}?=" if should_encode
@@ -163,9 +176,9 @@ module Mail
       end
       folded_lines
     end
- 
+
     def encode(value)
-      value = [value].pack("M").gsub("=\n", '')
+      value = [value].pack(CAPITAL_M).gsub(EQUAL_LF, EMPTY)
       value.gsub!(/"/,  '=22')
       value.gsub!(/\(/, '=28')
       value.gsub!(/\)/, '=29')
@@ -176,8 +189,8 @@ module Mail
     end
 
     def encode_crlf(value)
-      value.gsub!("\r", '=0D')
-      value.gsub!("\n", '=0A')
+      value.gsub!(CR, CR_ENCODED)
+      value.gsub!(LF, LF_ENCODED)
       value
     end
 

data/lib/mail/fields.rb

@@ -1,35 +1,35 @@
 module Mail
-  autoload :UnstructuredField, 'mail/fields/unstructured_field'
-  autoload :StructuredField, 'mail/fields/structured_field'
-  autoload :OptionalField, 'mail/fields/optional_field'
+  register_autoload :UnstructuredField, 'mail/fields/unstructured_field'
+  register_autoload :StructuredField, 'mail/fields/structured_field'
+  register_autoload :OptionalField, 'mail/fields/optional_field'
 
-  autoload :BccField, 'mail/fields/bcc_field'
-  autoload :CcField, 'mail/fields/cc_field'
-  autoload :CommentsField, 'mail/fields/comments_field'
-  autoload :ContentDescriptionField, 'mail/fields/content_description_field'
-  autoload :ContentDispositionField, 'mail/fields/content_disposition_field'
-  autoload :ContentIdField, 'mail/fields/content_id_field'
-  autoload :ContentLocationField, 'mail/fields/content_location_field'
-  autoload :ContentTransferEncodingField, 'mail/fields/content_transfer_encoding_field'
-  autoload :ContentTypeField, 'mail/fields/content_type_field'
-  autoload :DateField, 'mail/fields/date_field'
-  autoload :FromField, 'mail/fields/from_field'
-  autoload :InReplyToField, 'mail/fields/in_reply_to_field'
-  autoload :KeywordsField, 'mail/fields/keywords_field'
-  autoload :MessageIdField, 'mail/fields/message_id_field'
-  autoload :MimeVersionField, 'mail/fields/mime_version_field'
-  autoload :ReceivedField, 'mail/fields/received_field'
-  autoload :ReferencesField, 'mail/fields/references_field'
-  autoload :ReplyToField, 'mail/fields/reply_to_field'
-  autoload :ResentBccField, 'mail/fields/resent_bcc_field'
-  autoload :ResentCcField, 'mail/fields/resent_cc_field'
-  autoload :ResentDateField, 'mail/fields/resent_date_field'
-  autoload :ResentFromField, 'mail/fields/resent_from_field'
-  autoload :ResentMessageIdField, 'mail/fields/resent_message_id_field'
-  autoload :ResentSenderField, 'mail/fields/resent_sender_field'
-  autoload :ResentToField, 'mail/fields/resent_to_field'
-  autoload :ReturnPathField, 'mail/fields/return_path_field'
-  autoload :SenderField, 'mail/fields/sender_field'
-  autoload :SubjectField, 'mail/fields/subject_field'
-  autoload :ToField, 'mail/fields/to_field'
+  register_autoload :BccField, 'mail/fields/bcc_field'
+  register_autoload :CcField, 'mail/fields/cc_field'
+  register_autoload :CommentsField, 'mail/fields/comments_field'
+  register_autoload :ContentDescriptionField, 'mail/fields/content_description_field'
+  register_autoload :ContentDispositionField, 'mail/fields/content_disposition_field'
+  register_autoload :ContentIdField, 'mail/fields/content_id_field'
+  register_autoload :ContentLocationField, 'mail/fields/content_location_field'
+  register_autoload :ContentTransferEncodingField, 'mail/fields/content_transfer_encoding_field'
+  register_autoload :ContentTypeField, 'mail/fields/content_type_field'
+  register_autoload :DateField, 'mail/fields/date_field'
+  register_autoload :FromField, 'mail/fields/from_field'
+  register_autoload :InReplyToField, 'mail/fields/in_reply_to_field'
+  register_autoload :KeywordsField, 'mail/fields/keywords_field'
+  register_autoload :MessageIdField, 'mail/fields/message_id_field'
+  register_autoload :MimeVersionField, 'mail/fields/mime_version_field'
+  register_autoload :ReceivedField, 'mail/fields/received_field'
+  register_autoload :ReferencesField, 'mail/fields/references_field'
+  register_autoload :ReplyToField, 'mail/fields/reply_to_field'
+  register_autoload :ResentBccField, 'mail/fields/resent_bcc_field'
+  register_autoload :ResentCcField, 'mail/fields/resent_cc_field'
+  register_autoload :ResentDateField, 'mail/fields/resent_date_field'
+  register_autoload :ResentFromField, 'mail/fields/resent_from_field'
+  register_autoload :ResentMessageIdField, 'mail/fields/resent_message_id_field'
+  register_autoload :ResentSenderField, 'mail/fields/resent_sender_field'
+  register_autoload :ResentToField, 'mail/fields/resent_to_field'
+  register_autoload :ReturnPathField, 'mail/fields/return_path_field'
+  register_autoload :SenderField, 'mail/fields/sender_field'
+  register_autoload :SubjectField, 'mail/fields/subject_field'
+  register_autoload :ToField, 'mail/fields/to_field'
 end