mail 2.7.1 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e806bc9b7c6c6df8de9c9dc80b4cf3a099bad3153f568d0ee4d9287cd34a014
-  data.tar.gz: 182ed03957858cce70691eb79543f13d53e4ddf43684bf50bc011e904d3a84ae
+  metadata.gz: f4a67f21ae487544b4e5643f58bbeefc655aeeb71a8a6b1296f70a3772e45e58
+  data.tar.gz: 7db8b4d4900cb78bb51a4384f0415deb80253df509b22f55073289dea07021c3
 SHA512:
-  metadata.gz: 3c42702e6529565ae63c486fef492b89a19eb394fb6fe5aaf004862257ef3d840579a3cabb95dd2075ddbc617e077110684d8f47052e51d0435b94ef4a2373c3
-  data.tar.gz: 31278e7d48271cfec8541d1094fedd1cc62578a6d9f18e0eafd09ebcac4e5edf3e78a3b902aca3e97d7416d37b0f0c07ba2dde2f5462d6317058552bbc0dbfe7
+  metadata.gz: fe249426a2cb09c463dae570a5a9d13a19e6e9ffcce643f766102da9033ec69bec69642834a29069ade3909e39962abdfb818eba539fe4a1322a2812e9242c93
+  data.tar.gz: 146e604d9cfa857f0485485839ab64334656dd287d059d9fa17d5dd5e71d980c5df4b081b148c99c2d3f841eacfa439aaa0c1e0ab9658181ea57357ba17f41cf

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,30 @@ 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)
+* [Excerpts from TREC Spam Corpus 2005](#excerpts-from-trec-spam-corpus-2005)
 * [License](#license)
 
 ## Compatibility
 
-Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
+Mail is tested against:
+
+* Ruby: 2.5
+* Ruby: 2.6
+* Ruby: 2.7
+* Ruby: 3.0
+* Ruby: 3.1
+* Ruby: 3.2
+* JRuby: 9.2
+* JRuby: 9.3
+* JRuby: 9.4
+* JRuby: stable
+* JRuby: head
+* Truffleruby: stable
+* Truffleruby: head
+
+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 +76,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 +112,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 +163,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 +305,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 +319,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.
@@ -392,18 +417,21 @@ simple as possible.... (asking a lot from a mail library)
 
 ```ruby
 mail = Mail.deliver do
-  to      'nicolas@test.lindsaar.net.au'
-  from    'Mikel Lindsaar <mikel@test.lindsaar.net.au>'
-  subject 'First multipart email sent with Mail'
-
-  text_part do
-    body 'This is plain text'
-  end
-
-  html_part do
-    content_type 'text/html; charset=UTF-8'
-    body '<h1>This is HTML</h1>'
+  part :content_type => "multipart/mixed" do |p1|
+    p1.part :content_type => "multipart/related" do |p2|
+      p2.part :content_type => "multipart/alternative",
+              :content_disposition => "inline" do |p3|
+        p3.part :content_type => "text/plain; charset=utf-8",
+                :body => "Here is the attachment you wanted\n"
+        p3.part :content_type => "text/html; charset=utf-8",
+                :body => "<h1>Funky Title</h1><p>Here is the attachment you wanted</p>\n"
+      end
+    end
+    add_file '/path/to/myfile.pdf'
   end
+  from      "Mikel Lindsaar <mikel@test.lindsaar.net.au>"
+  to        "nicolas@test.lindsaar.net.au"
+  subject   "First multipart email sent with Mail"
 end
 ```
 
@@ -414,38 +442,80 @@ so desire...
 ```
 puts mail.to_s #=>
 
-To: nicolas@test.lindsaar.net.au
+Date: Tue, 26 Apr 2022 20:12:07 +0200
 From: Mikel Lindsaar <mikel@test.lindsaar.net.au>
+To: nicolas@test.lindsaar.net.au
+Message-ID: <626835f736e19_10873fdfa3c2ffd4947a3@sender.at.mail>
 Subject: First multipart email sent with Mail
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary=\"--==_mimepart_626835f733867_10873fdfa3c2ffd494636\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636
+Content-Type: multipart/mixed;
+ boundary=\"--==_mimepart_626835f73382a_10873fdfa3c2ffd494518\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f73382a_10873fdfa3c2ffd494518
+Content-Type: multipart/related;
+ boundary=\"--==_mimepart_626835f7337f5_10873fdfa3c2ffd494438\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f7337f5_10873fdfa3c2ffd494438
 Content-Type: multipart/alternative;
-  boundary=--==_mimepart_4a914f0c911be_6f0f1ab8026659
-Message-ID: <4a914f12ac7e_6f0f1ab80267d1@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
+ boundary=\"--==_mimepart_626835f733702_10873fdfa3c2ffd494376\";
+ charset=UTF-8
 Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+Content-ID: <626835f738373_10873fdfa3c2ffd49488b@sender.at.mail>
 
 
-----==_mimepart_4a914f0c911be_6f0f1ab8026659
-Content-ID: <4a914f12c8c4_6f0f1ab80268d6@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
-Content-Type: text/plain
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376
+Content-Type: text/plain;
+ charset=utf-8
 Content-Transfer-Encoding: 7bit
 
-This is plain text
-----==_mimepart_4a914f0c911be_6f0f1ab8026659
-Content-Type: text/html; charset=UTF-8
-Content-ID: <4a914f12cf86_6f0f1ab802692c@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
+Here is the attachment you wanted
+
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376
+Content-Type: text/html;
+ charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+<h1>Funky Title</h1><p>Here is the attachment you wanted</p>
+
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376--
+
+----==_mimepart_626835f7337f5_10873fdfa3c2ffd494438--
+
+----==_mimepart_626835f73382a_10873fdfa3c2ffd494518--
+
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636
+Content-Type: text/plain;
+ charset=UTF-8;
+ filename=myfile.txt
 Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename=myfile.txt
+Content-ID: <6
+26835f7386ab_10873fdfa3c2ffd4949b8@sender.at.mail>
+
+Hallo,
+Test
+End
 
-<h1>This is HTML</h1>
-----==_mimepart_4a914f0c911be_6f0f1ab8026659--
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636--
 ```
 
 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
@@ -591,7 +661,7 @@ Mail.defaults do
   delivery_method :test # in practice you'd do this in spec_helper.rb
 end
 
-describe "sending an email" do
+RSpec.describe "sending an email" do
   include Mail::Matchers
 
   before(:each) do
@@ -639,6 +709,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

@@ -7,7 +7,9 @@ module Mail
       @content_disposition_type = 'attachment'
       parts_list.map { |p|
         if p.mime_type == 'message/rfc822'
-          Mail.new(p.body.encoded).attachments
+          parts = []
+          parts << p if p.attachment?
+          parts.concat Mail.new(p.body.encoded).attachments
         elsif p.parts.empty?
           p if p.attachment?
         else
@@ -74,7 +76,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 +99,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

@@ -1,28 +1,28 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Mail
-  
+
   # = Body
-  # 
+  #
   # The body is where the text of the email is stored.  Mail treats the body
   # as a single object.  The body itself has no information about boundaries
   # used in the MIME standard, it just looks at its content as either a single
   # block of text, or (if it is a multipart message) as an array of blocks of text.
-  # 
+  #
   # A body has to be told to split itself up into a multipart message by calling
   # #split with the correct boundary.  This is because the body object has no way
   # of knowing what the correct boundary is for itself (there could be many
   # boundaries in a body in the case of a nested MIME text).
-  # 
+  #
   # Once split is called, Mail::Body will slice itself up on this boundary,
   # assigning anything that appears before the first part to the preamble, and
   # anything that appears after the closing boundary to the epilogue, then
   # each part gets initialized into a Mail::Part object.
-  # 
+  #
   # The boundary that is used to split up the Body is also stored in the Body
-  # object for use on encoding itself back out to a string.  You can 
+  # object for use on encoding itself back out to a string.  You can
   # overwrite this if it needs to be changed.
-  # 
+  #
   # On encoding, the body will return the preamble, then each part joined by
   # the boundary, followed by a closing boundary string and then the epilogue.
   class Body
@@ -39,9 +39,9 @@ module Mail
       else
         # Do join first incase we have been given an Array in Ruby 1.9
         if string.respond_to?(:join)
-          @raw_source = ::Mail::Utilities.to_crlf(string.join(''))
+          @raw_source = string.join('')
         elsif string.respond_to?(:to_s)
-          @raw_source = ::Mail::Utilities.to_crlf(string.to_s)
+          @raw_source = string.to_s
         else
           raise "You can only assign a string or an object that responds_to? :join or :to_s to a body."
         end
@@ -50,17 +50,22 @@ 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.
-    # 
+    #
     # Examples:
-    # 
+    #
     #   body = Mail::Body.new('The body')
     #   body == body #=> true
-    #   
+    #
     #   body = Mail::Body.new('The body')
     #   body == 'The body' #=> true
-    #   
+    #
     #   body = Mail::Body.new("VGhlIGJvZHk=\n")
     #   body.encoding = 'base64'
     #   body == "The body" #=> true
@@ -71,28 +76,28 @@ module Mail
         super
       end
     end
-    
+
     # Accepts a string and performs a regular expression against the decoded text
-    # 
+    #
     # Examples:
-    # 
+    #
     #   body = Mail::Body.new('The body')
     #   body =~ /The/ #=> 0
-    #   
+    #
     #   body = Mail::Body.new("VGhlIGJvZHk=\n")
     #   body.encoding = 'base64'
     #   body =~ /The/ #=> 0
     def =~(regexp)
       self.decoded =~ regexp
     end
-    
+
     # Accepts a string and performs a regular expression against the decoded text
-    # 
+    #
     # Examples:
-    # 
+    #
     #   body = Mail::Body.new('The body')
     #   body.match(/The/) #=> #<MatchData "The">
-    #   
+    #
     #   body = Mail::Body.new("VGhlIGJvZHk=\n")
     #   body.encoding = 'base64'
     #   body.match(/The/) #=> #<MatchData "The">
@@ -120,7 +125,7 @@ module Mail
     def set_sort_order(order)
       @part_sort_order = order
     end
-    
+
     # Allows you to sort the parts according to the default sort order, or the sort order you
     # set with :set_sort_order.
     #
@@ -132,12 +137,6 @@ module Mail
       end
       @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)
@@ -165,7 +164,7 @@ module Mail
           # Cannot decode, so skip normalization
           raw_source
         else
-          # Decode then encode to normalize and allow transforming 
+          # Decode then encode to normalize and allow transforming
           # from base64 to Q-P and vice versa
           decoded = dec.decode(raw_source)
           if defined?(Encoding) && charset && charset != "US-ASCII"
@@ -184,18 +183,10 @@ module Mail
         Encodings.get_encoding(encoding).decode(raw_source)
       end
     end
-    
+
     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
@@ -295,7 +272,7 @@ module Mail
       parts_regex = /
         (?:                    # non-capturing group
           \A                |  # start of string OR
-          \r\n                 # line break
+          \r?\n                # line break with optional CR
          )
         (
           --#{Regexp.escape(boundary || "")}  # boundary delimiter
@@ -312,11 +289,11 @@ module Mail
       end
       parts.map(&:first)
     end
-    
+
     def crlf_boundary
       "\r\n--#{boundary}\r\n"
     end
-    
+
     def end_boundary
       "\r\n--#{boundary}--\r\n"
     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"