sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/barracuda.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Barracuda parses a bounce email which created by Barracuda.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Barracuda parses a bounce email which created by Barracuda. Methods in the module
+  # are called from only Sisimai::Message.
   module Barracuda
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Barracuda.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      Boundaries = ['Content-Type: text/rfc822-headers'].freeze
       StartingOf = { message: ['Your message to:'] }.freeze
 
       # Parse bounce messages from Barracuda
@@ -16,24 +15,23 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       # @since v4.25.6
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # Subject: **Message you sent blocked by our bulk email filter**
         return nil unless mhead['subject'].to_s.end_with?('our bulk email filter**')
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -72,7 +70,7 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           end
@@ -85,7 +83,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Barracuda: https://www.barracuda.com'; end
     end

data/lib/sisimai/lhost/bigfoot.rb

@@ -1,49 +1,49 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Bigfoot parses a bounce email which created by Bigfoot.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Bigfoot parses a bounce email which created by Bigfoot. Methods in the module
+  # are called from only Sisimai::Message.
   module Bigfoot
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Bigfoot.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/partial|.freeze
-      MarkingsOf = { message: %r/\A[ \t]+[-]+[ \t]*Transcript of session follows/ }.freeze
+      Boundaries = ['Content-Type: message/partial'].freeze
+      MarkingsOf = { message: '   ----- Transcript of session follows -----' }.freeze
 
       # Parse bounce messages from Bigfoot
       # @param  [Hash] mhead    Message headers of a bounce email
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # :subject  => %r/\AReturned mail: /,
         match  = 0
         match += 1 if mhead['from'].include?('@bigfoot.com>')
         match += 1 if mhead['received'].any? { |a| a.include?('.bigfoot.com') }
         return nil unless match > 0
 
+        require 'sisimai/smtp/command'
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
+        thecommand = ''     # (String) SMTP Command name begin with the string '>>>'
         esmtpreply = ''     # (String) Reply from remote server on SMTP session
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(MarkingsOf[:message])
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -79,7 +79,7 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -88,18 +88,18 @@ module Sisimai::Lhost
               #    ----- Transcript of session follows -----
               # >>> RCPT TO:<destinaion@example.net>
               # <<< 553 Invalid recipient destinaion@example.net (Mode: normal)
-              if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
+              if e.start_with?('>>> ')
                 # >>> DATA
-                commandtxt = cv[1]
-              elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+                thecommand = Sisimai::SMTP::Command.find(e)
+              elsif e.start_with?('<<< ')
                 # <<< Response
-                esmtpreply = cv[1]
+                esmtpreply = e[4, e.size - 4]
               end
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e[1, e.size])
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -111,13 +111,13 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['command']   = commandtxt
+          e['command']   = thecommand || ''
           if e['command'].empty?
             e['command'] = 'EHLO' unless esmtpreply.empty?
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Bigfoot: http://www.bigfoot.com'; end
     end

data/lib/sisimai/lhost/biglobe.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Biglobe parses a bounce email which created by BIGLOBE.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Biglobe parses a bounce email which created by BIGLOBE. Methods in the module
+  # are called from only Sisimai::Message.
   module Biglobe
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Biglobe.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {
         message: ['   ----- The following addresses had delivery problems -----'],
         error:   ['   ----- Non-delivered information -----'],
@@ -22,20 +21,21 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
-        return nil unless mhead['from'] =~ /postmaster[@](?:biglobe|inacatv|tmtv|ttv)[.]ne[.]jp/
+      def inquire(mhead, mbody)
+        return nil unless mhead['from'].include?('postmaster@')
+        return nil unless %w[biglobe inacatv tmtv ttv].any? { |a| mhead['from'].include?('@' + a + '.ne.jp') }
         return nil unless mhead['subject'].start_with?('Returned mail:')
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
@@ -60,7 +60,7 @@ module Sisimai::Lhost
           #
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
+          if e.include?('@') && e.include?(' ') == false
             #    ----- The following addresses had delivery problems -----
             # ********@***.biglobe.ne.jp
             if v['recipient']
@@ -69,12 +69,11 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
 
-            r = Sisimai::Address.s3s4(cv[1])
-            next unless Sisimai::RFC5322.is_emailaddress(r)
-            v['recipient'] = r
+            next unless Sisimai::Address.is_emailaddress(e)
+            v['recipient'] = e
             recipients += 1
           else
-            next if e =~ /\A[^\w]/
+            next if e.include?('--')
             v['diagnosis'] ||= ''
             v['diagnosis'] << e + ' '
           end
@@ -92,7 +91,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'BIGLOBE: https://www.biglobe.ne.jp'; end
     end

data/lib/sisimai/lhost/courier.rb

@@ -1,14 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Courier parses a bounce email which created by Courier
-  # MTA. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Courier parses a bounce email which created by Courier MTA. Methods in the module
+  # are called from only Sisimai::Message.
   module Courier
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Courier.pm
       require 'sisimai/lhost'
 
       # https://www.courier-mta.org/courierdsn.html
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
       StartingOf = {
         # courier/module.dsn/dsn*.txt
         message: ['DELAYS IN DELIVERING YOUR MESSAGE', 'UNDELIVERABLE MAIL'],
@@ -29,32 +28,34 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         match  = 0
         match += 1 if mhead['from'].include?('Courier mail server at ')
-        match += 1 if mhead['subject'] =~ /(?:NOTICE: mail delivery status[.]|WARNING: delayed mail[.])/
+        match += 1 if mhead['subject'].include?('NOTICE: mail delivery status.')
+        match += 1 if mhead['subject'].include?('WARNING: delayed mail.')
         if mhead['message-id']
           # Message-ID: <courier.4D025E3A.00001792@5jo.example.org>
-          match += 1 if mhead['message-id'] =~ /\A[<]courier[.][0-9A-F]+[.]/
+          match += 1 if mhead['message-id'].start_with?('<courier.')
         end
         return nil unless match > 0
 
+        require 'sisimai/smtp/command'
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
+        thecommand = ''     # (String) SMTP Command name begin with the string '>>>'
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -97,12 +98,12 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
             # The line does not begin with a DSN field defined in RFC3464
-            if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
+            if e.start_with?('>>> ')
               # Your message to the following recipients cannot be delivered:
               #
               # <kijitora@example.co.jp>:
@@ -110,13 +111,12 @@ module Sisimai::Lhost
               # >>> RCPT TO:<kijitora@example.co.jp>
               # <<< 550 5.1.1 <kijitora@example.co.jp>... User Unknown
               #
-              next unless commandtxt.empty?
-              commandtxt = cv[1]
+              thecommand = Sisimai::SMTP::Command.find(e)
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -126,7 +126,7 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e['command'] ||= commandtxt || ''
+          e['command'] ||= thecommand || ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           MessagesOf.each_key do |r|
@@ -137,7 +137,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Courier MTA'; end
     end

data/lib/sisimai/lhost/domino.rb

@@ -1,19 +1,19 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Domino parses a bounce email which created by IBM
-  # Domino Server. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Domino parses a bounce email which created by IBM Domino Server. Methods in the
+  # module are called from only Sisimai::Message.
   module Domino
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Domino.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
           'not listed in public Name & Address Book',
-          "dans l'annuaire Domino", # TODO: "non répertorié dans l'annuaire Domino",
+          "non répertorié dans l'annuaire Domino",
+          'no se encuentra en el Directorio de Domino',
           'Domino ディレクトリには見つかりません',
         ],
         'filtered' => ['Cannot route mail to user'],
@@ -25,7 +25,7 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
 
         require 'sisimai/rfc1894'
@@ -33,16 +33,16 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         subjecttxt = ''     # (String) The value of Subject:
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           next if e.empty?
 
           if readcursor == 0
@@ -76,10 +76,10 @@ module Sisimai::Lhost
             v['recipient'] ||= e
             recipients += 1
 
-          elsif cv = e.match(/\A[ ][ ]([^ ]+[@][^ ]+)\z/)
+          elsif e.start_with?('  ') && e.include?('@') && e.index(' ', 3).nil?
             # Continued from the line "was not delivered to:"
             #   kijitora@example.net
-            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = Sisimai::Address.s3s4(e[2, e.size])
 
           elsif e.start_with?('because:')
             # because:
@@ -89,9 +89,9 @@ module Sisimai::Lhost
               # Error message, continued from the line "because:"
               v['diagnosis'] = e
 
-            elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
+            elsif e.start_with?('  Subject: ')
               #   Subject: Nyaa
-              subjecttxt = cv[1]
+              subjecttxt = e[11, e.size]
 
             elsif f = Sisimai::RFC1894.match(e)
               # There are some fields defined in RFC3464, try to match 
@@ -107,9 +107,14 @@ module Sisimai::Lhost
                 next unless fieldtable[o[0]]
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f == 1
+                next unless f
                 permessage[fieldtable[o[0]]] = o[2]
               end
+            else
+              if v['diagnosis'] && e.start_with?("\s", "\t")
+                # The line is a continued line of "Diagnostic-Code:" field
+                v['diagnosis'] += e.sub(/\A[\s\t]+/, '')
+              end
             end
           end
         end
@@ -130,11 +135,10 @@ module Sisimai::Lhost
           end
         end
 
-        # Set the value of subjecttxt as a Subject if there is no original
-        # message in the bounce mail.
-        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
+        # Set the value of subjecttxt as a Subject if there is no original message in the bounce mail.
+        emailparts[1] << ('Subject: ' << subjecttxt << "\n") unless emailparts[1].include?("\nSubject:")
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'IBM Domino Server'; end
     end

data/lib/sisimai/lhost/einsundeins.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::EinsUndEins parses a bounce email which created by
-  # 1&1. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::EinsUndEins parses a bounce email which created by 1&1. Methods in the module are
+  # called from only Sisimai::Message.
   module EinsUndEins
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/EinsUndEins.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
+      Boundaries = ['--- The header of the original message is following. ---'].freeze
       StartingOf = {
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
@@ -19,20 +18,20 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['from'].start_with?('"Mail Delivery System"')
         return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
@@ -60,7 +59,7 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
 
           elsif e.start_with?(StartingOf[:error][0])
@@ -81,21 +80,26 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         dscontents.each do |e|
           e['diagnosis'] ||= ''
           e['diagnosis']   = e['alterrors'] if e['diagnosis'].empty?
+          e['command']     = Sisimai::SMTP::Command.find(e['diagnosis'])
 
-          if cv = e['diagnosis'].match(/host:[ ]+(.+?)[ ]+.+[ ]+reason:.+/)
+          if Sisimai::String.aligned(e['diagnosis'], ['host: ', ' reason:'])
             # SMTP error from remote server for TEXT command,
             #   host: smtp-in.orange.fr (193.252.22.65)
             #   reason: 550 5.2.0 Mail rejete. Mail rejected. ofr_506 [506]
-            e['rhost']   = cv[1]
-            e['command'] = 'DATA' if e['diagnosis'] =~ /for TEXT command/
-            e['spec']    = 'SMTP' if e['diagnosis'] =~ /SMTP error/
+            p1 = e['diagnosis'].index('host: ')
+            p2 = e['diagnosis'].index(' reason:')
+
+            e['rhost']   = Sisimai::String.sweep(e['diagnosis'][p1 + 6, p2 - p1 - 6])
+            e['command'] = 'DATA' if e['diagnosis'].include?('for TEXT command')
+            e['spec']    = 'SMTP' if e['diagnosis'].include?('SMTP error')
             e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
           else
             # For the following reason:
-            e['diagnosis'].gsub(/\A#{StartingOf[:error][0]}/, '')
+            e['diagnosis'][0, StartingOf[:error][0].size] = ''
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
@@ -107,7 +111,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return '1&1: https://www.1und1.de'; end
     end