mail 2.7.1 → 2.8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e806bc9b7c6c6df8de9c9dc80b4cf3a099bad3153f568d0ee4d9287cd34a014
-  data.tar.gz: 182ed03957858cce70691eb79543f13d53e4ddf43684bf50bc011e904d3a84ae
+  metadata.gz: 81e46a74f38161a8dee775a4947a4f46ace345c59e2835e4c3003b76e776648a
+  data.tar.gz: b17b1d37298444f56ade0f1ec8055b460bb5623bdf8b4aed53a83a9131c85595
 SHA512:
-  metadata.gz: 3c42702e6529565ae63c486fef492b89a19eb394fb6fe5aaf004862257ef3d840579a3cabb95dd2075ddbc617e077110684d8f47052e51d0435b94ef4a2373c3
-  data.tar.gz: 31278e7d48271cfec8541d1094fedd1cc62578a6d9f18e0eafd09ebcac4e5edf3e78a3b902aca3e97d7416d37b0f0c07ba2dde2f5462d6317058552bbc0dbfe7
+  metadata.gz: 7950bc750e6b1d8678faa5f8133a3c57b47f79bdd9a50fced60491c4f0669e4a5f0fc0eb566ced40cb8e08aa443cda650626af621bea527779f2edc58b846272
+  data.tar.gz: 939b0c212b1ab46555e81939acece0f06254977637ab2813e1b23d41357c4ca0fdee1124e63feff762f7e91b089cd0435d56cc229c0a5ccc223f0dec3e2dc0a6

data/README.md

@@ -1,39 +1,35 @@
-# Mail [![Build Status](https://travis-ci.org/mikel/mail.png?branch=master)](https://travis-ci.org/mikel/mail)
+# Mail [![Build Status](https://github.com/mikel/mail/actions/workflows/test.yml/badge.svg)](https://github.com/mikel/mail/actions/workflows/test.yml)
 
 ## Introduction
 
-Mail is an internet library for Ruby that is designed to handle emails
+Mail is an internet library for Ruby that is designed to handle email
 generation, parsing and sending in a simple, rubyesque manner.
 
 The purpose of this library is to provide a single point of access to handle
-all email functions, including sending and receiving emails.  All network
+all email functions, including sending and receiving email.  All network
 type actions are done through proxy methods to Net::SMTP, Net::POP3 etc.
 
 Built from my experience with TMail, it is designed to be a pure ruby
-implementation that makes generating, sending and parsing emails a no
+implementation that makes generating, sending and parsing email a no
 brainer.
 
 It is also designed from the ground up to work with the more modern versions
-of Ruby.  This is because Ruby > 1.9 handles text encodings much more wonderfully
-than Ruby 1.8.x and so these features have been taken full advantage of in this
-library allowing Mail to handle a lot more messages more cleanly than TMail.
-Mail does run on Ruby 1.8.x... it's just not as fun to code.
+of Ruby.  Modern Rubies handle text encodings much more wonderfully than before
+so these features have been taken full advantage of in this library allowing
+Mail to handle a lot more messages more cleanly than TMail.
 
 Finally, Mail has been designed with a very simple object oriented system
 that really opens up the email messages you are parsing, if you know what
 you are doing, you can fiddle with every last bit of your email directly.
 
-## Donations
+## You can contribute to this library
 
-Mail has been downloaded millions of times, by people around the world, in fact,
-it represents more than 1% of *all* gems downloaded.
+Yes, you! Mail is used in countless apps by people around the world. It is,
+like all open source software, a labour of love borne from our free time.
+If you would like to say thanks, please dig in and contribute alongside us!
+Triage and fix [GitHub issues](https://github.com/mikel/mail/issues), improve
+our documentation, add new features—up to you! Thank you for pitching in.
 
-It is (like all open source software) a labour of love and something I am doing
-with my own free time.  If you would like to say thanks, please feel free to
-[make a donation](http://www.pledgie.com/campaigns/8790) and feel free to send
-me a nice email :)
-
-<a href='http://www.pledgie.com/campaigns/8790'><img alt='Click here to lend your support to: mail and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/8790.png?skin_name=chrome' border='0' /></a>
 
 # Contents
 * [Compatibility](#compatibility)
@@ -46,15 +42,16 @@ me a nice email :)
 * [Encodings](#encodings)
 * [Contributing](#contributing)
 * [Usage](#usage)
-* [Core Extensions](#core-extensions)
 * [Excerpts from TREC Span Corpus 2005](#excerpts-from-trec-span-corpus-2005)
 * [License](#license)
 
 ## Compatibility
 
-Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
+Mail supports Ruby 2.5+, including JRuby and TruffleRuby.
+
+As new versions of Ruby are released, Mail will be compatible with support for the "preview" and all "normal maintenance", "security maintenance" and the two most recent "end of life" versions listed at the [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) page.  Pull requests to assist in adding support for new preview releases are more than welcome.
 
-Every Mail commit is tested by Travis on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.travis.yml).
+Every Mail commit is tested by GitHub Actions on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.github/workflows/test.yml).
 
 ## Discussion
 
@@ -65,14 +62,14 @@ the [Google Group](http://groups.google.com/group/mail-ruby).
 
 * RFC5322 Support, Reading and Writing
 * RFC6532 Support, reading UTF-8 headers
-* RFC2045-2049 Support for multipart emails
-* Support for creating multipart alternate emails
-* Support for reading multipart/report emails &amp; getting details from such
+* RFC2045-2049 Support for multipart email
+* Support for creating multipart alternate email
+* Support for reading multipart/report email &amp; getting details from such
 * Wrappers for File, Net/POP3, Net/SMTP
 * Auto-encoding of non-US-ASCII bodies and header fields
 
 Mail is RFC5322 and RFC6532 compliant now, that is, it can parse US-ASCII and UTF-8
-emails and generate US-ASCII emails. There are a few obsoleted syntax emails that
+email and generate US-ASCII email. There are a few obsoleted email syntax that
 it will have problems with, but it also is quite robust, meaning, if it finds something
 it doesn't understand it will not crash, instead, it will skip the problem and keep
 parsing. In the case of a header it doesn't understand, it will initialise the header
@@ -101,7 +98,9 @@ the gem gets released.
 
 It also means you can be sure Mail will behave correctly.
 
-Note: If you care about core extensions (aka "monkey-patching"), please read the Core Extensions section near the end of this README.
+You can run tests locally by running `bundle exec rspec`.
+
+You can run tests on all supported Ruby versions by using [act](https://github.com/nektos/act).
 
 ## API Policy
 
@@ -150,13 +149,15 @@ I have tried to simplify it some:
 
 ## Contributing
 
-Please do!  Contributing is easy in Mail.  Please read the CONTRIBUTING.md document for more info
+Please do!  Contributing is easy in Mail.  Please read the [CONTRIBUTING.md](CONTRIBUTING.md) document for more info.
 
 ## Usage
 
 All major mail functions should be able to happen from the Mail module.
 So, you should be able to just <code>require 'mail'</code> to get started.
 
+`mail` is pretty well documented in its Ruby code.  You can look it up e.g. at [rubydoc.info](https://www.rubydoc.info/gems/mail).
+
 ### Making an email
 
 ```ruby
@@ -290,12 +291,13 @@ mail.delivery_method :logger
 mail.delivery_method :logger, logger: other_logger, severity: :debug
 ```
 
-### Getting Emails from a POP Server:
+### Getting Emails from a POP or IMAP Server:
 
 You can configure Mail to receive email using <code>retriever_method</code>
 within <code>Mail.defaults</code>:
 
 ```ruby
+# e.g. POP3
 Mail.defaults do
   retriever_method :pop3, :address    => "pop.gmail.com",
                           :port       => 995,
@@ -303,6 +305,15 @@ Mail.defaults do
                           :password   => '<password>',
                           :enable_ssl => true
 end
+
+# IMAP
+Mail.defaults do
+  retriever_method :imap, :address    => "imap.mailbox.org",
+                          :port       => 993,
+                          :user_name  => '<username>',
+                          :password   => '<password>',
+                          :enable_ssl => true
+end
 ```
 
 You can access incoming email in a number of ways.
@@ -445,7 +456,7 @@ Content-Transfer-Encoding: 7bit
 ```
 
 Mail inserts the content transfer encoding, the mime version,
-the content-id's and handles the content-type and boundary.
+the content-IDs and handles the content-type and boundary.
 
 Mail assumes that if your text in the body is only us-ascii, that your
 transfer encoding is 7bit and it is text/plain.  You can override this
@@ -639,6 +650,12 @@ describe "sending an email" do
   # ... or any attachment
   it { is_expected.to have_sent_email.with_attachments(any_attachment) }
 
+  # ... or attachment with filename
+  it { is_expected.to have_sent_email.with_attachments(an_attachment_with_filename('file.txt')) }
+
+  # ... or attachment with mime_type
+  it { is_expected.to have_sent_email.with_attachments(an_attachment_with_mime_type('application/pdf')) }
+
   # ... by array of attachments
   it { is_expected.to have_sent_email.with_attachments([my_attachment1, my_attachment2]) } #note that order is important
 

data/lib/mail/attachments_list.rb

@@ -74,7 +74,7 @@ module Mail
       end
 
       if hash[:body].respond_to? :force_encoding and hash[:body].respond_to? :valid_encoding?
-        if not hash[:body].valid_encoding? and default_values[:content_transfer_encoding].downcase == "binary"
+        if not hash[:body].valid_encoding? and default_values[:content_transfer_encoding].casecmp('binary').zero?
           hash[:body] = hash[:body].dup if hash[:body].frozen?
           hash[:body].force_encoding("BINARY")
         end
@@ -97,10 +97,7 @@ module Mail
     end
 
     def set_mime_type(filename)
-      # Have to do this because MIME::Types is not Ruby 1.9 safe yet
-      if RUBY_VERSION >= '1.9'
-        filename = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
-      end
+      filename = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
 
       @mime_type = MiniMime.lookup_by_filename(filename)
       @mime_type && @mime_type.content_type

data/lib/mail/body.rb

@@ -50,6 +50,11 @@ module Mail
       set_charset
     end
 
+    def init_with(coder)
+      coder.map.each { |k, v| instance_variable_set(:"@#{k}", v) }
+      @parts = Mail::PartsList.new(coder['parts'])
+    end
+
     # Matches this body with another body.  Also matches the decoded value of this
     # body with a string.
     # 
@@ -133,12 +138,6 @@ module Mail
       @parts.sort!(@part_sort_order)
     end
     
-    # Returns the raw source that the body was initialized with, without
-    # any tampering
-    def raw_source
-      @raw_source
-    end
-
     def negotiate_best_encoding(message_encoding, allowed_encodings = nil)
       Mail::Encodings::TransferEncoding.negotiate(message_encoding, encoding, raw_source, allowed_encodings)
     end
@@ -188,14 +187,6 @@ module Mail
     def to_s
       decoded
     end
-    
-    def charset
-      @charset
-    end
-    
-    def charset=( val )
-      @charset = val
-    end
 
     def encoding(val = nil)
       if val
@@ -214,45 +205,31 @@ module Mail
         end
     end
 
-    # Returns the preamble (any text that is before the first MIME boundary)
-    def preamble
-      @preamble
-    end
+    # Returns the raw source that the body was initialized with, without
+    # any tampering
+    attr_reader :raw_source
+
+    # Returns parts of the body
+    attr_reader :parts
+
+    # Returns and sets the original character encoding
+    attr_accessor :charset
+
+    # Returns and sets the preamble as a string (any text that is before the first MIME boundary)
+    attr_accessor :preamble
+
+    # Returns and sets the epilogue as a string (any text that is after the last MIME boundary)
+    attr_accessor :epilogue
+
+    # Returns and sets the boundary used by the body
+    # Allows you to change the boundary of this Body object
+    attr_accessor :boundary
 
-    # Sets the preamble to a string (adds text before the first MIME boundary)
-    def preamble=( val )
-      @preamble = val
-    end
-    
-    # Returns the epilogue (any text that is after the last MIME boundary)
-    def epilogue
-      @epilogue
-    end
-    
-    # Sets the epilogue to a string (adds text after the last MIME boundary)
-    def epilogue=( val )
-      @epilogue = val
-    end
-    
     # Returns true if there are parts defined in the body
     def multipart?
       true unless parts.empty?
     end
-    
-    # Returns the boundary used by the body
-    def boundary
-      @boundary
-    end
-    
-    # Allows you to change the boundary of this Body object
-    def boundary=( val )
-      @boundary = val
-    end
 
-    def parts
-      @parts
-    end
-    
     def <<( val )
       if @parts
         @parts << val

data/lib/mail/check_delivery_params.rb

@@ -1,36 +1,39 @@
 # frozen_string_literal: true
+#
+# This whole class and associated specs is deprecated and will go away in the version 3 release of mail.
 module Mail
   module CheckDeliveryParams #:nodoc:
     class << self
+
+      extend Gem::Deprecate
+
       def check(mail)
-        [ check_from(mail.smtp_envelope_from),
-          check_to(mail.smtp_envelope_to),
-          check_message(mail) ]
+        envelope = Mail::SmtpEnvelope.new(mail)
+        [ envelope.from,
+          envelope.to,
+          envelope.message ]
       end
+      deprecate :check, 'Mail::SmtpEnvelope.new created in commit c106bebea066782a72e4f24dd37b532d95773df7', 2023, 6
 
       def check_from(addr)
-        if Utilities.blank?(addr)
-          raise ArgumentError, "SMTP From address may not be blank: #{addr.inspect}"
-        end
-
-        check_addr 'From', addr
+        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
+        Mail::SmtpEnvelope.new(mail).send(:validate_addr, 'From', addr)
       end
+      deprecate :check_from, :none, 2023, 6
 
       def check_to(addrs)
-        if Utilities.blank?(addrs)
-          raise ArgumentError, "SMTP To address may not be blank: #{addrs.inspect}"
-        end
-
+        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
         Array(addrs).map do |addr|
-          check_addr 'To', addr
+          Mail::SmtpEnvelope.new(mail).send(:validate_addr, 'To', addr)
         end
       end
+      deprecate :check_to, :none, 2023, 6
 
       def check_addr(addr_name, addr)
-        validate_smtp_addr addr do |error_message|
-          raise ArgumentError, "SMTP #{addr_name} address #{error_message}: #{addr.inspect}"
-        end
+        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
+        Mail::SmtpEnvelope.new(mail).send(:validate_addr, addr_name, addr)
       end
+      deprecate :check_addr, :none, 2023, 6
 
       def validate_smtp_addr(addr)
         if addr
@@ -45,6 +48,7 @@ module Mail
 
         addr
       end
+      deprecate :validate_smtp_addr, :none, 2023, 6
 
       def check_message(message)
         message = message.encoded if message.respond_to?(:encoded)
@@ -55,6 +59,7 @@ module Mail
 
         message
       end
+      deprecate :check_message, :none, 2023, 6
     end
   end
 end

data/lib/mail/constants.rb

@@ -16,9 +16,10 @@ module Mail
       control = control.dup.force_encoding(Encoding::BINARY)
     end
 
-    CRLF          = /\r?\n/
+    LAX_CRLF      = /\r?\n/
     WSP           = /[#{white_space}]/
-    FWS           = /#{CRLF}#{WSP}*/
+    FWS           = /#{LAX_CRLF}#{WSP}*/
+    UNFOLD_WS     = /#{LAX_CRLF}(#{WSP})/m
     TEXT          = /[#{text}]/ # + obs-text
     FIELD_NAME    = /[#{field_name}]+/
     FIELD_PREFIX  = /\A(#{FIELD_NAME})/
@@ -26,7 +27,7 @@ module Mail
     FIELD_LINE    = /^[#{field_name}]+:\s*.+$/
     FIELD_SPLIT   = /^(#{FIELD_NAME})\s*:\s*(#{FIELD_BODY})?$/
     HEADER_LINE   = /^([#{field_name}]+:\s*.+)$/
-    HEADER_SPLIT  = /#{CRLF}(?!#{WSP})/
+    HEADER_SPLIT  = /#{LAX_CRLF}(?!#{WSP})/
 
     QP_UNSAFE     = /[^#{qp_safe}]/
     QP_SAFE       = /[#{qp_safe}]/
@@ -34,8 +35,28 @@ module Mail
     ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{sp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
     TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{sp}]/n
-    ENCODED_VALUE = /\=\?([^?]+)\?([QB])\?[^?]*?\?\=/mi
-    FULL_ENCODED_VALUE = /(\=\?[^?]+\?[QB]\?[^?]*?\?\=)/mi
+
+    ENCODED_VALUE = %r{
+      \=\?     # literal =?
+      ([^?]+)  #
+      \?       # literal ?
+      ([QB])   # either a "Q" or a "B"
+      \?       # literal ?
+      .*?      # lazily match all characters
+      \?\=     # literal ?=
+    }mix # m is multi-line, i is case-insensitive, x is free-spacing
+
+    FULL_ENCODED_VALUE = %r{ # Identical to ENCODED_VALUE but captures the whole rather than components of
+      (
+        \=\?    # literal =?
+        [^?]+   #
+        \?      # literal ?
+        [QB]    # either a "Q" or a "B"
+        \?      # literal ?
+        .*?     # lazily match all characters
+        \?\=    # literal ?=
+      )
+    }mix # m is multi-line, i is case-insensitive, x is free-spacing
 
     EMPTY          = ''
     SPACE          = ' '
@@ -43,6 +64,7 @@ module Mail
     HYPHEN         = '-'
     COLON          = ':'
     ASTERISK       = '*'
+    CRLF           = "\r\n"
     CR             = "\r"
     LF             = "\n"
     CR_ENCODED     = "=0D"

data/lib/mail/elements/address.rb

@@ -1,27 +1,27 @@
 # encoding: utf-8
 # frozen_string_literal: true
 require 'mail/parsers/address_lists_parser'
+require 'mail/constants'
+require 'mail/utilities'
 
 module Mail
+  # Mail::Address handles all email addresses in Mail.  It takes an email address string
+  # and parses it, breaking it down into its component parts and allowing you to get the
+  # address, comments, display name, name, local part, domain part and fully formatted
+  # address.
+  #
+  # Mail::Address requires a correctly formatted email address per RFC2822 or RFC822.  It
+  # handles all obsolete versions including obsolete domain routing on the local part.
+  #
+  #  a = Address.new('Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>')
+  #  a.format       #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
+  #  a.address      #=> 'mikel@test.lindsaar.net'
+  #  a.display_name #=> 'Mikel Lindsaar'
+  #  a.local        #=> 'mikel'
+  #  a.domain       #=> 'test.lindsaar.net'
+  #  a.comments     #=> ['My email address']
+  #  a.to_s         #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
   class Address
-    include Mail::Utilities
-
-    # Mail::Address handles all email addresses in Mail.  It takes an email address string
-    # and parses it, breaking it down into its component parts and allowing you to get the
-    # address, comments, display name, name, local part, domain part and fully formatted
-    # address.
-    #
-    # Mail::Address requires a correctly formatted email address per RFC2822 or RFC822.  It
-    # handles all obsolete versions including obsolete domain routing on the local part.
-    #
-    #  a = Address.new('Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>')
-    #  a.format       #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
-    #  a.address      #=> 'mikel@test.lindsaar.net'
-    #  a.display_name #=> 'Mikel Lindsaar'
-    #  a.local        #=> 'mikel'
-    #  a.domain       #=> 'test.lindsaar.net'
-    #  a.comments     #=> ['My email address']
-    #  a.to_s         #=> 'Mikel Lindsaar <mikel@test.lindsaar.net> (My email address)'
     def initialize(value = nil)
       if value.nil?
         @parsed = false
@@ -47,11 +47,11 @@ module Mail
     def format(output_type = :decode)
       parse unless @parsed
       if @data.nil?
-        EMPTY
+        Constants::EMPTY
       elsif name = display_name(output_type)
-        [quote_phrase(name), "<#{address(output_type)}>", format_comments].compact.join(SPACE)
+        [Utilities.quote_phrase(name), "<#{address(output_type)}>", format_comments].compact.join(Constants::SPACE)
       elsif a = address(output_type)
-        [a, format_comments].compact.join(SPACE)
+        [a, format_comments].compact.join(Constants::SPACE)
       else
         raw
       end
@@ -135,7 +135,7 @@ module Mail
       if comments.nil? || comments.none?
         nil
       else
-        comments.map { |c| c.squeeze(SPACE) }
+        comments.map { |c| c.squeeze(Constants::SPACE) }
       end
     end
 
@@ -198,7 +198,7 @@ module Mail
     def strip_all_comments(string)
       unless Utilities.blank?(comments)
         comments.each do |comment|
-          string = string.gsub("(#{comment})", EMPTY)
+          string = string.gsub("(#{comment})", Constants::EMPTY)
         end
       end
       string.strip
@@ -208,7 +208,7 @@ module Mail
       unless Utilities.blank?(comments)
         comments.each do |comment|
           if @data.domain && @data.domain.include?("(#{comment})")
-            value = value.gsub("(#{comment})", EMPTY)
+            value = value.gsub("(#{comment})", Constants::EMPTY)
           end
         end
       end
@@ -228,15 +228,15 @@ module Mail
       if display_name
         str = display_name
       elsif comments
-        str = "(#{comments.join(SPACE).squeeze(SPACE)})"
+        str = "(#{comments.join(Constants::SPACE).squeeze(Constants::SPACE)})"
       end
 
-      unparen(str) unless Utilities.blank?(str)
+      Utilities.unparen(str) unless Utilities.blank?(str)
     end
 
     def format_comments
       if comments
-        comment_text = comments.map {|c| escape_paren(c) }.join(SPACE).squeeze(SPACE)
+        comment_text = comments.map {|c| Utilities.escape_paren(c) }.join(Constants::SPACE).squeeze(Constants::SPACE)
         @format_comments ||= "(#{comment_text})"
       else
         nil

data/lib/mail/elements/address_list.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/address_lists_parser'
 
 module Mail
-  class AddressList # :nodoc:
+  class AddressList #:nodoc:
     attr_reader :addresses, :group_names
 
     # Mail::AddressList is the class that parses To, From and other address fields from

data/lib/mail/elements/content_disposition_element.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/content_disposition_parser'
 
 module Mail
-  class ContentDispositionElement # :nodoc:
+  class ContentDispositionElement #:nodoc:
     attr_reader :disposition_type, :parameters
 
     def initialize(string)

data/lib/mail/elements/content_location_element.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/content_location_parser'
 
 module Mail
-  class ContentLocationElement # :nodoc:
+  class ContentLocationElement #:nodoc:
     attr_reader :location
 
     def initialize(string)

data/lib/mail/elements/content_transfer_encoding_element.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/content_transfer_encoding_parser'
 
 module Mail
-  class ContentTransferEncodingElement
+  class ContentTransferEncodingElement #:nodoc:
     attr_reader :encoding
 
     def initialize(string)

data/lib/mail/elements/content_type_element.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/content_type_parser'
 
 module Mail
-  class ContentTypeElement # :nodoc:
+  class ContentTypeElement #:nodoc:
     attr_reader :main_type, :sub_type, :parameters
 
     def initialize(string)
@@ -14,8 +14,12 @@ module Mail
     end
 
     private
-    def cleaned(string)
-      string =~ /(.+);\s*$/ ? $1 : string
-    end
+      def cleaned(string)
+        if string =~ /;\s*$/
+          $`
+        else
+          string
+        end
+      end
   end
 end

data/lib/mail/elements/date_time_element.rb

@@ -3,7 +3,7 @@
 require 'mail/parsers/date_time_parser'
 
 module Mail
-  class DateTimeElement # :nodoc:
+  class DateTimeElement #:nodoc:
     attr_reader :date_string, :time_string
 
     def initialize(string)

data/lib/mail/elements/envelope_from_element.rb

@@ -4,13 +4,13 @@ require 'mail/parsers/envelope_from_parser'
 require 'date'
 
 module Mail
-  class EnvelopeFromElement
+  class EnvelopeFromElement #:nodoc:
     attr_reader :date_time, :address
 
     def initialize(string)
       envelope_from = Mail::Parsers::EnvelopeFromParser.parse(string)
       @address = envelope_from.address
-      @date_time = ::DateTime.parse(envelope_from.ctime_date)
+      @date_time = ::DateTime.parse(envelope_from.ctime_date) if envelope_from.ctime_date
     end
 
     # RFC 4155:
@@ -19,15 +19,21 @@ module Mail
     #   traditional UNIX 'ctime' output sans timezone (note that the
     #   use of UTC precludes the need for a timezone indicator);
     def formatted_date_time
-      if date_time.respond_to?(:ctime)
-        date_time.ctime
-      else
-        date_time.strftime '%a %b %e %T %Y'
+      if date_time
+        if date_time.respond_to?(:ctime)
+          date_time.ctime
+        else
+          date_time.strftime '%a %b %e %T %Y'
+        end
       end
     end
 
     def to_s
-      "#{address} #{formatted_date_time}"
+      if date_time
+        "#{address} #{formatted_date_time}"
+      else
+        address
+      end
     end
   end
 end