sisimai 4.25.5-java → 4.25.11-java

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -15,21 +15,11 @@ module Sisimai::Lhost
         rcpts:   ['The following recipients were affected:'],
       }.freeze
 
-      def description; return 'Trustwave Secure Email Gateway'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return ['X-Mailer']; end
-
       # Parse bounce messages from MailMarshalSMTP
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         return nil unless mhead['subject'].start_with?('Undeliverable Mail: "')
 
@@ -42,10 +32,10 @@ module Sisimai::Lhost
         regularexp = nil
         v = nil
 
-        boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
+        boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
         regularexp = if boundary00.size > 0
                        # Convert to regular expression
-                       Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
+                       Regexp.new('\A' << Regexp.escape(boundary00) << '\z')
                      else
                        regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
                      end
@@ -127,15 +117,10 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Trustwave Secure Email Gateway'; end
     end
   end
 end

data/lib/sisimai/lhost/mailru.rb

@@ -45,21 +45,11 @@ module Sisimai::Lhost
         'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
-      def description; return '@mail.ru: https://mail.ru'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from @mail.ru
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         return nil unless mhead['from'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
         return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
@@ -216,12 +206,11 @@ module Sisimai::Lhost
             end
           end
           e['command'] ||= ''
-          e['agent']     = self.smtpagent
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '@mail.ru: https://mail.ru'; end
     end
   end
 end

data/lib/sisimai/lhost/mcafee.rb

@@ -19,22 +19,13 @@ module Sisimai::Lhost
         }x,
       }.freeze
 
-      def description; return 'McAfee Email Appliance'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-nai-header]; end
-
       # Parse bounce messages from McAfee Email Appliance
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
+        # X-NAI-Header: Modified by McAfee Email and Web Security Virtual Appliance
         return nil unless mhead['x-nai-header']
         return nil unless mhead['x-nai-header'].start_with?('Modified by McAfee ')
         return nil unless mhead['subject'] == 'Delivery Status'
@@ -110,21 +101,18 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-
           ReFailures.each_key do |r|
             # Verify each regular expression of session errors
             next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'McAfee Email Appliance'; end
     end
   end
 end

data/lib/sisimai/lhost/messagelabs.rb

@@ -15,28 +15,17 @@ module Sisimai::Lhost
         'securityerror' => %r/Please turn on SMTP Authentication in your mail client/,
       }.freeze
 
-      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
-      # X-Originating-IP: [10.245.230.38]
-      # X-StarScan-Received:
-      # X-StarScan-Version: 6.12.5; banners=-,-,-
-      # X-VirusChecked: Checked
-      def headerlist;  return %w[x-msg-ref]; end
-
       # Parse bounce messages from Symantec.cloud(MessageLabs)
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
+        # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
+        # X-Originating-IP: [10.245.230.38]
+        # X-StarScan-Received:
+        # X-StarScan-Version: 6.12.5; banners=-,-,-
+        # X-VirusChecked: Checked
         return nil unless mhead['x-msg-ref']
         return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
         return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
@@ -115,7 +104,6 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['command']   = commandset.shift || ''
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           ReFailures.each_key do |r|
@@ -128,7 +116,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
     end
   end
 end

data/lib/sisimai/lhost/messagingserver.rb

@@ -12,21 +12,11 @@ module Sisimai::Lhost
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
-      def description; return 'Oracle Communications Messaging Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MessagingServer
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         # :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
         match  = 0
@@ -144,21 +134,18 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Oracle Communications Messaging Server'; end
     end
   end
 end

data/lib/sisimai/lhost/mfilter.rb

@@ -15,23 +15,13 @@ module Sisimai::Lhost
       }.freeze
       MarkingsOf = { message: %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/ }.freeze
 
-      def description; return 'Digital Arts m-FILTER'; end
-      def smtpagent;   return 'Email::mFILTER'; end
-      def headerlist;  return %w[x-mailer]; end
-
       # Parse bounce messages from Digital Arts m-FILTER
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
-        # :'from'     => %r/\AMailer Daemon [<]MAILER-DAEMON[@]/,
+        # X-Mailer: m-FILTER
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
         return nil unless mhead['subject'] == 'failure notice'
 
@@ -106,9 +96,8 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e.each_key { |a| e[a] ||= '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
+          e['agent'] = 'mFILTER'
 
           # Get localhost and remote host name from Received header.
           next if mhead['received'].empty?
@@ -122,10 +111,9 @@ module Sisimai::Lhost
             e['rhost'] = ee
           end
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Digital Arts m-FILTER'; end
     end
   end
 end

data/lib/sisimai/lhost/mxlogic.rb

@@ -69,26 +69,15 @@ module Sisimai::Lhost
         'was frozen on arrival by ',
       ].freeze
 
-      def description; return 'McAfee SaaS'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      # X-MX-Bounce: mta/src/queue/bounce
-      # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
-      # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
-      def headerlist;  return %w[x-mxl-notehash x-mxl-hash x-mx-bounce]; end
-
       # Parse bounce messages from MXLogic
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
-        # :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
+        # X-MX-Bounce: mta/src/queue/bounce
+        # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
+        # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
         match  = 0
         match += 1 if mhead['x-mx-bounce']
         match += 1 if mhead['x-mxl-hash']
@@ -96,7 +85,7 @@ module Sisimai::Lhost
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
         match += 1 if mhead['subject'] =~ %r{(?:
              Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-            |Warning:[ ]message[ ].+[ ]delayed[ ]+
+            |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
             |Delivery[ ]Status[ ]Notification
             )
         }x
@@ -160,7 +149,6 @@ module Sisimai::Lhost
         end
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
           e['lhost'] = localhost0
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/[-]{2}.*\z/, ''))
 
@@ -208,12 +196,11 @@ module Sisimai::Lhost
               end
             end
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'McAfee SaaS'; end
     end
   end
 end

data/lib/sisimai/lhost/notes.rb

@@ -1,5 +1,5 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::::Email::Notes parses a bounce email which created by Lotus
+  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus
   # Notes Server. Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
@@ -14,24 +14,14 @@ module Sisimai::Lhost
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
-        networkerror: ['Message has exceeded maximum hop count'],
+        'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
-      def description; return 'Lotus Notes'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Lotus Notes
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         return nil unless mhead['subject'].start_with?('Undeliverable message')
 
@@ -115,7 +105,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
@@ -126,12 +115,11 @@ module Sisimai::Lhost
             e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Lotus Notes'; end
     end
   end
 end

data/lib/sisimai/lhost/office365.rb

@@ -14,8 +14,11 @@ module Sisimai::Lhost
         eoerr:  ['Original message headers:'],
       }.freeze
       MarkingsOf = {
+        eoe:     %r/\A(?:Original[ ][Mm]essage[ ][Hh]eaders:?|Message[ ]Hops)/,
+        error:   %r/\A(?:Diagnostic[ ]information[ ]for[ ]administrators:|Error[ ]Details)/,
         message: %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
+          |Original[ ]Message[ ]Details
           |.+[ ]rejected[ ]your[ ]message[ ]to[ ]the[ ]following[ ]e[-]?mail[ ]addresses:
           )
         }x,
@@ -37,6 +40,8 @@ module Sisimai::Lhost
         %r/\A4[.]7[.]26\z/       => 'securityerror',
         %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
         %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
+        %r/\A5[.]0[.]350\z/      => 'contenterror',
+        %r/\A5[.]1[.]10\z/       => 'userunknown',
         %r/\A5[.]4[.]1\z/        => 'norelaying',
         %r/\A5[.]4[.]312\z/      => 'networkerror',
         %r/\A5[.]4[.]316\z/      => 'expired',
@@ -46,6 +51,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]1[23]\z/    => 'rejected',
         %r/\A5[.]7[.]124\z/      => 'rejected',
         %r/\A5[.]7[.]13[3-6]\z/  => 'rejected',
+        %r/\A5[.]7[.]23\z/       => 'blocked',
         %r/\A5[.]7[.]25\z/       => 'networkerror',
         %r/\A5[.]7[.]50[1-3]\z/  => 'spamdetected',
         %r/\A5[.]7[.]50[4-5]\z/  => 'filtered',
@@ -55,6 +61,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]510\z/      => 'notaccept',
         %r/\A5[.]7[.]511\z/      => 'rejected',
         %r/\A5[.]7[.]512\z/      => 'securityerror',
+        %r/\A5[.]7[.]57\z/       => 'securityerror',
         %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
@@ -63,9 +70,12 @@ module Sisimai::Lhost
         RCPT: %r/unknown recipient or mailbox unavailable ->.+[<]?.+[@].+[.][a-zA-Z]+[>]?/,
       }.freeze
 
-      def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist
+      # Parse bounce messages from Microsoft Office 365
+      # @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)
         # X-MS-Exchange-Message-Is-Ndr:
         # X-Microsoft-Antispam-PRVS: <....@...outlook.com>
         # X-Exchange-Antispam-Report-Test: UriScan:;
@@ -73,30 +83,6 @@ module Sisimai::Lhost
         # X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2015 23:34:45.6789 (JST)
         # X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
         # X-MS-Exchange-Transport-CrossTenantHeadersStamped: ...
-        return %w[
-          content-language
-          x-ms-exchange-message-is-ndr
-          x-microsoft-antispam-prvs
-          x-exchange-antispam-report-test
-          x-exchange-antispam-report-cfa-test
-          x-ms-exchange-crosstenant-originalarrivaltime
-          x-ms-exchange-crosstenant-fromentityheader
-          x-ms-exchange-transport-crosstenantheadersstamped
-        ]
-      end
-
-      # Parse bounce messages from Microsoft Office 365
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
-      def make(mhead, mbody)
         tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
         match += 1 if mhead['subject'].include?('Undeliverable:')
@@ -115,7 +101,6 @@ module Sisimai::Lhost
         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")
@@ -141,9 +126,16 @@ module Sisimai::Lhost
           # The email address wasn't found at the destination domain. It might
           # be misspelled or it might not exist any longer. Try retyping the
           # address and resending the message.
+          #
+          # Original Message Details
+          # Created Date:   4/29/2017 6:40:30 AM
+          # Sender Address: neko@example.jp
+          # Recipient Address:      kijitora@example.org
+          # Subject:        Nyaan#
           v = dscontents[-1]
 
-          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
+          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/) ||
+                  e.match(/\ARecipient[ ]Address:[ ]+(.+)\z/)
             # kijitora@example.com<mailto:kijitora@example.com>
             if v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -168,7 +160,7 @@ module Sisimai::Lhost
               next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             else
-              if e == StartingOf[:error][0]
+              if e =~ MarkingsOf[:error]
                 # Diagnostic information for administrators:
                 v['diagnosis'] = e
               else
@@ -176,7 +168,7 @@ module Sisimai::Lhost
                 # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
                 # t not found by SMTP address lookup'
                 next unless v['diagnosis']
-                if e == StartingOf[:eoerr][0]
+                if e =~ MarkingsOf[:eoe]
                   # Original message headers:
                   endoferror = true
                   next
@@ -192,13 +184,11 @@ module Sisimai::Lhost
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['status']  ||= ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
           if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || e['status']
           end
 
           ReCommands.each_key do |p|
@@ -219,7 +209,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
     end
   end
 end