sisimai 4.25.5-java → 4.25.11-java

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.5'.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-24.eml

@@ -0,0 +1,50 @@
+Delivered-To: abuse-report@example.com
+Received: by 192.0.2.25 with SMTP id fffffffff000000;
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+X-Received: by 192.0.2.2 with SMTP id eeeeeeeee0000001.222.1500000000000;
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+Return-Path: <neko@example.org>
+Received: from CAT000-NEKO2.example.com (cat000-neko2.example.com. [203.0.113.25])
+    by mx.example.com with ESMTPS id fffffffff11111.222.2016.04.29.23.34.45
+    for <abuse-report@example.com>
+    (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+Received: from CAT000-NEKO-022.r.example.org ([198.51.100.1]) by CAT004-R.example.com
+    with Microsoft SMTPSVC(7.5.7601.22751); Thu, 29 Apr 2016 23:34:45 +0000
+Date: Thu, 29 Apr 2016 23:34:45 +0000
+From: staff@hotmail.com
+Subject:  complaint about message from 192.0.2.222
+To: abuse-report@example.com
+MIME-Version: 1.0 
+Content-Type: multipart/mixed; boundary="F0000EEE2-0000-2111-AAB0-000000000000"
+Message-ID: <CAT0-NNE-000000000000000022@CAT0-RRR.example.org>
+X-OriginalArrivalTime: 29 Apr 2016 23:34:45.0000 (UTC) FILETIME=[FFFFFFFF:00000000]
+Return-Path: neko@example.org
+
+--F0000EEE2-0000-2111-AAB0-000000000000
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+X-HmXmrOriginalRecipient: kijitora@example.com
+X-Reporter-IP: 192.0.2.22
+Authentication-Results: example.com; spf=pass (sender IP is 203.0.113.245; identity alignment result is pass and alignment mode is relaxed) smtp.mailfrom=sironeko@example.com; dkim=pass (identity alignment result is pass and alignment mode is relaxed) header.d=example.com; x-hmca=pass header.id=sironeko@example.com
+X-SID-PRA: sironeko@example.com
+X-AUTH-Result: PASS
+X-SID-Result: PASS
+Received: from smtp.example.com ([203.0.113.245]) by R7038-AA.example.com over TLS
+    secured channel with Microsoft SMTPSVC(7.5.7601.23008);
+    Thu, 29 Apr 2016 23:34:45 +0000
+Date: Thu, 29 Apr 2016 23:34:45 +0200
+To: kijitora@example.com
+From: name-part-looks-like-an-email-address@kyoto-japan
+    <sironeko@example.com>
+Subject: Nyaan
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset="utf-8"
+Message-ID: <0000000000fffffffff0000000000000@example.com>
+X-OriginalArrivalTime: 29 Apr 2016 23:34:45.0000 (UTC) FILETIME=[00000000:FFFFFFFF]
+
+Nyaan
+
+--F0000EEE2-0000-2111-AAB0-000000000000--

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-amavis-03.eml

@@ -0,0 +1,90 @@
+Received: from localhost (localhost [127.0.0.1])
+	by smtp-2.example.com (Postfix) with ESMTP id C9C14E203A18
+	for <error+1826111378@example.com>; Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+Content-Type: multipart/report; report-type=delivery-status;
+ boundary="----------=_1600738576-220-2"
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+Subject: Considered UNSOLICITED BULK EMAIL, apparently from you
+Message-ID: <hjY5PsYJ019501@example.com>
+From: "Content-filter at example.com" <postmaster@example.com>
+To: <error+1826111378@example.com>
+Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+
+This is a multi-part message in MIME format...
+
+------------=_1600738576-220-2
+Content-Type: text/plain; charset="iso-8859-1"
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+
+A message from <error+1826111378@example.com> to:
+-> kijitora@example.com
+
+was considered unsolicited bulk e-mail (UBE).
+
+Our internal reference code for your message is 20002-22/sHZwCRYD091907
+
+The message carried your return address, so it was either a genuine mail
+from you, or a sender address was faked and your e-mail address abused
+by third party, in which case we apologize for undesired notification.
+
+We do try to minimize backscatter for more prominent cases of UBE and
+for infected mail, but for less obvious cases of UBE some balance
+between losing genuine mail and sending undesired backscatter is sought,
+and there can be some collateral damage on both sides.
+
+First upstream SMTP client IP address: [127.0.0.1] localhost
+According to a 'Received:' trace, the message originated at: [127.0.0.1],
+  example.com localhost [127.0.0.1]
+
+Return-Path: <error+1826111378@example.com>
+From: error+1826111378@example.com
+Subject: Nyaan
+
+Duplicate header field: "From"
+
+
+Delivery of the email was stopped!
+
+------------=_1600738576-220-2
+Content-Type: message/delivery-status; name="dsn_status"
+Content-Disposition: inline; filename="dsn_status"
+Content-Transfer-Encoding: 7bit
+Content-Description: Delivery error report
+
+Reporting-MTA: dns; example.com
+Received-From-MTA: smtp; smtp-2.example.com ([127.0.0.1])
+Arrival-Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+
+Final-Recipient: rfc822;kijitora@example.com
+Action: failed
+Status: 5.7.0
+Diagnostic-Code: smtp; 554 5.7.0 Reject, id=20025-09 - SPAM
+Last-Attempt-Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+Final-Log-ID: 20025-09/wliEaM27090469
+
+------------=_1600738576-220-2
+Content-Type: text/rfc822-headers; name="header"
+Content-Disposition: inline; filename="header"
+Content-Transfer-Encoding: 7bit
+Content-Description: Message header section
+
+Return-Path: <error+1826111378@example.com>
+Received: esmtp-2.example.com (localhost [127.0.0.1])
+	by smtp-2.example.com (Postfix) with ESMTPS
+	for <kijitora@example.com>; Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+From: kijitora@example.com
+Date: Thu, 29 Apr 2013 23:34:45 GMT
+From: error+1826111378@example.com
+To: kijitora@example.com
+Subject: Nyaan
+MIME-Version: 1.0
+Content-Type: text/plain
+
+------------=_1600738576-220-2--
+
+ ============ 
+ recipient: error+1826111378@example.com
+ ============ 
+ sender: MAILER-DAEMON

data/set-of-emails/maildir/bsd/{email-aol-04.eml → 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;