sisimai 4.25.6 → 4.25.11

data/lib/sisimai/rhost/googleapps.rb

@@ -92,7 +92,10 @@ module Sisimai
                 'Messages with multiple addresses in From: header are not accepted.',
                 'The user or domain that you are sending to (or from) has a policy',
             ]},
-            { reason: 'rejected', string: ['Unauthenticated email is not accepted from this domain.'] },
+            { reason: 'rejected', string: [
+                'This message does not have authentication information or fails to pass authentication checks',
+                'Unauthenticated email is not accepted from this domain.',
+            ]},
           ],
           'X.7.4' => [{ reason: 'syntaxerror', string: ['Unrecognized Authentication Type.'] }],
         }.freeze

data/lib/sisimai/rhost/spectrum.rb

@@ -0,0 +1,73 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Data
+    # object as an argument of get() method when the value of "destination" of
+    # the object is "charter.net". This class is called only Sisimai::Data class.
+    module Spectrum
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/Spectrum.pm
+        ErrorCodes = {
+          # https://www.spectrumbusiness.net/support/internet/understanding-email-error-codes
+          #   Error codes are placed in one of two categories: incoming or outgoing.
+          #   1. If you’re trying to send an email to a Charter email address from
+          #      a non-Charter email address (such as Gmail, Yahoo, Hotmail, etc.),
+          #      you may receive an error that begins with AUP#I, followed by four numbers.
+          #
+          #   2. If you are trying to send an email from a Charter email address
+          #      to an outgoing recipient, you may get an error code beginning with
+          #      AUP#O, also followed by four numbers.
+          #
+          1000 => 'blocked',         # Your IP address has been blocked due to suspicious activity. 
+          1010 => 'rejected',        # This email account has been blocked from sending emails due to suspicious activity.
+          1090 => 'systemerror',     # The email you're trying to send can't be processed. Try sending again at a later time.
+          1260 => 'networkerror',    # Spectrum doesn't process IPV6 addresses. Connect with an IPv4 address and try again.
+          1500 => 'rejected',        # Your email was rejected for attempting to send as a different email address than you signed in under.
+          1520 => 'rejected',        # Your email was rejected for attempting to send as a different email address than a domain that we host.
+          1530 => 'mesgtoobig',      # Your email was rejected because it's larger than the maximum size of 20MB.
+          1540 => 'toomanyconn',     # Your emails were deferred for attempting to send too many in a single session.
+          1550 => 'toomanyconn',     # Your email was rejected for having too many recipients in one message.
+          1560 => 'policyviolation', # Your email was rejected for having too many invalid recipients.
+        }.freeze
+        CodeRanges = [
+          [1020, 1080, 'rejected'],        # This email account has limited access to send emails based on suspicious activity.
+          [1100, 1150, 'blocked'],         # The IP address you're trying to connect from has an issue with the Domain Name System.
+          [1160, 1190, 'policyviolation'], # The email you tried to send goes against your domain's security policies.
+          [1200, 1210, 'blocked'],         # The IP address you're trying to send from has been flagged by Cloudmark CSI as potential spam.
+          [1220, 1250, 'blokced'],         # Your IP address has been blacklisted by Spamhaus.
+          [1300, 1340, 'toomanyconn'],     # Spectrum limits the number of concurrent connections from a sender
+          [1350, 1490, 'toomanyconn'],     # Spectrum limits emails by the number of messages sent, amount of recipients,...
+        ].freeze
+
+        # Detect bounce reason from https://www.spectrum.com/
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String, Nil]           The bounce reason at Spectrum
+        # @since v4.25.8
+        def get(argvs)
+          statusmesg = argvs.diagnosticcode
+          codenumber = 0
+
+          if cv = statusmesg.match(/AUP#[-A-Za-z]*(\d{4})/)
+            # Capture the numeric part of the error code
+            codenumber = cv[1].to_i
+          end
+          reasontext = ErrorCodes[codenumber] || ''
+
+          if reasontext.empty?
+            # The error code was not found in ErrorCodes
+            CodeRanges.each do |e|
+              # Check the code range
+              next if codenumber < e[0]
+              next if codenumber > e[1]
+              reasontext = e[2]
+              break
+            end
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/smtp/error.rb

@@ -24,27 +24,28 @@ module Sisimai
         #                           nil:   is not an error
         # @since v4.17.3
         def is_permanent(argv1 = '')
-          getchecked = nil
+          return nil unless argv1
+          permanent1 = nil
           statuscode = Sisimai::SMTP::Status.find(argv1) || Sisimai::SMTP::Reply.find(argv1) || '0'
 
           if (classvalue = statuscode[0, 1].to_i) > 0
             # 2, 4, or 5
             if classvalue == 5
               # Permanent error
-              getchecked = true
+              permanent1 = true
 
             elsif classvalue == 4
               # Temporary error
-              getchecked = false
+              permanent1 = false
 
             elsif classvalue == 2
               # Succeeded
-              getchecked = nil
+              permanent1 = nil
             end
           else
             # Check with regular expression
             v = argv1.downcase
-            getchecked = if v.include?('temporar') || v.include?('persistent')
+            permanent1 = if v.include?('temporar') || v.include?('persistent')
                            # Temporary failure
                            false
                          elsif v.include?('permanent')
@@ -53,7 +54,7 @@ module Sisimai
                          end
           end
 
-          return getchecked
+          return permanent1
         end
 
         # Check softbounce or not
@@ -64,6 +65,7 @@ module Sisimai
         #                           '':     May not be bounce ?
         # @since v4.17.3
         def soft_or_hard(argv1 = '', argv2 = '')
+          return nil unless argv1
           return nil if argv1.empty?
           value = nil
 

data/lib/sisimai/smtp/reply.rb

@@ -82,7 +82,7 @@ module Sisimai
           # reply code.
           argv1 = argv1.gsub(/#{IP4Re}/, '***.***.***.***') if argv1 =~ IP4Re
 
-          if cv = argv1.match(/\b([45][0-5][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
+          if cv = argv1.match(/\b([45][0-7][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
             # 550, 447, or 250
             return cv[1]
           else

data/lib/sisimai/smtp/status.rb

@@ -651,7 +651,7 @@ module Sisimai
           '5.7.24' => 'securityerror',  # SPF validation error
           '5.7.25' => 'blocked',        # Reverse DNS validation failed
           '5.7.26' => 'securityerror',  # Multiple authentication checks failed
-          '5.7.27' => 'rejected',       # Sender address has null MX
+          '5.7.27' => 'notaccept',      # MX resource record of a destination host is Null MX: RFC7505
         }.freeze
 
         InternalCode = {

data/lib/sisimai/time.rb

@@ -1,8 +1,7 @@
 require 'date'
-
 module Sisimai
   # Sisimai::Time is a child class of Date for Sisimai::Data.
-  class Time < DateTime
+  class Time < ::DateTime
     # Imported from p5-Sisimail/lib/Sisimai/Time.pm
     def to_json(*)
       return self.to_time.to_i

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.25.6'.freeze
+  VERSION = '4.25.11'.freeze
 end

data/set-of-emails/README.md

@@ -1,7 +1,7 @@
 About "set-of-emails" repository
 ================================================================================
 This repository hold bounce mail collections for developing Sisimai. Email files
-in this repository are read from `make test` at p5-Sisimai and rb-Sisimai.
+in this repository are read from `make test` at p5-sisimai and rb-sisimai.
 
 
 | Directory                     | Description                                  |
@@ -24,16 +24,17 @@ See Also
 ================================================================================
 * __Sisimai Project__ | [github.com/sisimai](https://github.com/sisimai)
 * __libsisimai.org__ | [Sisimai — A successor to bounceHammer, Library to parse error mails](https://libsisimai.org/)
-* __Perl Verson__ | [Perl version of Sisimai(Stable)](https://github.com/sisimai/p5-Sisimai)
-* __Ruby verson__ | [Ruby version of Sisimai(Under the development)](https://github.com/sisimai/rb-Sisimai)
+* __Perl Verson__ | [Perl version of Sisimai(Stable)](https://github.com/sisimai/p5-sisimai)
+* __Ruby verson__ | [Ruby version of Sisimai(Under the development)](https://github.com/sisimai/rb-sisimai)
 
 Author
 ===============================================================================
+[@libsisimai](https://twitter.com/libsisimai)
 [@azumakuniyuki](https://twitter.com/azumakuniyuki)
 
 Copyright
 ===============================================================================
-Copyright (C) 2018-2019 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2018-2020 azumakuniyuki, All Rights Reserved.
 
 License
 ===============================================================================

data/set-of-emails/maildir/bsd/arf-25.eml

@@ -0,0 +1,61 @@
+Return-path: <xxx+bnxxx@example.com>
+Envelope-to: report@xxx.example.com
+Delivery-date: Sat, 31 Oct 2020 19:32:58 +0100
+Received: from mrd.us-east-1a.returnpath.net ([1.2.3.4])
+	by xxx.example.com with esmtps (TLSv1.2:AES128-GCM-SHA256:128)
+	(Exim 4.92)
+	(envelope-from <fbl@bounce.mailstream.senderscore.net>)
+	id xxx
+	for xxx@example.com; Sat, 31 Oct 2020 19:32:56 +0100
+Received: (Haraka outbound); Sat, 31 Oct 2020 18:32:53 +0000
+Received: from localhost ([1.2.3.4])
+	by mrd.us-east-1a.returnpath.net (Haraka/2.8.21) with ESMTP id zzz.1
+	envelope-from <fbl@bounce.mailstream.senderscore.net>;
+	Sat, 31 Oct 2020 18:32:53 +0000
+Date: Sat, 31 Oct 2020 18:32:53 +0000
+Mime-Version: 1.0
+X-Rp-Fbl: type=arf; subscriptionID=xxxx
+Content-Type: multipart/report; report-type=feedback-report;
+ boundary=47ddcc38f0377c4c57be69b027f0e571585485feff72a328f64251165e26
+Message-Id: <01xxxx.fbl@bounce.mailstream.senderscore.net>
+To: xxx@example.com
+Subject: Rackspace Abuse Report
+From: Rackspace FBL Service <feedbackloop@rackspacefbl.senderscore.net>
+Received-SPF: pass (xxx.example.com: domain of bounce.mailstream.senderscore.net designates 1.2.3.4 as permitted sender) client-ip=1.2.3.4; envelope-from=fbl@bounce.mailstream.senderscore.net; helo=mrd.us-east-1a.returnpath.net;
+X-SPF-Result: xxx.example.com: domain of bounce.mailstream.senderscore.net designates 1.2.3.4 as permitted sender
+X-Original-Sender: feedbackloop@rackspacefbl.senderscore.net
+
+
+--47ddcc38f0377c4c57be69b027f0e571585485feff72a328f64251165e26
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+This is a Rackspace Abuse Report for an email message received from domain =
+example.com, IP 10.0.0.1, on Sat, 31 Oct 2020 18:02:57 +0000.
+
+--47ddcc38f0377c4c57be69b027f0e571585485feff72a328f64251165e26
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: message/feedback-report
+
+Source-Ip: 10.0.0.1
+User-Agent: ReturnPathFBL/2.0
+Original-Rcpt-To: hashed@example.com
+Reported-Domain: example.com
+Original-Mail-From: alice@example.com
+Source: Rackspace
+Abuse-Type: complaint
+Subscription-Link: https://fbl.returnpath.net/manage/subscriptions/xxxx
+Feedback-Type: abuse
+Version: 1
+Arrival-Date: Sat, 31 Oct 2020 18:02:57 +0000
+
+
+--47ddcc38f0377c4c57be69b027f0e571585485feff72a328f64251165e26
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: message/rfc822
+
+REDACTED
+
+--47ddcc38f0377c4c57be69b027f0e571585485feff72a328f64251165e26--

data/set-of-emails/maildir/bsd/lhost-aol-04.eml

@@ -1,6 +1,6 @@
 Return-Path: <Postmaster@AOL.com>
 Received: from mx15.bounceio.net (mx15.bounceio.net [192.237.151.15])
-	by partner-mce01.mx.@aol.example.com (Partner Internet Inbound) with ESMTP id D07553800008B
+	by partner-mce01.mx.aol.example.com (Partner Internet Inbound) with ESMTP id D07553800008B
 	for <shironeko@example.jp>; Fri, 21 Nov 2014 18:35:53 -0500 (EST)
 Received: by mx14.bounceio.net id hdv65i0rhk48 for <shironeko@example.jp>; Fri, 21 Nov 2014 23:35:53 +0000 (envelope-from <Postmaster@AOL.com>)
 From: Postmaster <Postmaster@AOL.com>
@@ -767,16 +767,16 @@ e9Pl6FLLYEN.2Dyi1ZSzcYEeZka1kC_9d9YFoFX9K5GG9qD7X1bBbmtvsXryVvbAbbGpkmZNvFy=
 Mj3mehLna_0Jcaq6SHw8Xv1nIvmbUsGj4AdbhVuk0cejbbeQ3AaOH9xrGZGL3oDPjne4u_bbGjR=
 .aYd_GyaJuy1EBuhSZNlEshqXJjhtULPfFPKs.DXGqEVYZ24p6WFHNQh87SYZ5nmOucaBYbf60a=
 bfAr3sCQKT6R6uwZ5UBlSfu_VPKcgdi5B29w3qLPw" rel=3D"nofollow" data-biocat=3D"=
-ad"><img src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D89931&t=3Dnewsletter&s=
+ad"><img src=3D"http://nl.newsletter.aol.example.com/imp?s=3D89931&t=3Dnewsletter&s=
 z=3D300x250&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a15bc5af&p=3D141=
 6612953355" border=3D"0" width=3D"300" height=3D"250" /></a> </td>=20
                        </tr>=20
                        <tr style=3D"display:block; height:1px; line-height:=
 1px;">=20
-                        <td> <img src=3D"http://nl.newsletter.@aol.example.com/imp?s=
+                        <td> <img src=3D"http://nl.newsletter.aol.example.com/imp?s=
 =3D89932&t=3Dnewsletter&sz=3D1x1&li=3DAOLBounceMail&m=3D6a2629809201a511936=
 88c68a15bc5af&p=3D1416612953355" height=3D"1" width=3D"10" /> </td>=20
-                        <td> <img src=3D"http://nl.newsletter.@aol.example.com/imp?s=
+                        <td> <img src=3D"http://nl.newsletter.aol.example.com/imp?s=
 =3D89933&t=3Dnewsletter&sz=3D1x1&li=3DAOLBounceMail&m=3D6a2629809201a511936=
 88c68a15bc5af&p=3D1416612953355" height=3D"1" width=3D"10" /> </td>=20
                        </tr>=20
@@ -789,7 +789,7 @@ wZpqdvdkZKmNnR_ckPZyoe9Pl6FLLYEVext5ay3mmPB3dWuRBThBhFycKET4pYnFqsVOv.Gr9Ce=
 5vGjJDypnkHT9yxARK_0sM7d7bgIYsNg2pVpjzBQjMW8hoAXFgdJ54GcZ1jUXjq2K1P3VYjXnW1=
 NSpm22rUOHdzKACox1kmAvItNF1UGxxmCpbP6BG7..ivjNWVcQkS5VFQLY4VHvub4Ym8vn141Xb=
 Le3jS51696nV0GexY.75fJSgSEmh.gz_eD675KWBNLTC5w1iOHkofo8XPiNFng" rel=3D"nofo=
-llow" data-biocat=3D"ad"><img src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8=
+llow" data-biocat=3D"ad"><img src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8=
 9919&t=3Dnewsletter&sz=3D116x15&li=3DAOLBounceMail&m=3D6a2629809201a5119368=
 8c68a15bc5af&p=3D1416612953355" border=3D"0" /></a> </td>=20
                         <td align=3D"right"> <a href=3D"https://a.b-io.me/c=
@@ -800,7 +800,7 @@ JwZpqdvdkZK02Y2QY_eS44e9Pl6FLLYE41ndLbr3rFVxnLv4jqxvyjT3kJfjG5MyOSmLMG8p6w9=
 hbXbsqoxkfQ70y8icHYHGhDLrQdFz9448FKDHLJP7cYDZz2qKWw5PZ5MxLy3lcnUKNcxgbpC49P=
 SFcFb_M_Tl0ssUB78auaImpUirSrFc9BBHRzcRPb1iIOb1uwg72toNfKYuD6Zg_84KETPG4iHU2=
 nA6Bp4UXURNfppoV4HfFk06Eudk71WgvPylYvM9Eb2n46xQzDN.grTOGBpQIUGH" rel=3D"nof=
-ollow" data-biocat=3D"ad"><img src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D=
+ollow" data-biocat=3D"ad"><img src=3D"http://nl.newsletter.aol.example.com/imp?s=3D=
 89920&t=3Dnewsletter&sz=3D69x15&li=3DAOLBounceMail&m=3D6a2629809201a5119368=
 8c68a15bc5af&p=3D1416612953355" border=3D"0" /></a> </td>=20
                        </tr>=20
@@ -1081,7 +1081,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 4&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1091,7 +1091,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 5&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1101,7 +1101,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 6&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1111,7 +1111,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 7&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1121,7 +1121,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 8&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1131,7 +1131,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8993=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8993=
 9&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1141,7 +1141,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 0&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1151,7 +1151,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 1&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1161,7 +1161,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 2&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1171,7 +1171,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 3&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1181,7 +1181,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 4&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1191,7 +1191,7 @@ e: collapse !important; color: #222222; font-family: 'Open Sans', Gill Sans=
 , Arial, Helvetica, sans-serif; font-size: 14px; font-weight: normal; hyphe=
 ns: auto; line-height: 19px; margin: 0; padding: 0; text-align: left; verti=
 cal-align: top; word-break: break-word" align=3D"left" valign=3D"top"> <img=
- border=3D"0" height=3D"6" src=3D"http://nl.newsletter.@aol.example.com/imp?s=3D8994=
+ border=3D"0" height=3D"6" src=3D"http://nl.newsletter.aol.example.com/imp?s=3D8994=
 5&t=3Dnewsletter&sz=3D2x1&li=3DAOLBounceMail&m=3D6a2629809201a51193688c68a1=
 5bc5af&p=3D1416612953355" width=3D"2" style=3D"-ms-interpolation-mode: bicu=
 bic; clear: both; display: block; float: left; max-width: 100%; outline: no=
@@ -1213,7 +1213,7 @@ WG3_tGm3wK97AkCk_kersGeVAZUn7vlTynIHYuQdvcN6iz8A--' width=3D'1' height=3D'1=
 Content-Type: message/delivery-status
 Content-Transfer-Encoding: 7bit
 
-Reporting-MTA: dns; omr-m04.mx.@aol.example.com
+Reporting-MTA: dns; omr-m04.mx.aol.example.com
 X-Outbound-Mail-Relay-Queue-ID: 48A7F700000A5
 X-Outbound-Mail-Relay-Sender: rfc822; shironeko@example.jp
 Arrival-Date: Fri, 21 Nov 2014 17:14:10 -0500 (EST)
@@ -1228,13 +1228,13 @@ Diagnostic-Code: smtp; 550 5.1.1 <kijitora@example.co.jp>... User Unknown
 Content-Type: message/rfc822
 
 Return-Path: <shironeko@example.jp>
-Received: from mtaout-aag02.mx.@aol.example.com (mtaout-aag02.mx.@aol.example.com [172.26.126.78])
-	by omr-m04.mx.@aol.example.com (Outbound Mail Relay) with ESMTP id 48A7F700000A5
+Received: from mtaout-aag02.mx.aol.example.com (mtaout-aag02.mx.aol.example.com [172.26.126.78])
+	by omr-m04.mx.aol.example.com (Outbound Mail Relay) with ESMTP id 48A7F700000A5
 	for <kijitora@example.co.jp>; Fri, 21 Nov 2014 17:14:10 -0500 (EST)
 Received: from [192.0.2.203] (c135.kyoto.example.ne.jp [192.0.2.135])
 	(using TLSv1 with cipher AES128-SHA (128/128 bits))
 	(No client certificate requested)
-	by mtaout-aag02.mx.@aol.example.com (MUA/Third Party Client Interface) with ESMTPSA id 4054138000097
+	by mtaout-aag02.mx.aol.example.com (MUA/Third Party Client Interface) with ESMTPSA id 4054138000097
 	for <kijitora@example.co.jp>; Fri, 21 Nov 2014 17:14:08 -0500 (EST)
 From: "Shironeko, Nyanko" <shironeko@example.jp>
 Content-Type: text/plain; charset=us-ascii
@@ -1245,7 +1245,7 @@ Date: Sat, 22 Nov 2014 07:14:04 +0900
 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
 X-Mailer: Apple Mail (2.1878.6)
 x-aol-global-disposition: G
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.@aol.example.com;
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aol.example.com;
 	s=20140625; t=1416608050;
 	bh=t4RTq0wP7XXMOD4/Vy94p2VuCD+sZaGyZxAADhrV9sU=;
 	h=From:To:Subject:Message-Id:Date:Mime-Version:Content-Type;