sisimai 5.5.0 → 5.7.0

data/lib/sisimai/lhost/ezweb.rb

@@ -8,22 +8,12 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ["--------------------------------------------------", "Content-Type: message/rfc822"].freeze
       StartingOf = {message: ['The user(s) ', 'Your message ', 'Each of the following', '<']}.freeze
-      Messagesof = {
-        # notaccept: ['The following recipients did not receive this message:'],
-        'expired' => [
-          # Your message was not delivered within 0 days and 1 hours.
-          # Remote host is not responding.
-          'Your message was not delivered within ',
-        ],
-        'mailboxfull' => ['The user(s) account is temporarily over quota'],
-        'onhold'  => ['Each of the following recipients was rejected by a remote mail server'],
-        'suspend' => [
-          # http://www.naruhodo-au.kddi.com/qa3429203.html
-          # The recipient may be unpaid user...?
-          'The user(s) account is disabled.',
-          'The user(s) account is temporarily limited.',
-        ],
-      }.freeze
+      UnpaidUser = [
+        # http://www.naruhodo-au.kddi.com/qa3429203.html
+        # The recipient may be unpaid user...?
+        'The user(s) account is disabled.',
+        'The user(s) account is temporarily limited.',
+      ].freeze
 
       # @abstract Decodes the bounce message from au EZweb
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -48,7 +38,6 @@ module Sisimai::Lhost
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        substrings = []; Messagesof.each_value { |a| substrings << a }; substrings.flatten!
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -94,53 +83,27 @@ module Sisimai::Lhost
 
           else
             # Other error messages
+            #    >>> RCPT TO:<******@ezweb.ne.jp>
+            #    <<< 550 ...
             next if Sisimai::String.is_8bit(e)
-            if e.include?(" >>> ")
-              #    >>> RCPT TO:<******@ezweb.ne.jp>
-              v["command"]    = Sisimai::SMTP::Command.find(e)
-              v["diagnosis"] += " #{e}"
-
-            elsif e.include?(" <<< ")
-              #    <<< 550 ...
-              v["diagnosis"] += " #{e}"
-
-            else
-              # Check error message
-              isincluded = false
-              if substrings.any? { |a| e.include?(a) }
-                # Check with regular expressions of each error
-                v["diagnosis"] += " #{e}"
-                isincluded = true
-              end
-              v["diagnosis"] += " #{e}" if isincluded
-            end
+            v["command"]    = Sisimai::SMTP::Command.find(e) if e.include?(" >>> ")
+            v["diagnosis"] += " #{e}"
           end
         end
         return nil if recipients == 0
 
         dscontents.each do |e|
           # Check each value of DeliveryMatter{}, try to detect the bounce reason.
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = e['diagnosis'].split.join(" ")
           e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # Filtered recipient returns message that include 'X-SPASIGN' header
             e['reason'] = 'filtered'
-            e['toxic']  = true
           else
             # There is no X-SPASIGN header or the value of the header is not "NG"
-            catch :FINDREASON do
-              Messagesof.each_key do |r|
-                # Try to match with each session error message
-                Messagesof[r].each do |f|
-                  # Check each error message pattern
-                  next if e['diagnosis'].include?(f) == false
-                  e['reason'] = r
-                  throw :FINDREASON
-                end
-              end
-            end
+            e['reason'] = "suspend" if UnpaidUser.any? { |a| e['diagnosis'].include?(a) }
           end
           next if e['reason'] != ""
           next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')

data/lib/sisimai/lhost/fml.rb

@@ -22,21 +22,6 @@ module Sisimai::Lhost
         ],
         'securityerror' => ['Security Alert'],
       }.freeze
-      ErrorTable = {
-        'rejected' => [
-          ' header may cause mail loop',
-          'NOT MEMBER article from ',
-          'reject mail from ',
-          'reject spammers:',
-          'You are not a member of this mailing list',
-        ],
-        'notcompliantrfc' => ['Duplicated Message-ID'],
-        'securityerror' => ['Security alert:'],
-        'systemerror' => [
-          ' has detected a loop condition so that',
-          'Loop Back Warning:',
-        ],
-      }.freeze
 
       # @abstract Decodes the bounce message from fml mailling list server/manager
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -84,23 +69,13 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          ErrorTable.each_key do |f|
-            # Try to match with error messages defined in ErrorTable
-            next if ErrorTable[f].none? { |a| e['diagnosis'].include?(a) }
+          # Error messages in the message body did not matched
+          ErrorTitle.each_key do |f|
+            # Try to match with the Subject string
+            next if ErrorTitle[f].none? { |a| mhead["subject"].include?(a) }
             e['reason'] = f
             break
           end
-
-          if e['reason'].nil?
-            # Error messages in the message body did not matched
-            ErrorTitle.each_key do |f|
-              # Try to match with the Subject string
-              next if ErrorTitle[f].none? { |a| mhead["subject"].include?(a) }
-              e['reason'] = f
-              break
-            end
-          end
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/gmail.rb

@@ -11,17 +11,6 @@ module Sisimai::Lhost
         message: ['Delivery to the following recipient'],
         error:   ['The error that the other server returned was:'],
       }.freeze
-      MessagesOf = {
-        'expired' => [
-          'DNS Error: Could not contact DNS servers',
-          'Delivery to the following recipient has been delayed',
-          'The recipient server did not accept our requests to connect',
-        ],
-        'hostunknown' => [
-          'DNS Error: Domain name not found',
-          'DNS Error: DNS server returned answer with no data',
-        ],
-      }.freeze
       StateTable = {
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
@@ -205,8 +194,6 @@ module Sisimai::Lhost
         require 'sisimai/string'
         require 'sisimai/rfc1123'
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
             # Get the value of remote host
             # Google tried to deliver your message, but it was rejected by the server for the recipient
@@ -232,16 +219,6 @@ module Sisimai::Lhost
             e['command'] = StateTable[cu]['command']
             break
           end
-
-          if e['reason'].empty?
-            # There is no no state code in the error message
-            MessagesOf.each_key do |r|
-              # Verify each regular expression of session errors
-              next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-              e['reason'] = r
-              break
-            end
-          end
           next if e['reason'].empty?
 
           # Set pseudo status code

data/lib/sisimai/lhost/gmx.rb

@@ -8,7 +8,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['--- The header of the original message is following. ---'].freeze
       StartingOf = {message: ['This message was created automatically by mail delivery software']}.freeze
-      MessagesOf = {'expired' => ['delivery retry timeout exceeded']}.freeze
 
       # @abstract Decodes the bounce message from GMX
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -65,33 +64,17 @@ module Sisimai::Lhost
             end
             v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
-
-          elsif e.start_with?('SMTP error ')
-            # SMTP error from remote server after RCPT command:
-            v['command'] = Sisimai::SMTP::Command.find(e)
-
-          elsif e.start_with?('host:')
-            # host: mx.example.jp
-            v['rhost'] = e[6, e.size]
           else
-            # Get error messages
-            next if e.empty?
-            v['diagnosis'] += "#{e }"
+            # - SMTP error from remote server after RCPT command:
+            # - host: mx.example.jp
+            case
+              when e.start_with?('SMTP error ') then v['command'] = Sisimai::SMTP::Command.find(e)
+              when e.start_with?('host:')       then v['rhost'] = e[6, e.size]
+              else v['diagnosis'] += "#{e }" if e.empty? == false
+            end
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
-
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
-
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'GMX: https://www.gmx.net'; end

data/lib/sisimai/lhost/googlegroups.rb

@@ -13,10 +13,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.25.6
       def inquire(mhead, mbody)
-        return nil if mbody.include?("Google Groups") == false
+        return nil if mbody.include?("Google Group") == false
         return nil if mhead['from'].end_with?('<mailer-daemon@googlemail.com>') == false
         return nil if mhead['subject'].start_with?('Delivery Status Notification') == false
-        return nil if mhead['x-failed-recipients'].nil? || mhead['x-google-smtp-source'].nil?
+        return nil if mhead['x-failed-recipients'].nil?
 
         # Hello kijitora@libsisimai.org,
         #
@@ -46,7 +46,7 @@ module Sisimai::Lhost
         entiremesg = emailparts[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
         receivedby = mhead['received'] || []
         recordwide = {
-          'diagnosis' => Sisimai::String.sweep(entiremesg),
+          'diagnosis' => entiremesg,
           'reason'    => 'onhold',
           'rhost'     => Sisimai::RFC5322.received(receivedby[0])[1],
         }

data/lib/sisimai/lhost/googleworkspace.rb

@@ -15,8 +15,6 @@ module Sisimai::Lhost
       }.freeze
       MessagesOf = {
         "userunknown"  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
-        "notaccept"    => ["Null MX"],
-        "networkerror" => [" had no relevant answers.", " responded with code NXDOMAIN"],
       }.freeze
 
       # @abstract Decodes the bounce message from Google Workspace
@@ -73,8 +71,6 @@ module Sisimai::Lhost
 
         dscontents[0]["diagnosis"] = entiremesg
         dscontents.each do |e|
-          # Tidy up the error message in e["diagnosis"], Try to detect the bounce reason.
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           MessagesOf.each_key do |r|
             # Guess an reason of the bounce
             next if MessagesOf[r].none? { |a| e["diagnosis"].include?(a) }

data/lib/sisimai/lhost/imailserver.rb

@@ -9,12 +9,8 @@ module Sisimai::Lhost
       Boundaries = ['Original message follows.'].freeze
       StartingOf = {error: ['Body of message generated response:']}.freeze
       MessagesOf = {
-        'hostunknown'   => ['Unknown host'],
-        'userunknown'   => ['Unknown user', 'Invalid final delivery userid'],
-        'mailboxfull'   => ['User mailbox exceeds allowed size'],
-        'virusdetected' => ['Requested action not taken: virus detected'],
-        'spamdetected'  => ['Blacklisted URL in message'],
-        'expired'       => ['Delivery failed '],
+        'userunknown' => ['Unknown user', 'Invalid final delivery userid'],
+        'expired'     => ['Delivery failed '],
       }.freeze
 
       # @abstract Decodes the bounce message from Progress iMail Server
@@ -72,11 +68,9 @@ module Sisimai::Lhost
                              else
                                e['alterrors']
                              end
-            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['command'] = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors

data/lib/sisimai/lhost/kddi.rb

@@ -8,11 +8,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {message: ['Your mail sent on:', 'Your mail attempted to be delivered on:']}.freeze
-      MessagesOf = {
-        'mailboxfull' => ['As their mailbox is full'],
-        'norelaying'  => ['Due to the following SMTP relay error'],
-        'hostunknown' => ['As the remote domain doesnt exist'],
-      }.freeze
 
       # @abstract Decodes the bounce message from au by KDDI
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -45,7 +40,8 @@ module Sisimai::Lhost
           next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           v = dscontents[-1]
-          if e.include?(' Could not be delivered to: <')
+          case
+          when e.include?(' Could not be delivered to: <')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             #     Could not be delivered to: <******@**.***.**>
             #     As their mailbox is full.
@@ -59,7 +55,7 @@ module Sisimai::Lhost
             v['recipient'] = r
             recipients += 1
 
-          elsif e.include?('Your mail sent on: ')
+          when e.include?('Your mail sent on: ')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             v['date'] = e[19, e.size]
           else
@@ -71,7 +67,6 @@ module Sisimai::Lhost
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
@@ -79,18 +74,9 @@ module Sisimai::Lhost
             # Filtered recipient returns message that include 'X-SPASIGN' header
             e['reason'] = 'filtered'
           else
-            if e['command'] == 'RCPT'
-              # set "userunknown" when the remote server rejected after RCPT command.
-              e['reason'] = 'userunknown'
-            else
-              # SMTP command is not RCPT
-              MessagesOf.each_key do |r|
-                # Verify each regular expression of session errors
-                next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r
-                break
-              end
-            end
+            # There is no X-SPASIGN: header in the bounce message
+            # set "userunknown" when the remote server rejected after RCPT command.
+            e['reason'] = 'userunknown' if e['command'] == 'RCPT'
           end
         end
 

data/lib/sisimai/lhost/mailfoundry.rb

@@ -65,8 +65,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'MailFoundry'; end

data/lib/sisimai/lhost/mailmarshal.rb

@@ -103,15 +103,13 @@ module Sisimai::Lhost
                 p1 = e.index(' From:') || e.index(' Subject:')
                 p2 = e.index(':')
                 cf = e[p1 + 1, p2 - p1 - 1]
-                cv = Sisimai::String.sweep(e[p2 + 1, e.size])
+                cv = e[p2 + 1, e.size]
                 emailparts[1] += sprintf("%s: %s\n", cf, cv)
               end
             end
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Trustwave Secure Email Gateway'; end

data/lib/sisimai/lhost/messagingserver.rb

@@ -9,7 +9,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822', 'Return-path: '].freeze
       StartingOf = {message: ['This report relates to a message you sent with the following header fields:']}.freeze
-      MessagesOf = {'hostunknown' => ['Illegal host/domain name found']}.freeze
 
       # @abstract Decodes the bounce message from MessagingServer
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -115,18 +114,19 @@ module Sisimai::Lhost
             #  (6jo.example.jp ESMTP SENDMAIL-VM)
             # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
             #
-            if e.start_with?('Status: ')
+            case
+            when e.start_with?('Status: ')
               # Status: 5.1.1 (Remote SMTP server has rejected address)
               p1 = e.index(':')
               p2 = e.index('('); next if p2.nil?
               v['status']    = e[p1 + 2, p2 - p1 - 3]
               v['diagnosis'] = e[p2 + 1, e[e.index(')') - p2 - 1]] if v["diagnosis"].empty?
 
-            elsif e.start_with?('Arrival-Date: ')
+            when e.start_with?('Arrival-Date: ')
               # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
               v['date'] = e[e.index(':') + 2, e.size] if v["date"].empty?
 
-            elsif e.start_with?('Reporting-MTA: ')
+            when e.start_with?('Reporting-MTA: ')
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
               localhost = e[e.index(';') + 1, e.size]
               v['lhost'] = localhost if v["lhost"].empty?
@@ -135,17 +135,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
-
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Oracle Communications Messaging Server'; end

data/lib/sisimai/lhost/mfilter.rb

@@ -98,7 +98,6 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent'] = 'mFILTER'
 
           # Get localhost and remote host name from Received header.

data/lib/sisimai/lhost/mimecast.rb

@@ -93,7 +93,6 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/notes.rb

@@ -13,7 +13,6 @@ module Sisimai::Lhost
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
-        'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
       # @abstract Decodes the bounce messages from HCL Notes (Formerly IBM Notes (Formerly Lotus Notes))
@@ -101,7 +100,7 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = e['diagnosis'].split.join(" ")
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
           MessagesOf.each_key do |r|

data/lib/sisimai/lhost/opensmtpd.rb

@@ -35,36 +35,6 @@ module Sisimai::Lhost
         #   bounce.c/339:
         message: ['    This is the MAILER-DAEMON, please DO NOT REPLY to this '],
       }.freeze
-      MessagesOf = {
-        # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
-        'expired' => ['Envelope expired'],
-        # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
-        # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
-        'hostunknown' => [
-          'Invalid domain name',
-          'Domain does not exist',
-        ],
-        # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
-        'notaccept' => [
-          'Destination seem to reject all mails',
-          'No MX found for domain',
-          'No MX found for destination',
-        ],
-        #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
-        'networkerror' => [
-          'Address family mismatch on destination MXs',
-          'All routes to destination blocked',
-          'bad DNS lookup error code',
-          'Could not retrieve source address',
-          'Loop detected',
-          'Network error on destination MXs',
-          'No valid route to remote MX',
-          'No valid route to destination',
-          'Temporary failure in MX lookup',
-        ],
-        # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
-        'securityerror' => ['Could not retrieve credentials'],
-      }.freeze
 
       # @abstract Decodes the bounce message from OpenSMTPD
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -117,16 +87,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'OpenSMTPD'; end

data/lib/sisimai/lhost/postfix.rb

@@ -63,15 +63,14 @@ module Sisimai::Lhost
             v ||= dscontents[-1]
             p   = e['response']
 
-            if e['command'] == 'HELO' || e['command'] == 'EHLO'
-              # Use the argument of EHLO/HELO command as a value of "lhost"
-              v['lhost'] = e['argument']
-
-            elsif e['command'] == 'MAIL'
+            case e["command"]
+            # Use the argument of EHLO/HELO command as a value of "lhost"
+            when "HELO", "EHLO" then v['lhost'] = e['argument']
+            when "MAIL"
               # Set the argument of "MAIL" command to pseudo To: header of the original message
               emailparts[1] += sprintf("To: %s\n", e['argument']) if emailparts[1].size == 0
 
-            elsif e['command'] == 'RCPT'
+            when "RCPT"
               # RCPT TO: <...>
               if v["recipient"] != ""
                 # There are multiple recipient addresses in the transcript of session
@@ -110,7 +109,8 @@ module Sisimai::Lhost
               next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if o[3] == 'addr'
+              case o[3]
+              when "addr"
                 # Final-Recipient: rfc822; kijitora@example.jp
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 if Sisimai::Address.is_emailaddress(o[2])
@@ -130,7 +130,7 @@ module Sisimai::Lhost
                     v['alias'] = o[2]
                   end
                 end
-              elsif o[3] == 'code'
+              when "code"
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = o[1]
                 v['spec'] = 'SMTP' if v['spec'].upcase == 'X-POSTFIX'
@@ -154,7 +154,7 @@ module Sisimai::Lhost
               # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
               if readslices[-2].start_with?('Diagnostic-Code:') && e.include?(' ')
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
+                v['diagnosis'] += " " + e.split.join(" ")
                 readslices[-1]  = "Diagnostic-Code: #{e}"
 
               elsif Sisimai::String.aligned(e, ['X-Postfix-Sender:', 'rfc822;', '@'])
@@ -238,7 +238,7 @@ module Sisimai::Lhost
 
           if anotherset['diagnosis']
             # Copy alternative error message
-            anotherset['diagnosis'] = Sisimai::String.sweep(anotherset['diagnosis'])
+            anotherset['diagnosis'] = anotherset['diagnosis'].split.join(" ")
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].nil? || e['diagnosis'].empty?
 
             if e['diagnosis'] =~ /\A\d+\z/
@@ -277,7 +277,6 @@ module Sisimai::Lhost
             end
           end
 
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
           e['command']   = 'HELO' if e["command"].empty? && e['diagnosis'].include?('refused to talk to me:')
           e['spec']      = 'SMTP' if e["spec"].empty?    && Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])