net-imap 0.3.7 → 0.5.6

data/lib/net/imap/response_data.rb

@@ -2,6 +2,15 @@
 
 module Net
   class IMAP < Protocol
+    autoload :ESearchResult,    "#{__dir__}/esearch_result"
+    autoload :FetchData,        "#{__dir__}/fetch_data"
+    autoload :UIDFetchData,     "#{__dir__}/fetch_data"
+    autoload :SearchResult,     "#{__dir__}/search_result"
+    autoload :SequenceSet,      "#{__dir__}/sequence_set"
+    autoload :UIDPlusData,      "#{__dir__}/uidplus_data"
+    autoload :AppendUIDData,    "#{__dir__}/uidplus_data"
+    autoload :CopyUIDData,      "#{__dir__}/uidplus_data"
+    autoload :VanishedData,     "#{__dir__}/vanished_data"
 
     # Net::IMAP::ContinuationRequest represents command continuation requests.
     #
@@ -55,17 +64,71 @@ module Net
 
     # Net::IMAP::IgnoredResponse represents intentionally ignored responses.
     #
-    # This includes untagged response "NOOP" sent by eg. Zimbra to avoid some
-    # clients to close the connection.
+    # This includes untagged response "NOOP" sent by e.g. Zimbra to avoid
+    # some clients to close the connection.
     #
     # It matches no IMAP standard.
+    class IgnoredResponse < UntaggedResponse
+    end
+
+    # **Note:** This represents an intentionally _unstable_ API.  Where
+    # instances of this class are returned, future releases may return a
+    # different (incompatible) object <em>without deprecation or warning</em>.
+    #
+    # Net::IMAP::UnparsedData represents data for unknown response types or
+    # unknown extensions to response types without a well-defined extension
+    # grammar.
     #
-    class IgnoredResponse < Struct.new(:raw_data)
+    # See also: UnparsedNumericResponseData, ExtensionData, IgnoredResponse
+    class UnparsedData < Struct.new(:unparsed_data)
       ##
-      # method: raw_data
-      # :call-seq: raw_data -> string
+      # method: unparsed_data
+      # :call-seq: unparsed_data -> string
       #
-      # The raw response data.
+      # The unparsed data
+    end
+
+    # **Note:** This represents an intentionally _unstable_ API.  Where
+    # instances of this class are returned, future releases may return a
+    # different (incompatible) object <em>without deprecation or warning</em>.
+    #
+    # Net::IMAP::UnparsedNumericResponseData represents data for unhandled
+    # response types with a numeric prefix.  See the documentation for #number.
+    #
+    # See also: UnparsedData, ExtensionData, IgnoredResponse
+    class UnparsedNumericResponseData < Struct.new(:number, :unparsed_data)
+      ##
+      # method: number
+      # :call-seq: number -> integer
+      #
+      # Returns a numeric response data prefix, when available.
+      #
+      # Many response types are prefixed with a non-negative #number.  For
+      # message data, #number may represent a sequence number or a UID.  For
+      # mailbox data, #number may represent a message count.
+
+      ##
+      # method: unparsed_data
+      # :call-seq: unparsed_data -> string
+      #
+      # The unparsed data, not including #number or UntaggedResponse#name.
+    end
+
+    # **Note:** This represents an intentionally _unstable_ API.  Where
+    # instances of this class are returned, future releases may return a
+    # different (incompatible) object <em>without deprecation or warning</em>.
+    #
+    # Net::IMAP::ExtensionData represents data that is parsable according to the
+    # forward-compatible extension syntax in RFC3501, RFC4466, or RFC9051, but
+    # isn't directly known or understood by Net::IMAP yet.
+    #
+    # See also: UnparsedData, UnparsedNumericResponseData, IgnoredResponse
+    class ExtensionData < Struct.new(:data)
+      ##
+      # method: data
+      # :call-seq: data -> string
+      #
+      # The parsed extension data.
     end
 
     # Net::IMAP::TaggedResponse represents tagged responses.
@@ -100,14 +163,24 @@ module Net
       # The raw response data.
     end
 
-    # Net::IMAP::ResponseText represents texts of responses.
+    # ResponseText represents texts of responses.
     #
     # The text may be prefixed by a ResponseCode.
     #
-    # ResponseText is returned from TaggedResponse#data, or from
-    # UntaggedResponse#data when the response type is a "condition" ("OK", "NO",
-    # "BAD", "PREAUTH", or "BYE").
+    # ResponseText is returned from TaggedResponse#data or
+    # UntaggedResponse#data for
+    # {"status responses"}[https://www.rfc-editor.org/rfc/rfc3501#section-7.1]:
+    # * every TaggedResponse, name[rdoc-ref:TaggedResponse#name] is always
+    #   "+OK+", "+NO+", or "+BAD+".
+    # * any UntaggedResponse when name[rdoc-ref:UntaggedResponse#name] is
+    #   "+OK+", "+NO+", "+BAD+", "+PREAUTH+", or "+BYE+".
+    #
+    # Note that these "status responses" are confusingly _not_ the same as the
+    # +STATUS+ UntaggedResponse (see IMAP#status and StatusData).
     class ResponseText < Struct.new(:code, :text)
+      # Used to avoid an allocation when ResponseText is empty
+      EMPTY = new(nil, "").freeze
+
       ##
       # method: code
       # :call-seq: code -> ResponseCode or nil
@@ -121,31 +194,35 @@ module Net
       # Returns the response text, not including any response code
     end
 
-    # Net::IMAP::ResponseCode represents response codes.  Response codes can be
-    # retrieved from ResponseText#code and can be included in any "condition"
-    # response: any TaggedResponse and UntaggedResponse when the response type
-    # is a "condition" ("OK", "NO", "BAD", "PREAUTH", or "BYE").
+    # ResponseCode represents an \IMAP response code, which can be retrieved
+    # from ResponseText#code for
+    # {"status responses"}[https://www.rfc-editor.org/rfc/rfc3501#section-7.1]:
+    # * every TaggedResponse, name[rdoc-ref:TaggedResponse#name] is always
+    #   "+OK+", "+NO+", or "+BAD+".
+    # * any UntaggedResponse when name[rdoc-ref:UntaggedResponse#name] is
+    #   "+OK+", "+NO+", "+BAD+", "+PREAUTH+", or "+BYE+".
+    #
+    # Note that these "status responses" are confusingly _not_ the same as the
+    # +STATUS+ UntaggedResponse (see IMAP#status and StatusData).
     #
     # Some response codes come with additional data which will be parsed by
     # Net::IMAP.  Others return +nil+ for #data, but are used as a
     # machine-readable annotation for the human-readable ResponseText#text in
-    # the same response.  When Net::IMAP does not know how to parse response
-    # code text, #data returns the unparsed string.
+    # the same response.
     #
     # Untagged response code #data is pushed directly onto Net::IMAP#responses,
     # keyed by #name, unless it is removed by the command that generated it.
     # Use Net::IMAP#add_response_handler to view tagged response codes for
     # command methods that do not return their TaggedResponse.
     #
+    # == Standard response codes
+    #
     # \IMAP extensions may define new codes and the data that comes with them.
     # The IANA {IMAP Response
     # Codes}[https://www.iana.org/assignments/imap-response-codes/imap-response-codes.xhtml]
     # registry has links to specifications for all standard response codes.
-    # Response codes are backwards compatible:  Servers are allowed to send new
-    # response codes even if the client has not enabled the extension that
-    # defines them.  When unknown response code data is encountered, #data
-    # will return an unparsed string.
     #
+    # === +IMAP4rev1+ response codes
     # See [IMAP4rev1[https://www.rfc-editor.org/rfc/rfc3501]] {§7.1, "Server
     # Responses - Status
     # Responses"}[https://www.rfc-editor.org/rfc/rfc3501#section-7.1] for full
@@ -169,13 +246,32 @@ module Net
     #   {§2.3.1.1, "Unique Identifier (UID) Message
     #   Attribute}[https://www.rfc-editor.org/rfc/rfc3501#section-2.3.1.1].
     # * +UIDVALIDITY+, #data is an Integer, the UID validity value of the
-    #   mailbox  See [{IMAP4rev1}[https://www.rfc-editor.org/rfc/rfc3501]],
+    #   mailbox.  See [{IMAP4rev1}[https://www.rfc-editor.org/rfc/rfc3501]],
     #   {§2.3.1.1, "Unique Identifier (UID) Message
     #   Attribute}[https://www.rfc-editor.org/rfc/rfc3501#section-2.3.1.1].
     # * +UNSEEN+, #data is an Integer, the number of messages which do not have
     #   the <tt>\Seen</tt> flag set.
-    #
-    # See RFC5530[https://www.rfc-editor.org/rfc/rfc5530], "IMAP Response
+    #   <em>DEPRECATED by IMAP4rev2.</em>
+    #
+    # === +BINARY+ extension
+    # See {[RFC3516]}[https://www.rfc-editor.org/rfc/rfc3516].
+    # * +UNKNOWN-CTE+, with a tagged +NO+ response, when the server does not
+    #   known how to decode a CTE (content-transfer-encoding).  #data is +nil+.
+    #   See IMAP#fetch.
+    #
+    # === +UIDPLUS+ extension
+    # See {[RFC4315 §3]}[https://www.rfc-editor.org/rfc/rfc4315#section-3].
+    # * +APPENDUID+, #data is UIDPlusData.  See IMAP#append.
+    # * +COPYUID+, #data is UIDPlusData.  See IMAP#copy.
+    # * +UIDNOTSTICKY+, #data is +nil+.  See IMAP#select.
+    #
+    # === +SEARCHRES+ extension
+    # See {[RFC5182]}[https://www.rfc-editor.org/rfc/rfc5182].
+    # * +NOTSAVED+, with a tagged +NO+ response, when the search result variable
+    #   is not saved.  #data is +nil+.
+    #
+    # === +RFC5530+ response codes
+    # See {[RFC5530]}[https://www.rfc-editor.org/rfc/rfc5530], "IMAP Response
     # Codes" for the definition of the following response codes, which are all
     # machine-readable annotations for the human-readable ResponseText#text, and
     # have +nil+ #data of their own:
@@ -197,6 +293,42 @@ module Net
     # * +ALREADYEXISTS+
     # * +NONEXISTENT+
     #
+    # === +QRESYNC+ extension
+    # See {[RFC7162]}[https://www.rfc-editor.org/rfc/rfc7162.html].
+    # * +CLOSED+, returned when the currently selected mailbox is closed
+    #   implicitly by selecting or examining another mailbox.  #data is +nil+.
+    #
+    # === +IMAP4rev2+ response codes
+    # See {[RFC9051]}[https://www.rfc-editor.org/rfc/rfc9051] {§7.1, "Server
+    # Responses - Status
+    # Responses"}[https://www.rfc-editor.org/rfc/rfc9051#section-7.1] for full
+    # descriptions of IMAP4rev2 response codes.  IMAP4rev2 includes all of the
+    # response codes listed above (except "+UNSEEN+") and adds the following:
+    # * +HASCHILDREN+, with a tagged +NO+ response, when a mailbox delete failed
+    #   because the server doesn't allow deletion of mailboxes with children.
+    #   #data is +nil+.
+    #
+    # === +CONDSTORE+ extension
+    # See {[RFC7162]}[https://www.rfc-editor.org/rfc/rfc7162.html].
+    # * +NOMODSEQ+, when selecting a mailbox that does not support
+    #   mod-sequences.  #data is +nil+.  See IMAP#select.
+    # * +HIGHESTMODSEQ+, #data is an Integer, the highest mod-sequence value of
+    #   all messages in the mailbox.  See IMAP#select.
+    # * +MODIFIED+, #data is a SequenceSet, the messages that have been modified
+    #   since the +UNCHANGEDSINCE+ mod-sequence given to +STORE+ or <tt>UID
+    #   STORE</tt>.
+    #
+    # === +OBJECTID+ extension
+    # See {[RFC8474]}[https://www.rfc-editor.org/rfc/rfc8474.html].
+    # * +MAILBOXID+, #data is a string
+    #
+    # == Extension compatibility
+    #
+    # Response codes are backwards compatible:  Servers are allowed to send new
+    # response codes even if the client has not enabled the extension that
+    # defines them.  When Net::IMAP does not know how to parse response
+    # code text, #data returns the unparsed string.
+    #
     class ResponseCode < Struct.new(:name, :data)
       ##
       # method: name
@@ -215,64 +347,8 @@ module Net
       # code data can take.
     end
 
-    # Net::IMAP::UIDPlusData represents the ResponseCode#data that accompanies
-    # the +APPENDUID+ and +COPYUID+ response codes.
-    #
-    # See [[UIDPLUS[https://www.rfc-editor.org/rfc/rfc4315.html]].
-    #
-    # ==== Capability requirement
-    #
-    # The +UIDPLUS+ capability[rdoc-ref:Net::IMAP#capability] must be supported.
-    # A server that supports +UIDPLUS+ should send a UIDPlusData object inside
-    # every TaggedResponse returned by the append[rdoc-ref:Net::IMAP#append],
-    # copy[rdoc-ref:Net::IMAP#copy], move[rdoc-ref:Net::IMAP#move], {uid
-    # copy}[rdoc-ref:Net::IMAP#uid_copy], and {uid
-    # move}[rdoc-ref:Net::IMAP#uid_move] commands---unless the destination
-    # mailbox reports +UIDNOTSTICKY+.
-    #
-    #--
-    # TODO: support MULTIAPPEND
-    #++
-    #
-    class UIDPlusData < Struct.new(:uidvalidity, :source_uids, :assigned_uids)
-      ##
-      # method: uidvalidity
-      # :call-seq: uidvalidity -> nonzero uint32
-      #
-      # The UIDVALIDITY of the destination mailbox.
-
-      ##
-      # method: source_uids
-      # :call-seq: source_uids -> nil or an array of nonzero uint32
-      #
-      # The UIDs of the copied or moved messages.
-      #
-      # Note:: Returns +nil+ for Net::IMAP#append.
-
-      ##
-      # method: assigned_uids
-      # :call-seq: assigned_uids -> an array of nonzero uint32
-      #
-      # The newly assigned UIDs of the copied, moved, or appended messages.
-      #
-      # Note:: This always returns an array, even when it contains only one UID.
-
-      ##
-      # :call-seq: uid_mapping -> nil or a hash
-      #
-      # Returns a hash mapping each source UID to the newly assigned destination
-      # UID.
-      #
-      # Note:: Returns +nil+ for Net::IMAP#append.
-      def uid_mapping
-        source_uids&.zip(assigned_uids)&.to_h
-      end
-    end
-
-    # Net::IMAP::MailboxList represents contents of the LIST response,
-    # representing a single mailbox path.
-    #
-    # Net::IMAP#list returns an array of MailboxList objects.
+    # MailboxList represents the data of an untagged +LIST+ response, for a
+    # _single_ mailbox path.  IMAP#list returns an array of MailboxList objects.
     #
     class MailboxList < Struct.new(:attr, :delim, :name)
       ##
@@ -282,11 +358,11 @@ module Net
       # Returns the name attributes. Each name attribute is a symbol capitalized
       # by String#capitalize, such as :Noselect (not :NoSelect).  For the
       # semantics of each attribute, see:
-      # * rdoc-ref:Net::IMAP@Basic+Mailbox+Attributes
-      # * rdoc-ref:Net::IMAP@Mailbox+role+Attributes
-      # * Net::IMAP@SPECIAL-USE
+      # * Net::IMAP@Basic+Mailbox+Attributes
+      # * Net::IMAP@Mailbox+role+Attributes
       # * The IANA {IMAP Mailbox Name Attributes
       #   registry}[https://www.iana.org/assignments/imap-mailbox-name-attributes/imap-mailbox-name-attributes.xhtml]
+      #   has links to specifications for all standard mailbox attributes.
 
       ##
       # method: delim
@@ -301,16 +377,16 @@ module Net
       # Returns the mailbox name.
     end
 
-    # Net::IMAP::MailboxQuota represents contents of GETQUOTA response.
-    # This object can also be a response to GETQUOTAROOT.  In the syntax
-    # specification below, the delimiter used with the "#" construct is a
-    # single space (SPACE).
+    # MailboxQuota represents the data of an untagged +QUOTA+ response.
     #
-    # Net:IMAP#getquota returns an array of MailboxQuota objects.
+    # IMAP#getquota returns an array of MailboxQuota objects.
     #
     # Net::IMAP#getquotaroot returns an array containing both MailboxQuotaRoot
     # and MailboxQuota objects.
     #
+    # == Required capability
+    # Requires +QUOTA+ [RFC2087[https://www.rfc-editor.org/rfc/rfc2087]]
+    # capability.
     class MailboxQuota < Struct.new(:mailbox, :usage, :quota)
       ##
       # method: mailbox
@@ -332,12 +408,14 @@ module Net
       #
     end
 
-    # Net::IMAP::MailboxQuotaRoot represents part of the GETQUOTAROOT
-    # response. (GETQUOTAROOT can also return Net::IMAP::MailboxQuota.)
+    # MailboxQuotaRoot represents the data of an untagged +QUOTAROOT+ response.
     #
-    # Net::IMAP#getquotaroot returns an array containing both MailboxQuotaRoot
-    # and MailboxQuota objects.
+    # IMAP#getquotaroot returns an array containing both MailboxQuotaRoot and
+    # MailboxQuota objects.
     #
+    # == Required capability
+    # Requires +QUOTA+ [RFC2087[https://www.rfc-editor.org/rfc/rfc2087]]
+    # capability.
     class MailboxQuotaRoot < Struct.new(:mailbox, :quotaroots)
       ##
       # method: mailbox
@@ -352,12 +430,13 @@ module Net
       # Zero or more quotaroots that affect the quota on the specified mailbox.
     end
 
-    # Net::IMAP::MailboxACLItem represents the response from GETACL.
+    # MailboxACLItem represents the data of an untagged +ACL+ response.
     #
-    # Net::IMAP#getacl returns an array of MailboxACLItem objects.
+    # IMAP#getacl returns an array of MailboxACLItem objects.
     #
-    # ==== Required capability
-    # +ACL+ - described in [ACL[https://tools.ietf.org/html/rfc4314]]
+    # == Required capability
+    # Requires +ACL+ [RFC4314[https://www.rfc-editor.org/rfc/rfc4314]]
+    # capability.
     class MailboxACLItem < Struct.new(:user, :rights, :mailbox)
       ##
       # method: mailbox
@@ -379,11 +458,12 @@ module Net
       # The access rights the indicated #user has to the #mailbox.
     end
 
-    # Net::IMAP::Namespace represents a single namespace contained inside a
-    # NAMESPACE response.
-    #
-    # Returned by Net::IMAP#namespace, contained inside a Namespaces object.
+    # Namespace represents a _single_ namespace, contained inside a Namespaces
+    # object.
     #
+    # == Required capability
+    # Requires either +NAMESPACE+ [RFC2342[https://www.rfc-editor.org/rfc/rfc2342]]
+    # or +IMAP4rev2+ capability.
     class Namespace < Struct.new(:prefix, :delim, :extensions)
       ##
       # method: prefix
@@ -405,11 +485,14 @@ module Net
       # Extension parameter semantics would be defined by the extension.
     end
 
-    # Net::IMAP::Namespaces represents a +NAMESPACE+ server response, which
-    # contains lists of #personal, #shared, and #other namespaces.
+    # Namespaces represents the data of an untagged +NAMESPACE+ response,
+    # returned by IMAP#namespace.
     #
-    # Net::IMAP#namespace returns a Namespaces object.
+    # Contains lists of #personal, #shared, and #other namespaces.
     #
+    # == Required capability
+    # Requires either +NAMESPACE+ [RFC2342[https://www.rfc-editor.org/rfc/rfc2342]]
+    # or +IMAP4rev2+ capability.
     class Namespaces < Struct.new(:personal, :other, :shared)
       ##
       # method: personal
@@ -430,9 +513,9 @@ module Net
       # Returns an array of Shared Namespace objects.
     end
 
-    # Net::IMAP::StatusData represents the contents of the STATUS response.
+    # StatusData represents the contents of an untagged +STATUS+ response.
     #
-    # Net::IMAP#status returns the contents of #attr.
+    # IMAP#status returns the contents of #attr.
     class StatusData < Struct.new(:mailbox, :attr)
       ##
       # method: mailbox
@@ -448,223 +531,20 @@ module Net
       # "UIDVALIDITY", "UNSEEN". Each value is a number.
     end
 
-    # Net::IMAP::FetchData represents the contents of a FETCH response.
-    #
-    # Net::IMAP#fetch and Net::IMAP#uid_fetch both return an array of
-    # FetchData objects.
-    #
-    # === Fetch attributes
-    #
-    #--
-    # TODO: merge branch with accessor methods for each type of attr.  Then
-    # move nearly all of the +attr+ documentation onto the appropriate
-    # accessor methods.
-    #++
-    #
-    # Each key of the #attr hash is the data item name for the fetched value.
-    # Each data item represents a message attribute, part of one, or an
-    # interpretation of one.  #seqno is not a message attribute.  Most message
-    # attributes are static and must never change for a given <tt>[server,
-    # account, mailbox, UIDVALIDITY, UID]</tt> tuple.  A few message attributes
-    # can be dynamically changed, e.g. using the {STORE
-    # command}[rdoc-ref:Net::IMAP#store].
-    #
-    # See {[IMAP4rev1] §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501.html#section-7.4.2]
-    # and {[IMAP4rev2] §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051.html#section-7.5.2]
-    # for full description of the standard fetch response data items, and
-    # Net::IMAP@Message+envelope+and+body+structure for other relevant RFCs.
-    #
-    # ==== Static fetch data items
-    #
-    # The static data items
-    # defined by [IMAP4rev1[https://www.rfc-editor.org/rfc/rfc3501.html]] are:
-    #
-    # [<tt>"UID"</tt>]
-    #   A number expressing the unique identifier of the message.
-    #
-    # [<tt>"BODY[]"</tt>, <tt>"BODY[]<#{offset}>"</tt>]
-    #   The [RFC5322[https://tools.ietf.org/html/rfc5322]] expression of the
-    #   entire message, as a string.
-    #
-    #   If +offset+ is specified, this returned string is a substring of the
-    #   entire contents, starting at that origin octet.  This means that
-    #   <tt>BODY[]<0></tt> MAY be truncated, but <tt>BODY[]</tt> is NEVER
-    #   truncated.
-    #
-    #   <em>Messages can be parsed using the "mail" gem.</em>
-    #
-    #   [Note]
-    #     When fetching <tt>BODY.PEEK[#{specifier}]</tt>, the data will be
-    #     returned in <tt>BODY[#{specifier}]</tt>, without the +PEEK+.  This is
-    #     true for all of the <tt>BODY[...]</tt> attribute forms.
-    #
-    # [<tt>"BODY[HEADER]"</tt>, <tt>"BODY[HEADER]<#{offset}>"</tt>]
-    #   The [RFC5322[https://tools.ietf.org/html/rfc5322]] header of the
-    #   message.
-    #
-    #   <em>Message headers can be parsed using the "mail" gem.</em>
-    #
-    # [<tt>"BODY[HEADER.FIELDS (#{fields.join(" ")})]"</tt>,]
-    # [<tt>"BODY[HEADER.FIELDS (#{fields.join(" ")})]<#{offset}>"</tt>]
-    #   When field names are given, the subset contains only the header fields
-    #   that matches one of the names in the list.  The field names are based
-    #   on what was requested, not on what was returned.
-    #
-    # [<tt>"BODY[HEADER.FIELDS.NOT (#{fields.join(" ")})]"</tt>,]
-    # [<tt>"BODY[HEADER.FIELDS.NOT (#{fields.join(" ")})]<#{offset}>"</tt>]
-    #   When the <tt>HEADER.FIELDS.NOT</tt> is used, the subset is all of the
-    #   fields that <em>do not</em> match any names in the list.
-    #
-    # [<tt>"BODY[TEXT]"</tt>, <tt>"BODY[TEXT]<#{offset}>"</tt>]
-    #   The text body of the message, omitting
-    #   the [RFC5322[https://tools.ietf.org/html/rfc5322]] header.
-    #
-    # [<tt>"BODY[#{part}]"</tt>, <tt>"BODY[#{part}]<#{offset}>"</tt>]
-    #   The text of a particular body section, if it was fetched.
-    #
-    #   Multiple part specifiers will be joined with <tt>"."</tt>.  Numeric
-    #   part specifiers refer to the MIME part number, counting up from +1+.
-    #   Messages that don't use MIME, or MIME messages that are not multipart
-    #   and don't hold an encapsulated message, only have a part +1+.
-    #
-    #   8-bit textual data is permitted if
-    #   a [CHARSET[https://tools.ietf.org/html/rfc2978]] identifier is part of
-    #   the body parameter parenthesized list for this section.  See
-    #   BodyTypeBasic.
-    #
-    #   MESSAGE/RFC822 or MESSAGE/GLOBAL message, or a subset of the header, if
-    #   it was fetched.
-    #
-    # [<tt>"BODY[#{part}.HEADER]"</tt>,]
-    # [<tt>"BODY[#{part}.HEADER]<#{offset}>"</tt>,]
-    # [<tt>"BODY[#{part}.HEADER.FIELDS.NOT (#{fields.join(" ")})]"</tt>,]
-    # [<tt>"BODY[#{part}.HEADER.FIELDS.NOT (#{fields.join(" ")})]<#{offset}>"</tt>,]
-    # [<tt>"BODY[#{part}.TEXT]"</tt>,]
-    # [<tt>"BODY[#{part}.TEXT]<#{offset}>"</tt>,]
-    # [<tt>"BODY[#{part}.MIME]"</tt>,]
-    # [<tt>"BODY[#{part}.MIME]<#{offset}>"</tt>]
-    #   +HEADER+, <tt>HEADER.FIELDS</tt>, <tt>HEADER.FIELDS.NOT</tt>, and
-    #   <tt>TEXT</tt> can be prefixed by numeric part specifiers, if it refers
-    #   to a part of type <tt>message/rfc822</tt> or <tt>message/global</tt>.
-    #
-    #   +MIME+ refers to the [MIME-IMB[https://tools.ietf.org/html/rfc2045]]
-    #   header for this part.
-    #
-    # [<tt>"BODY"</tt>]
-    #   A form of +BODYSTRUCTURE+, without any extension data.
-    #
-    # [<tt>"BODYSTRUCTURE"</tt>]
-    #   Returns a BodyStructure object that describes
-    #   the [MIME-IMB[https://tools.ietf.org/html/rfc2045]] body structure of
-    #   a message, if it was fetched.
-    #
-    # [<tt>"ENVELOPE"</tt>]
-    #   An Envelope object that describes the envelope structure of a message.
-    #   See the documentation for Envelope for a description of the envelope
-    #   structure attributes.
-    #
-    # [<tt>"INTERNALDATE"</tt>]
-    #   The internal date and time of the message on the server.  This is not
-    #   the date and time in
-    #   the [RFC5322[https://tools.ietf.org/html/rfc5322]] header, but rather
-    #   a date and time which reflects when the message was received.
-    #
-    # [<tt>"RFC822.SIZE"</tt>]
-    #   A number expressing the [RFC5322[https://tools.ietf.org/html/rfc5322]]
-    #   size of the message.
-    #
-    #   [Note]
-    #     \IMAP was originally developed for the older RFC-822 standard, and
-    #     as a consequence several fetch items in \IMAP incorporate "RFC822"
-    #     in their name.  With the exception of +RFC822.SIZE+, there are more
-    #     modern replacements; for example, the modern version of
-    #     +RFC822.HEADER+ is <tt>BODY.PEEK[HEADER]</tt>.  In all cases,
-    #     "RFC822" should be interpreted as a reference to the
-    #     updated [RFC5322[https://tools.ietf.org/html/rfc5322]] standard.
-    #
-    # [<tt>"RFC822"</tt>]
-    #   Semantically equivalent to <tt>BODY[]</tt>.
-    # [<tt>"RFC822.HEADER"</tt>]
-    #   Semantically equivalent to <tt>BODY[HEADER]</tt>.
-    # [<tt>"RFC822.TEXT"</tt>]
-    #   Semantically equivalent to <tt>BODY[TEXT]</tt>.
-    #
-    # [Note:]
-    #   >>>
-    #     Additional static fields are defined in \IMAP extensions and
-    #     [IMAP4rev2[https://www.rfc-editor.org/rfc/rfc9051.html]], but
-    #     Net::IMAP can't parse them yet.
-    #
-    #--
-    # <tt>"BINARY[#{section_binary}]<#{offset}>"</tt>:: TODO...
-    # <tt>"BINARY.SIZE[#{sectionbinary}]"</tt>::        TODO...
-    # <tt>"EMAILID"</tt>::                              TODO...
-    # <tt>"THREADID"</tt>::                             TODO...
-    # <tt>"SAVEDATE"</tt>::                             TODO...
-    #++
-    #
-    # ==== Dynamic message attributes
-    # The only dynamic item defined
-    # by [{IMAP4rev1}[https://www.rfc-editor.org/rfc/rfc3501.html]] is:
-    # [<tt>"FLAGS"</tt>]
-    #   An array of flags that are set for this message.  System flags are
-    #   symbols that have been capitalized by String#capitalize.  Keyword
-    #   flags are strings and their case is not changed.
-    #
-    # \IMAP extensions define new dynamic fields, e.g.:
-    #
-    # [<tt>"MODSEQ"</tt>]
-    #   The modification sequence number associated with this IMAP message.
-    #
-    #   Requires the [CONDSTORE[https://tools.ietf.org/html/rfc7162]]
-    #   server {capability}[rdoc-ref:Net::IMAP#capability].
-    #
-    # [Note:]
-    #   >>>
-    #     Additional dynamic fields are defined in \IMAP extensions, but
-    #     Net::IMAP can't parse them yet.
-    #
-    #--
-    # <tt>"ANNOTATE"</tt>:: TODO...
-    # <tt>"PREVIEW"</tt>::  TODO...
-    #++
-    #
-    class FetchData < Struct.new(:seqno, :attr)
-      ##
-      # method: seqno
-      # :call-seq: seqno -> Integer
-      #
-      # The message sequence number.
-      #
-      # [Note]
-      #   This is never the unique identifier (UID), not even for the
-      #   Net::IMAP#uid_fetch result.  If it was returned, the UID is available
-      #   from <tt>attr["UID"]</tt>.
-
-      ##
-      # method: attr
-      # :call-seq: attr -> hash
-      #
-      # A hash.  Each key is specifies a message attribute, and the value is the
-      # corresponding data item.
-      #
-      # See rdoc-ref:FetchData@Fetch+attributes for descriptions of possible
-      # values.
-    end
-
     # Net::IMAP::Envelope represents envelope structures of messages.
     #
     # [Note]
     #   When the #sender and #reply_to fields are absent or empty, they will
     #   return the same value as #from.  Also, fields may return values that are
-    #   invalid for well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+    #   invalid for well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
     #   messages when the message is malformed or a draft message.
     #
-    # See [{IMAP4rev1 §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501.html#section-7.4.2]]
-    # and [{IMAP4rev2 §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051.html#section-7.5.2]]
+    # See [{IMAP4rev1 §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501#section-7.4.2]]
+    # and [{IMAP4rev2 §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051#section-7.5.2]]
     # for full description of the envelope fields, and
     # Net::IMAP@Message+envelope+and+body+structure for other relevant RFCs.
     #
+    # Returned by FetchData#envelope
     class Envelope < Struct.new(:date, :subject, :from, :sender, :reply_to,
                                 :to, :cc, :bcc, :in_reply_to, :message_id)
       ##
@@ -674,7 +554,7 @@ module Net
       # Returns a string that represents the +Date+ header.
       #
       # [Note]
-      #   For a well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+      #   For a well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
       #   message, the #date field must not be +nil+.  However it can be +nil+
       #   for a malformed or draft message.
 
@@ -700,7 +580,7 @@ module Net
       # returns +nil+ for this envelope field.
       #
       # [Note]
-      #   For a well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+      #   For a well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
       #   message, the #from field must not be +nil+.  However it can be +nil+
       #   for a malformed or draft message.
 
@@ -713,7 +593,7 @@ module Net
       # [Note]
       #   If the <tt>Sender</tt> header is absent, or is present but empty, the
       #   server sets this field to be the same value as #from.  Therefore, in a
-      #   well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]] message,
+      #   well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] message,
       #   the #sender envelope field must not be +nil+.  However it can be
       #   +nil+ for a malformed or draft message.
 
@@ -727,7 +607,7 @@ module Net
       # [Note]
       #   If the <tt>Reply-To</tt> header is absent, or is present but empty,
       #   the server sets this field to be the same value as #from.  Therefore,
-      #   in a well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+      #   in a well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
       #   message, the #reply_to envelope field must not be +nil+.  However it
       #   can be +nil+ for a malformed or draft message.
 
@@ -756,7 +636,7 @@ module Net
       # Returns a string that represents the <tt>In-Reply-To</tt> header.
       #
       # [Note]
-      #   For a well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+      #   For a well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
       #   message, the #in_reply_to field, if present, must not be empty.  But
       #   it can still return an empty string for malformed messages.
       #
@@ -772,7 +652,7 @@ module Net
       # Returns a string that represents the <tt>Message-ID</tt>.
       #
       # [Note]
-      #   For a well-formed [RFC5322[https://tools.ietf.org/html/rfc5322]]
+      #   For a well-formed [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]]
       #   message, the #message_id field, if present, must not be empty.  But it
       #   can still return an empty string for malformed messages.
       #
@@ -786,10 +666,10 @@ module Net
     # parsed into its component parts by the server.  Address objects are
     # returned within Envelope fields.
     #
-    # === Group syntax
+    # == Group syntax
     #
     # When the #host field is +nil+, this is a special form of address structure
-    # that indicates the [RFC5322[https://tools.ietf.org/html/rfc5322]] group
+    # that indicates the [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] group
     # syntax.  If the #mailbox name field is also +nil+, this is an end-of-group
     # marker (semicolon in RFC-822 syntax).  If the #mailbox name field is
     # non-+NIL+, this is the start of a group marker, and the mailbox #name
@@ -799,7 +679,7 @@ module Net
       # method: name
       # :call-seq: name -> string or nil
       #
-      # Returns the [RFC5322[https://tools.ietf.org/html/rfc5322]] address
+      # Returns the [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] address
       # +display-name+ (or the mailbox +phrase+ in the RFC-822 grammar).
 
       ##
@@ -809,28 +689,28 @@ module Net
       # Returns the route from RFC-822 route-addr.
       #
       # Note:: Generating this obsolete route addressing syntax is not allowed
-      #        by [RFC5322[https://tools.ietf.org/html/rfc5322]].  However,
+      #        by [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]].  However,
       #        addresses with this syntax must still be accepted and parsed.
 
       ##
       # method: mailbox
       # :call-seq: mailbox -> string or nil
       #
-      # Returns the [RFC5322[https://tools.ietf.org/html/rfc5322]] address
+      # Returns the [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] address
       # +local-part+, if #host is not +nil+.
       #
       # When #host is +nil+, this returns
-      # an [RFC5322[https://tools.ietf.org/html/rfc5322]] group name and a +nil+
+      # an [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] group name and a +nil+
       # mailbox indicates the end of a group.
 
       ##
       # method: host
       # :call-seq: host -> string or nil
       #
-      # Returns the [RFC5322[https://tools.ietf.org/html/rfc5322]] addr-spec
+      # Returns the [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] addr-spec
       # +domain+ name.
       #
-      # +nil+ indicates [RFC5322[https://tools.ietf.org/html/rfc5322]] group
+      # +nil+ indicates [RFC5322[https://www.rfc-editor.org/rfc/rfc5322]] group
       # syntax.
     end
 
@@ -842,14 +722,14 @@ module Net
       # :call-seq: dsp_type -> string
       #
       # Returns the content disposition type, as defined by
-      # [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
+      # [DISPOSITION[https://www.rfc-editor.org/rfc/rfc2183]].
 
       ##
       # method: param
       # :call-seq: param -> hash
       #
       # Returns a hash representing parameters of the Content-Disposition
-      # field, as defined by [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
+      # field, as defined by [DISPOSITION[https://www.rfc-editor.org/rfc/rfc2183]].
     end
 
     # Net::IMAP::ThreadMember represents a thread-node returned
@@ -868,6 +748,19 @@ module Net
       #
       # An array of Net::IMAP::ThreadMember objects for mail items that are
       # children of this in the thread.
+
+      # Returns a SequenceSet containing #seqno and all #children's seqno,
+      # recursively.
+      def to_sequence_set
+        SequenceSet.new all_seqnos
+      end
+
+      protected
+
+      def all_seqnos(node = self)
+        [node.seqno].concat node.children.flat_map { _1.all_seqnos }
+      end
+
     end
 
     # Net::IMAP::BodyStructure is included by all of the structs that can be
@@ -875,12 +768,12 @@ module Net
     # FetchData#attr value.  Although these classes don't share a base class,
     # this module can be used to pattern match all of them.
     #
-    # See {[IMAP4rev1] §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501.html#section-7.4.2]
-    # and {[IMAP4rev2] §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051.html#section-7.5.2-4.9]
+    # See {[IMAP4rev1] §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501#section-7.4.2]
+    # and {[IMAP4rev2] §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051#section-7.5.2-4.9]
     # for full description of all +BODYSTRUCTURE+ fields, and also
     # Net::IMAP@Message+envelope+and+body+structure for other relevant RFCs.
     #
-    # === Classes that include BodyStructure
+    # == Classes that include BodyStructure
     # BodyTypeBasic:: Represents any message parts that are not handled by
     #                 BodyTypeText, BodyTypeMessage, or BodyTypeMultipart.
     # BodyTypeText:: Used by <tt>text/*</tt> parts.  Contains all of the
@@ -891,13 +784,6 @@ module Net
     #                   should use BodyTypeBasic.
     # BodyTypeMultipart:: for <tt>multipart/*</tt> parts
     #
-    # ==== Deprecated BodyStructure classes
-    # The following classes represent invalid server responses or parser bugs:
-    # BodyTypeExtension:: parser bug: used for <tt>message/*</tt> where
-    #                     BodyTypeBasic should have been used.
-    # BodyTypeAttachment:: server bug: some servers sometimes return the
-    #                      "Content-Disposition: attachment" data where the
-    #                      entire body structure for a message part is expected.
     module BodyStructure
     end
 
@@ -905,8 +791,8 @@ module Net
     # message parts, unless they have a <tt>Content-Type</tt> that is handled by
     # BodyTypeText, BodyTypeMessage, or BodyTypeMultipart.
     #
-    # See {[IMAP4rev1] §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501.html#section-7.4.2]
-    # and {[IMAP4rev2] §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051.html#section-7.5.2-4.9]
+    # See {[IMAP4rev1] §7.4.2}[https://www.rfc-editor.org/rfc/rfc3501#section-7.4.2]
+    # and {[IMAP4rev2] §7.5.2}[https://www.rfc-editor.org/rfc/rfc9051#section-7.5.2-4.9]
     # for full description of all +BODYSTRUCTURE+ fields, and also
     # Net::IMAP@Message+envelope+and+body+structure for other relevant RFCs.
     #
@@ -914,6 +800,7 @@ module Net
                                      :param, :content_id,
                                      :description, :encoding, :size,
                                      :md5, :disposition, :language,
+                                     :location,
                                      :extension)
       include BodyStructure
 
@@ -922,45 +809,45 @@ module Net
       # :call-seq: media_type -> string
       #
       # The top-level media type as defined in
-      # [MIME-IMB[https://tools.ietf.org/html/rfc2045]].
+      # [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]].
 
       ##
       # method: subtype
       # :call-seq: subtype -> string
       #
       # The media subtype name as defined in
-      # [MIME-IMB[https://tools.ietf.org/html/rfc2045]].
+      # [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]].
 
       ##
       # method: param
       # :call-seq: param -> string
       #
       # Returns a hash that represents parameters as defined in
-      # [MIME-IMB[https://tools.ietf.org/html/rfc2045]].
+      # [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]].
 
       ##
       # method: content_id
       # :call-seq: content_id -> string
       #
       # Returns a string giving the content id as defined
-      # in [MIME-IMB[https://tools.ietf.org/html/rfc2045]]
-      # {§7}[https://tools.ietf.org/html/rfc2045#section-7].
+      # in [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]]
+      # {§7}[https://www.rfc-editor.org/rfc/rfc2045#section-7].
 
       ##
       # method: description
       # :call-seq: description -> string
       #
       # Returns a string giving the content description as defined
-      # in [MIME-IMB[https://tools.ietf.org/html/rfc2045]]
-      # {§8}[https://tools.ietf.org/html/rfc2045#section-8].
+      # in [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]]
+      # {§8}[https://www.rfc-editor.org/rfc/rfc2045#section-8].
 
       ##
       # method: encoding
       # :call-seq: encoding -> string
       #
       # Returns a string giving the content transfer encoding as defined
-      # in [MIME-IMB[https://tools.ietf.org/html/rfc2045]]
-      # {§6}[https://tools.ietf.org/html/rfc2045#section-6].
+      # in [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]]
+      # {§6}[https://www.rfc-editor.org/rfc/rfc2045#section-6].
 
       ##
       # method: size
@@ -973,7 +860,7 @@ module Net
       # :call-seq: md5 -> string
       #
       # Returns a string giving the body MD5 value as defined in
-      # [MD5[https://tools.ietf.org/html/rfc1864]].
+      # [MD5[https://www.rfc-editor.org/rfc/rfc1864]].
 
       ##
       # method: disposition
@@ -981,7 +868,7 @@ module Net
       #
       # Returns a ContentDisposition object giving the content
       # disposition, as defined by
-      # [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
+      # [DISPOSITION[https://www.rfc-editor.org/rfc/rfc2183]].
 
       ##
       # method: language
@@ -1026,7 +913,8 @@ module Net
       # for something else?
       #++
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
@@ -1049,6 +937,7 @@ module Net
                                     :description, :encoding, :size,
                                     :lines,
                                     :md5, :disposition, :language,
+                                    :location,
                                     :extension)
       include BodyStructure
 
@@ -1070,7 +959,8 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
@@ -1088,12 +978,12 @@ module Net
     # * description[rdoc-ref:BodyTypeBasic#description]
     # * encoding[rdoc-ref:BodyTypeBasic#encoding]
     # * size[rdoc-ref:BodyTypeBasic#size]
-    #
     class BodyTypeMessage < Struct.new(:media_type, :subtype,
                                        :param, :content_id,
                                        :description, :encoding, :size,
                                        :envelope, :body, :lines,
                                        :md5, :disposition, :language,
+                                       :location,
                                        :extension)
       include BodyStructure
 
@@ -1126,75 +1016,12 @@ module Net
       end
     end
 
-    # === WARNING
-    # BodyTypeAttachment represents a <tt>body-fld-dsp</tt> that is
-    # incorrectly in a position where the IMAP4rev1 grammar expects a nested
-    # +body+ structure.
-    #
-    # >>>
-    #   \IMAP body structures are parenthesized lists and assign their fields
-    #   positionally, so missing fields change the intepretation of all
-    #   following fields.  Buggy \IMAP servers sometimes leave fields missing
-    #   rather than empty, which inevitably confuses parsers.
-    #   BodyTypeAttachment was an attempt to parse a common type of buggy body
-    #   structure without crashing.
-    #
-    #   Currently, when Net::IMAP::ResponseParser sees "attachment" as the first
-    #   entry in a <tt>body-type-1part</tt>, which is where the MIME type should
-    #   be, it uses BodyTypeAttachment to capture the rest.  "attachment" is not
-    #   a valid MIME type, but _is_ a common <tt>Content-Disposition</tt>.  What
-    #   might have happened was that buggy server could not parse the message
-    #   (which might have been incorrectly formatted) and output a
-    #   <tt>body-type-dsp</tt> where a Net::IMAP::ResponseParser expected to see
-    #   a +body+.
-    #
-    # A future release will replace this, probably with a ContentDisposition
-    # nested inside another body structure object, maybe BodyTypeBasic, or
-    # perhaps a new body structure class that represents any unparsable body
-    # structure.
-    #
-    class BodyTypeAttachment < Struct.new(:dsp_type, :_unused_, :param)
-      include BodyStructure
-
-      # *invalid for BodyTypeAttachment*
-      def media_type
-        warn(<<~WARN, uplevel: 1)
-          BodyTypeAttachment#media_type is obsolete.  Use dsp_type instead.
-        WARN
-        dsp_type
-      end
-
-      # *invalid for BodyTypeAttachment*
-      def subtype
-        warn("BodyTypeAttachment#subtype is obsolete.\n", uplevel: 1)
-        nil
-      end
-
-      ##
-      # method: dsp_type
-      # :call-seq: dsp_type -> string
-      #
-      # Returns the content disposition type, as defined by
-      # [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
-
-      ##
-      # method: param
-      # :call-seq: param -> hash
-      #
-      # Returns a hash representing parameters of the Content-Disposition
-      # field, as defined by [DISPOSITION[https://tools.ietf.org/html/rfc2183]].
-
-      ##
-      def multipart?
-        return false
-      end
-    end
-
     # Net::IMAP::BodyTypeMultipart represents body structures of messages and
     # message parts, when <tt>Content-Type</tt> is <tt>multipart/*</tt>.
     class BodyTypeMultipart < Struct.new(:media_type, :subtype,
                                          :parts,
                                          :param, :disposition, :language,
+                                         :location,
                                          :extension)
       include BodyStructure
 
@@ -1209,7 +1036,7 @@ module Net
       # call-seq: subtype -> string
       #
       # Returns the content subtype name
-      # as defined in [MIME-IMB[https://tools.ietf.org/html/rfc2045]].
+      # as defined in [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]].
 
       ##
       # method: parts
@@ -1223,7 +1050,7 @@ module Net
       # call-seq: param -> hash
       #
       # Returns a hash that represents parameters
-      # as defined in [MIME-IMB[https://tools.ietf.org/html/rfc2045]].
+      # as defined in [MIME-IMB[https://www.rfc-editor.org/rfc/rfc2045]].
 
       ##
       # method: disposition
@@ -1260,28 +1087,11 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
+        warn("media_subtype is obsolete, use subtype instead.\n",
+             uplevel: 1, category: :deprecated)
         return subtype
       end
     end
 
-    # === WARNING:
-    # >>>
-    #   BodyTypeExtension is (incorrectly) used for <tt>message/*</tt> parts
-    #   (besides <tt>message/rfc822</tt>, which correctly uses BodyTypeMessage).
-    #
-    # A future release will replace this class with:
-    # * BodyTypeMessage for <tt>message/rfc822</tt> and <tt>message/global</tt>
-    # * BodyTypeBasic for any other <tt>message/*</tt>
-    class BodyTypeExtension < Struct.new(:media_type, :subtype,
-                                         :params, :content_id,
-                                         :description, :encoding, :size)
-      include BodyStructure
-
-      def multipart?
-        return false
-      end
-    end
-
   end
 end