Backported Bounce recognizer changes and tests from the 3.0 branch

21 files changed, 1895 insertions, 19 deletions

diff --git a/Mailman/Bouncers/DSN.py b/Mailman/Bouncers/DSN.py
index 869e0461..e4d2f486 100644
--- a/Mailman/Bouncers/DSN.py
+++ b/Mailman/Bouncers/DSN.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -93,6 +93,11 @@ def process(msg):
     # in a multipart/mixed outer part.
     if msg.is_multipart() and msg.get_content_subtype() == 'mixed':
         msg = msg.get_payload()[0]
+    # The above will suffice if the original message 'parts' were wrapped with
+    # the disclaimer added, but the original DSN can be wrapped as a
+    # message/rfc822 part.  We need to test that too.
+    if msg.is_multipart() and msg.get_content_type() == 'message/rfc822':
+        msg = msg.get_payload()[0]
     # The report-type parameter should be "delivery-status", but it seems that
     # some DSN generating MTAs don't include this on the Content-Type: header,
     # so let's relax the test a bit.
diff --git a/Mailman/Bouncers/Qmail.py b/Mailman/Bouncers/Qmail.py
index def4abfa..2c02c1ae 100644
--- a/Mailman/Bouncers/Qmail.py
+++ b/Mailman/Bouncers/Qmail.py
@@ -1,17 +1,17 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
@@ -33,7 +33,9 @@ import email.Iterators
 introtags = [
     'Hi. This is the',
     "We're sorry. There's a problem",
-    'Check your send e-mail address.'
+    'Check your send e-mail address.',
+    'This is the mail delivery agent at',
+    'Unfortunately, your mail was not delivered'
     ]
 acre = re.compile(r'<(?P<addr>[^>]*)>:')
 
diff --git a/Mailman/Bouncers/SMTP32.py b/Mailman/Bouncers/SMTP32.py
index 3ad7ce44..f2397b24 100644
--- a/Mailman/Bouncers/SMTP32.py
+++ b/Mailman/Bouncers/SMTP32.py
@@ -1,17 +1,17 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
@@ -38,9 +38,10 @@ acre = re.compile(r'''
     |delivery\ failed[^:]*:                       # wild...
     |unknown\ user[^:]*:
     |undeliverable\ +to
+    |delivery\ userid[^:]*:
     )
     \s*                                           # space separator
-    (?P<addr>.*)                                  # and finally, the address
+    (?P<addr>[^\s]*)                              # and finally, the address
     ''', re.IGNORECASE | re.VERBOSE)
 
 
diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py
index 12eeffdc..2e9c23b1 100644
--- a/Mailman/Bouncers/SimpleMatch.py
+++ b/Mailman/Bouncers/SimpleMatch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -87,6 +87,10 @@ PATTERNS = [
     (_c('Unable to deliver message to the following address\(es\)\.'),
      _c('--- Original message follows\.'),
      _c('<(?P<addr>[^>]*)>:')),
+    # googlemail.com
+    (_c('Delivery to the following recipient failed'),
+     _c('----- Original message -----'),
+     _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
     # kundenserver.de
     (_c('A message that you sent could not be delivered'),
      _c('^---'),
@@ -97,13 +101,16 @@ PATTERNS = [
      _c('^(?P<addr>[^\s@]+@[^\s@:]+):')),
     # thehartford.com
     (_c('Delivery to the following recipients failed'),
-     _c("Bogus - there actually isn't anything"),
+     # this one may or may not have the original message, but there's nothing
+     # unique to stop on, so stop on the first line of at least 3 characters
+     # that doesn't start with 'D' (to not stop immediately) and has no '@'.
+     _c('^[^D][^@]{2,}$'),
      _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
     # and another thehartfod.com/hartfordlife.com
     (_c('^Your message\s*$'),
      _c('^because:'),
      _c('^\s*(?P<addr>[^\s@]+@[^\s@]+)\s*$')),
-    # kviv.be (NTMail)
+    # kviv.be (InterScan NT)
     (_c('^Unable to deliver message to'),
      _c(r'\*+\s+End of message\s+\*+'),
      _c('<(?P<addr>[^>]*)>')),
@@ -127,6 +134,38 @@ PATTERNS = [
     (_c('A message that you sent could not be delivered'),
      _c('^---'),
      _c('(?P<addr>[^\s@]+@[^\s@)]+)')),
+    # LSMTP for Windows
+    (_c('^--> Error description:\s*$'),
+     _c('^Error-End:'),
+     _c('^Error-for:\s+(?P<addr>[^\s@]+@[^\s@]+)')),
+    # Qmail with a tri-language intro beginning in spanish
+    (_c('Your message could not be delivered'),
+     _c('^-'),
+     _c('<(?P<addr>[^>]*)>:')),
+    # socgen.com
+    (_c('Your message could not be delivered to'),
+     _c('^\s*$'),
+     _c('(?P<addr>[^\s@]+@[^\s@]+)')),
+    # dadoservice.it
+    (_c('Your message has encountered delivery problems'),
+     _c('Your message reads'),
+     _c('addressed to\s*(?P<addr>[^\s@]+@[^\s@)]+)')),
+    # gomaps.com
+    (_c('Did not reach the following recipient'),
+     _c('^\s*$'),
+     _c('\s(?P<addr>[^\s@]+@[^\s@]+)')),
+    # EYOU MTA SYSTEM
+    (_c('This is the deliver program at'),
+     _c('^-'),
+     _c('^(?P<addr>[^\s@]+@[^\s@<>]+)')),
+    # A non-standard qmail at ieo.it
+    (_c('this is the email server at'),
+     _c('^-'),
+     _c('\s(?P<addr>[^\s@]+@[^\s@]+)[\s,]')),
+    # pla.net.py (MDaemon.PRO ?)
+    (_c('- no such user here'),
+     _c('There is no user'),
+     _c('^(?P<addr>[^\s@]+@[^\s@]+)\s')),
     # Next one goes here...
     ]
 
diff --git a/Mailman/Bouncers/SimpleWarning.py b/Mailman/Bouncers/SimpleWarning.py
index 733994eb..45012c16 100644
--- a/Mailman/Bouncers/SimpleWarning.py
+++ b/Mailman/Bouncers/SimpleWarning.py
@@ -1,17 +1,17 @@
-# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
@@ -37,6 +37,18 @@ patterns = [
     (_c('The address to which the message has not yet been delivered is'),
      _c('No action is required on your part'),
      _c(r'\s*(?P<addr>\S+@\S+)\s*')),
+    # This is from MessageSwitch.  It is a kludge because the text that
+    # identifies it as a warning only comes after the address.  We can't
+    # use ecre, because it really isn't significant, so we fake it.  Once
+    # we see the start, we know it's a warning, and we're going to return
+    # Stop anyway, so we match anything for the address and end.
+    (_c('This is just a warning, you do not need to take any action'),
+     _c('.+'),
+     _c('(?P<addr>.+)')),
+    # Symantec_AntiVirus_for_SMTP_Gateways - see comments for MessageSwitch
+    (_c('Delivery attempts will continue to be made'),
+     _c('.+'),
+     _c('(?P<addr>.+)')),
     # Next one goes here...
     ]
 
diff --git a/tests/bounces/dsn_15.txt b/tests/bounces/dsn_15.txt
new file mode 100755
index 00000000..1e3c62de
--- /dev/null
+++ b/tests/bounces/dsn_15.txt
@@ -0,0 +1,278 @@
+Received: from cccclyvw01.ccc.coopcam.com (firewall.camerondiv.com
+	[204.126.127.253])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k552hseW018615
+	for <gpc-talk-bounces@grizz.org>; Sun, 4 Jun 2006 19:43:54 -0700
+Received: from CCCCLYEX03.ccc.coopcam.com ([10.4.221.23]) by 
+	cccclyvw01.ccc.coopcam.com with InterScan Message Security Suite;
+	Sun, 04 Jun 2006 21:43:21 -0500
+Received: from cccclyna01.ccc.coopcam.com ([10.4.221.21]) by 
+	CCCCLYEX03.ccc.coopcam.com with Microsoft SMTPSVC(6.0.3790.0);
+	Sun, 4 Jun 2006 21:43:21 -0500
+From: postmaster@c-a-m.com
+To: gpc-talk-bounces@grizz.org
+Date: Sun, 4 Jun 2006 21:43:21 -0500
+MIME-Version: 1.0
+Content-Type: multipart/mixed; report-type=delivery-status;
+	boundary="=_Boundary_A1qfT7eEmP9CDBHy3Spw"
+X-DSNContext: 335a7efd - 4523 - 00000001 - 80040546
+Message-ID: <7CvPg3IK9000149b3@cccclyna01.ccc.coopcam.com>
+Subject: Delivery Status Notification (Failure)
+X-OriginalArrivalTime: 05 Jun 2006 02:43:21.0817 (UTC) 
+	FILETIME=[CF471490:01C68849]
+X-imss-version: 2.040
+X-imss-result: Passed
+X-imss-approveListMatch: *@c-a-m.com
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is a MIME-formatted message.  
+Portions of this message may be unreadable without a MIME-capable mail program.
+
+--=_Boundary_A1qfT7eEmP9CDBHy3Spw
+Content-Type: message/rfc822
+Content-Disposition: attachment;
+	filename=originalmail.eml
+
+Received: from CCCCLYEX03.ccc.coopcam.com ([10.4.221.23]) by 
+	cccclyvw01.ccc.coopcam.com with InterScan Message Security Suite;
+	Sun, 04 Jun 2006 21:43:21 -0500
+Received: from cccclyna01.ccc.coopcam.com ([10.4.221.21]) by 
+	CCCCLYEX03.ccc.coopcam.com with Microsoft SMTPSVC(6.0.3790.0);
+	Sun, 4 Jun 2006 21:43:21 -0500
+From: postmaster@c-a-m.com
+To: gpc-talk-bounces@grizz.org
+Date: Sun, 4 Jun 2006 21:43:21 -0500
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="9B095B5ADSN=_01C651B2AA11765C0001F6A4cccclyna01.ccc.c"
+X-DSNContext: 335a7efd - 4523 - 00000001 - 80040546
+Message-ID: <7CvPg3IK9000149b3@cccclyna01.ccc.coopcam.com>
+Subject: Delivery Status Notification (Failure)
+Return-Path: <>
+X-OriginalArrivalTime: 05 Jun 2006 02:43:21.0817 (UTC) 
+	FILETIME=[CF471490:01C68849]
+X-imss-version: 2.040
+X-imss-result: Passed
+X-imss-approveListMatch: *@c-a-m.com
+
+This is a MIME-formatted message.  
+Portions of this message may be unreadable without a MIME-capable mail program.
+
+--9B095B5ADSN=_01C651B2AA11765C0001F6A4cccclyna01.ccc.c
+Content-Type: text/plain; charset=unicode-1-1-utf-7
+
+This is an automatically generated Delivery Status Notification.
+
+Delivery to the following recipients failed.
+
+       horu@ccc-ces.com
+
+
+
+
+--9B095B5ADSN=_01C651B2AA11765C0001F6A4cccclyna01.ccc.c
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns;cccclyna01.ccc.coopcam.com
+Received-From-MTA: dns;cccclyvw01.ccc.coopcam.com
+Arrival-Date: Sun, 4 Jun 2006 21:43:21 -0500
+
+Final-Recipient: rfc822;horu@ccc-ces.com
+Action: failed
+Status: 5.1.1
+
+--9B095B5ADSN=_01C651B2AA11765C0001F6A4cccclyna01.ccc.c
+Content-Type: message/rfc822
+
+Received: from cccclyvw01.ccc.coopcam.com ([10.4.223.38]) by
+	cccclyna01.ccc.coopcam.com with Microsoft SMTPSVC(6.0.3790.0); 
+	Sun, 4 Jun 2006 21:43:21 -0500
+Received: from sb7.songbird.com ([208.184.79.137]) by 
+	cccclyvw01.ccc.coopcam.com with InterScan Message Security Suite;
+	Sun, 04 Jun 2006 21:43:20 -0500
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])by 
+	sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k552hf0f018557for <horu@ccc-ces.com>; Sun, 4 Jun 2006 19:43:41 -0700
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: horu@ccc-ces.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="===============1628420505=="
+Message-ID: <mailman.4360.1149475419.1567.gpc-talk@grizz.org>
+Date: Sun, 04 Jun 2006 19:43:39 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+X-imss-version: 2.040
+X-imss-result: Passed
+X-imss-scanInfo: M:B L:E SM:3
+X-imss-tmaseResult: TT:1 TS:0.7500 TC:03 TRN:14 TV:3.52.1006(14484.000)
+X-imss-scores: Clean:5.68116 C:2 M:4 S:5 R:5
+X-imss-settings: Baseline:5 C:3 M:3 S:3 R:3 (1.5000 1.5000)
+Return-Path: gpc-talk-bounces@grizz.org
+X-OriginalArrivalTime: 05 Jun 2006 02:43:21.0006 (UTC)
+	FILETIME=[CECB54E0:01C68849]
+
+--===============1628420505==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+The results of your email command are provided below. Attached is your
+original message.
+
+- Results:
+    Ignoring non-text/plain MIME parts
+    horu@ccc-ces.com is not a member of the GPC-talk mailing list
+
+- Unprocessed:
+    test hym
+    Hi,
+    V " A G R A
+    S 0 M &
+    P R 0 Z & C
+    V A L " U M
+    C " A L i S
+    L E V " T R A
+    A M B " E N
+    M E R " D i A
+    X & N A X
+    all 50 % off - http://www.serromocca.com
+      _____ =20
+    undamaged; and the dragon was dead. What that meant they had not yet=20
+    realized. They gathered in mournful crowds upon the western shores,=20
+    shivering in the cold wind, and their first complaints and anger were=20
+    against the Master, who had left the town so soon, while some were still
+    willing to defend it. He may have a good head for business-especially=20
+    his own business, some murmured, but he is no good when anything=20
+
+- Done.
+
+
+--===============1628420505==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <horu@ccc-ces.com>
+Received: from comparinc.com (124.106.152.68.pldt.net [124.106.152.68] (may be
+	forged)) by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k552hT6b018480
+	for <gpc-talk-unsubscribe@grizz.org>; Sun, 4 Jun 2006 19:43:33 -0700
+Message-ID: <000001c68849$b775f930$a3b9a8c0@now68>
+Reply-To: "Jodene Horn" <horu@ccc-ces.com>
+From: "Jodene Horn" <horu@ccc-ces.com>
+To: gpc-talk-unsubscribe@grizz.org
+Subject: test hym
+Date: Sun, 4 Jun 2006 19:42:41 -0700
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C6880F.0B172130"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: horu@ccc-ces.com
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0001_01C6880F.0B172130
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+Hi,
+
+V " A G R A
+S 0 M &
+P R 0 Z & C
+V A L " U M
+C " A L i S
+L E V " T R A
+A M B " E N
+M E R " D i A
+X & N A X
+
+all 50 % off - http://www.serromocca.com
+
+
+  _____ =20
+
+undamaged; and the dragon was dead. What that meant they had not yet=20
+realized. They gathered in mournful crowds upon the western shores,=20
+shivering in the cold wind, and their first complaints and anger were=20
+against the Master, who had left the town so soon, while some were still
+willing to defend it. He may have a good head for business-especially=20
+his own business, some murmured, but he is no good when anything=20
+
+
+------=_NextPart_000_0001_01C6880F.0B172130
+Content-Type: text/html;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Dus-ascii">
+<META content=3D"MSHTML 6.00.2800.1106" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV>Hi,<BR>
+<BR>
+<B>V " A G R A</B><BR>
+S 0 M &<BR>
+P R 0 Z & C<BR>
+<STRONG>V A L " U M</STRONG><BR>
+<B>C " A L i S</B><BR>
+L E V " T R A<BR>
+A M B " E N<BR>
+M E R " D i A<BR>
+X & N A X<BR>
+<BR>
+all 50 % off - <A =
+href=3D"http://www.serromocca.com">http://www.serromocca.com</A><BR>
+<BR>
+</DIV>
+<HR>
+<DIV>undamaged; and the dragon was dead. What that meant they had not =
+yet <BR>realized. They gathered in mournful crowds upon the western =
+shores, <BR>shivering in the cold wind, and their first complaints and =
+anger were <BR>against the Master, who had left the town so soon, while =
+some were still <BR>willing to defend it. He may have a good head for =
+business-especially <BR>his own business, some murmured, but he is no =
+good when anything <BR></DIV></BODY></HTML>
+------=_NextPart_000_0001_01C6880F.0B172130--
+
+--===============1628420505==--
+
+--9B095B5ADSN=_01C651B2AA11765C0001F6A4cccclyna01.ccc.c--
+
+--=_Boundary_A1qfT7eEmP9CDBHy3Spw
+Content-Type: text/plain;
+	charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This e-mail is confidential, may contain proprietary information
+of Cameron and its operating Divisions and may be confidential
+or privileged.
+
+This e-mail should be read, copied, disseminated and/or used only
+by the addressee. If you have received this message in error please
+delete it, together with any attachments, from your system.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+--=_Boundary_A1qfT7eEmP9CDBHy3Spw--
+
diff --git a/tests/bounces/qmail_04.txt b/tests/bounces/qmail_04.txt
new file mode 100755
index 00000000..035d74d6
--- /dev/null
+++ b/tests/bounces/qmail_04.txt
@@ -0,0 +1,81 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from mail47.messagelabs.com (mail47.messagelabs.com [216.82.240.163])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k488M87l021192
+	for <gpc-talk-bounces@grizz.org>; Mon, 8 May 2006 01:22:08 -0700
+Message-Id: <200605080822.k488M87l021192@sb7.songbird.com>
+X-VirusChecked: Checked
+X-StarScan-Version: 5.5.9.1; banners=.,-,-
+Received: (qmail 25062 invoked for bounce); 8 May 2006 08:21:20 -0000
+Date: 8 May 2006 08:21:19 -0000
+From: MAILER-DAEMON@messagelabs.com
+To: gpc-talk-bounces@grizz.org
+Subject: failure notice
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is the mail delivery agent at messagelabs.com.
+I was not able to deliver your message to the following addresses.
+
+<merotiia@tennisnsw.com.au>:
+59.154.33.7 does not like recipient.
+Remote host said: 550 merotiia@tennisnsw.com.au... No such user
+
+
+--- Below this line is a copy of the message.
+
+Return-Path: <gpc-talk-bounces@grizz.org>
+X-VirusChecked: Checked
+X-Env-Sender: gpc-talk-bounces@grizz.org
+X-Msg-Ref: server-11.tower-47.messagelabs.com!1147076463!26398187!1
+X-StarScan-Version: 5.5.9.1; banners=-,-,-
+X-Originating-IP: [208.184.79.137]
+X-SpamReason: No, hits=0.1 required=7.0 tests=NO_REAL_NAME
+Received: (qmail 24873 invoked from network); 8 May 2006 08:21:04 -0000
+Received: from sb7.songbird.com (HELO sb7.songbird.com) (208.184.79.137)
+  by server-11.tower-47.messagelabs.com with AES256-SHA encrypted SMTP; 8 May 2006 08:21:04 -0000
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k488LXaj021129
+	for <merotiia@tennisnsw.com.au>; Mon, 8 May 2006 01:21:33 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: merotiia@tennisnsw.com.au
+Message-ID: <mailman.12143.1147076492.1568.gpc-talk@grizz.org>
+Date: Mon, 08 May 2006 01:21:32 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+Your mail to 'GPC-talk' with the subject
+
+    Re: the AzMBtEN
+
+Is being held until the list moderator can review it for approval.
+
+The reason it is being held:
+
+    Post by non-member to a members-only list
+
+Either the message will get posted to the list, or you will receive
+notification of the moderator's decision.  If you would like to cancel
+this posting, please visit the following URL:
+
+    http://www.grizz.org/mailman/confirm/gpc-talk/83c05aa9c7a3037140e278e470d840926cd861cd
+
+
+______________________________________________________________________
+This email has been scanned by the MessageLabs Email Security System.
+For more information please visit http://www.messagelabs.com/email 
+______________________________________________________________________
+
diff --git a/tests/bounces/qmail_05.txt b/tests/bounces/qmail_05.txt
new file mode 100755
index 00000000..84362025
--- /dev/null
+++ b/tests/bounces/qmail_05.txt
@@ -0,0 +1,121 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from outbound20-2.nyc.untd.com (outbound20-2.nyc.untd.com
+	[64.136.20.160])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k5BBPhZR024133
+	for <wed_ride-bounces@grizz.org>; Sun, 11 Jun 2006 04:25:43 -0700
+Message-Id: <200606111125.k5BBPhZR024133@sb7.songbird.com>
+Received: (qmail 29409 invoked for bounce); 11 Jun 2006 11:25:12 -0000
+Date: 11 Jun 2006 11:25:12 -0000
+From: MAILER-DAEMON@mx06.nyc.untd.com
+To: wed_ride-bounces@grizz.org
+Subject: Mail Not Delivered
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+Unfortunately, your mail was not delivered to the following address:
+
+<ivokggrrdvc@caixaforte.freeservers.com>:
+64.136.25.171 does not like recipient.
+Remote host said: 550 <ivokggrrdvc@caixaforte.freeservers.com>: Recipient address rejected: User unknown in virtual alias table
+Giving up on 64.136.25.171.
+
+--- Below this line is a copy of the message.
+
+Return-Path: <wed_ride-bounces@grizz.org>
+Received: from sb7.songbird.com (sb7.songbird.com [208.184.79.137])
+	by mx06.nyc.untd.com with SMTP id AABCJZ9MRANG84X2
+	for <ivokggrrdvc@caixaforte.freeservers.com> (sender <wed_ride-bounces@grizz.org>);
+	Sun, 11 Jun 2006 04:24:31 -0700 (PDT)
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k5BBOnMa023991
+	for <ivokggrrdvc@caixaforte.freeservers.com>; Sun, 11 Jun 2006 04:24:49 -0700
+Subject: jack
+From: wed_ride-owner@grizz.org
+To: ivokggrrdvc@caixaforte.freeservers.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1594973120=="
+Message-ID: <mailman.15106.1150025087.1568.wed_ride@grizz.org>
+Date: Sun, 11 Jun 2006 04:24:47 -0700
+Precedence: bulk
+X-BeenThere: wed_ride@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: GPC Wednesday Ride List <wed_ride.grizz.org>
+X-List-Administrivia: yes
+Sender: wed_ride-bounces@grizz.org
+Errors-To: wed_ride-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: wed_ride-bounces@grizz.org
+
+--===============1594973120==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+You are not allowed to post to this mailing list, and your message has
+been automatically rejected.  If you think that your messages are
+being rejected in error, contact the mailing list owner at
+wed_ride-owner@grizz.org.
+
+
+--===============1594973120==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <ivokggrrdvc@caixaforte.freeservers.com>
+Received: from user-1087suf.cable.mindspring.com
+	(user-1087suf.cable.mindspring.com [64.131.243.207])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k5BBOcL2022522
+	for <wed_ride@grizz.org>; Sun, 11 Jun 2006 04:24:38 -0700
+Received: (qmail 28668 invoked from network); Sun, 11 Jun 2006 07:24:02 -0400
+Received: from unknown (HELO nrss.yefr) (64.131.147.172)
+	by user-1087suf.cable.mindspring.com with SMTP;
+	Sun, 11 Jun 2006 07:24:02 -0400
+Message-ID: <001101c68d49$8a6547f0$ac938340@nrss.yefr>
+From: "Nolly Mitchell" <ivokggrrdvc@caixaforte.freeservers.com>
+To: <wed_ride@grizz.org>
+Subject: jack
+Date: Sun, 11 Jun 2006 07:22:30 -0400
+MIME-Version: 1.0
+Content-Type: multipart/related; type="multipart/alternative";
+	boundary="----=_NextPart_000_000D_01C68D28.0353A7BC"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2180
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: ivokggrrdvc@caixaforte.freeservers.com
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_000D_01C68D28.0353A7BC
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_001_000E_01C68D28.0353A7C9"
+
+
+------=_NextPart_001_000E_01C68D28.0353A7C9
+Content-Type: text/plain;
+	charset="windows-1252"
+Content-Transfer-Encoding: quoted-printable
+
+
+Various attachments removed for Mailman example - MAS
+
+
+
+
+
+
+------=_NextPart_001_000E_01C68D28.0353A7C9--
+
+
+
+------=_NextPart_000_000D_01C68D28.0353A7BC--
+
+
+--===============1594973120==--
+
diff --git a/tests/bounces/simple_17.txt b/tests/bounces/simple_17.txt
new file mode 100755
index 00000000..4d4cbfa8
--- /dev/null
+++ b/tests/bounces/simple_17.txt
@@ -0,0 +1,76 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.199])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k4A9vtBp031861
+	for <gpc-talk-bounces@grizz.org>; Wed, 10 May 2006 02:57:56 -0700
+Message-Id: <200605100957.k4A9vtBp031861@sb7.songbird.com>
+Received: by nz-out-0102.google.com with SMTP id m22so1664192nzf
+	for <gpc-talk-bounces@grizz.org>; Wed, 10 May 2006 02:57:22 -0700 (PDT)
+DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=googlemail.com;
+	h=received:from:to:subject:date;
+	b=itbNrMpynpFDGRA3H64TOv6bR4G2VheOanpQ+2ptQ6qXql7I3q+Wb42T5/7K2pRPUJyVyzJNaT2Lk9s2btWq7FOYeGTRvUapLbNQ/JJcrekaPkXT10YQCgYoxpo1UJVuE6zwj9cxpL2SFoKRdfaIjnEzdl3YTPoH7L8TPUSmsK0=
+Received: by 10.36.48.19 with SMTP id v19mr424437nzv;
+	Wed, 10 May 2006 02:57:22 -0700 (PDT)
+Received: by 10.36.48.19 with SMTP id v19mr539291nzv;
+	Wed, 10 May 2006 02:57:22 -0700 (PDT)
+From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
+To: gpc-talk-bounces@grizz.org
+Subject: Delivery Status Notification (Failure)
+Date: Wed, 10 May 2006 02:57:22 -0700 (PDT)
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is an automatically generated Delivery Status Notification
+
+Delivery to the following recipient failed permanently:
+
+     internetsailing@gmail.com
+
+   ----- Original message -----
+
+Received: by 10.36.48.19 with SMTP id v19mr424427nzv;
+        Wed, 10 May 2006 02:57:21 -0700 (PDT)
+Return-Path: <gpc-talk-bounces@grizz.org>
+Received: from sara.dreamhost.com (sara.dreamhost.com [66.33.196.112])
+        by mx.gmail.com with ESMTP id r9si3586885nza.2006.05.10.02.57.21;
+        Wed, 10 May 2006 02:57:21 -0700 (PDT)
+Received-SPF: neutral (gmail.com: 66.33.196.112 is neither permitted nor denied by best guess record for domain of gpc-talk-bounces@grizz.org)
+Received: from sb7.songbird.com (sb7.songbird.com [208.184.79.137])
+	by sara.dreamhost.com (Postfix) with ESMTP id EC6134975D
+	for <decanofu@internetyachtclub.com>; Wed, 10 May 2006 02:57:20 -0700 (PDT)
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k4A9vnNk031834
+	for <decanofu@internetyachtclub.com>; Wed, 10 May 2006 02:57:49 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: decanofu@internetyachtclub.com
+Message-ID: <mailman.12400.1147255068.1568.gpc-talk@grizz.org>
+Date: Wed, 10 May 2006 02:57:48 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+Your mail to 'GPC-talk' with the subject
+
+    What IS 0EM Software And Why D0 You Care?
+
+Is being held until the list moderator can review it for approval.
+
+The reason it is being held:
+
+    Post by non-member to a members-only list
+
+
+   ----- Message truncated -----
+
diff --git a/tests/bounces/simple_18.txt b/tests/bounces/simple_18.txt
new file mode 100755
index 00000000..6f642a46
--- /dev/null
+++ b/tests/bounces/simple_18.txt
@@ -0,0 +1,73 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from mail.trusite.com (vendormail.truserv.com [64.94.39.5])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k57NS3QZ028360
+	for <gpc-talk-bounces@grizz.org>; Wed, 7 Jun 2006 16:28:03 -0700
+Message-Id: <200606072328.k57NS3QZ028360@sb7.songbird.com>
+Date: Wed, 7 Jun 2006 18:26:11 -0500
+Reply-to: postmaster@trusite.com
+From: "LSMTP for Windows NT v1.1b" <postmaster@mail.trusite.com>
+Subject: Undelivered mail
+To: gpc-talk-bounces@grizz.org
+X-Report-Type: Nondelivery; boundary="> Error description:"
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+An error was detected while processing the enclosed message.  A list of
+the affected recipient follows.   This list is in a special format that
+allows software like LISTSERV to automatically take action on incorrect
+addresses; you can safely ignore the numeric codes.
+
+--> Error description:
+Error-for:  powell@kesslersupply.com
+Error-Code: 0
+Error-Text: Mailer mail.kesslersupply.com said:
+            "554 Message looping (received 6 times)"
+
+Error-End:  One error reported.
+
+------------------------------ Original message ------------------------------
+Received: from mail.trusite.com (64.94.39.5) by mail.trusite.com (LSMTP for Windows NT v1.1b) with SMTP id <0.01BC17B2@mail.trusite.com>; Wed, 7 Jun 2006 16:56:58 -0500
+Received: from mail.trusite.com (64.94.39.5) by mail.trusite.com (LSMTP for Windows NT v1.1b) with SMTP id <0.01BBF653@mail.trusite.com>; Wed, 7 Jun 2006 16:48:09 -0500
+Received: from mail.trusite.com (64.94.39.5) by mail.trusite.com (LSMTP for Windows NT v1.1b) with SMTP id <0.01BBAD89@mail.trusite.com>; Wed, 7 Jun 2006 14:38:42 -0500
+Received: from mail.trusite.com (64.94.39.5) by mail.trusite.com (LSMTP for Windows NT v1.1b) with SMTP id <0.01BB889E@mail.trusite.com>; Wed, 7 Jun 2006 14:28:27 -0500
+Received: from sb7.songbird.com (208.184.79.137) by mail.trusite.com (LSMTP for Windows NT v1.1b) with SMTP id <0.01BA9C10@mail.trusite.com>; Wed, 7 Jun 2006 4:09:49 -0500
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k579BaIl004568
+	for <powell@kesslersupply.com>; Wed, 7 Jun 2006 02:11:36 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: powell@kesslersupply.com
+Message-ID: <mailman.14732.1149671496.1568.gpc-talk@grizz.org>
+Date: Wed, 07 Jun 2006 02:11:36 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+Your mail to 'GPC-talk' with the subject
+
+    Urgent Notification #3417701650782548
+
+Is being held until the list moderator can review it for approval.
+
+The reason it is being held:
+
+    Post by non-member to a members-only list
+
+Either the message will get posted to the list, or you will receive
+notification of the moderator's decision.  If you would like to cancel
+this posting, please visit the following URL:
+
+    http://www.grizz.org/mailman/confirm/gpc-talk/9511e0532a992db101e66ca77dd2e2142f4cc8d4
+
diff --git a/tests/bounces/simple_19.txt b/tests/bounces/simple_19.txt
new file mode 100755
index 00000000..54ea96c9
--- /dev/null
+++ b/tests/bounces/simple_19.txt
@@ -0,0 +1,77 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from cumeils.prima.com.ar (cumeil9.prima.net.ar [200.42.0.151] (may
+	be forged))
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k4M8xpB2026035
+	for <gpc-talk-bounces@grizz.org>; Mon, 22 May 2006 01:59:51 -0700
+Message-Id: <200605220859.k4M8xpB2026035@sb7.songbird.com>
+Received: (qmail 37041 invoked for bounce); 22 May 2006 08:59:18 -0000
+Date: 22 May 2006 08:59:18 -0000
+From: MAILER-DAEMON@cumeils.prima.com.ar
+To: gpc-talk-bounces@grizz.org
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="1148288358cumeils.prima.com.ar967579"
+Subject: failure notice
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+--1148288358cumeils.prima.com.ar967579
+
+(cumeils.prima.com.ar)
+Su mensaje no pudo ser entregado - Sua mensagem nao pode ser enviada - Your message could not be delivered.
+
+<mcfall@cepi.com.ar>:
+Sorry, no mailbox here by that name. (#5.1.1)
+
+--- Mensaje original adjunto.
+
+--1148288358cumeils.prima.com.ar967579
+Content-Type: message/rfc822
+
+Return-Path: <gpc-talk-bounces@grizz.org>
+Received: (qmail 37031 invoked from network); 22 May 2006 08:59:17 -0000
+Received: from unknown (HELO sb7.songbird.com) (208.184.79.137)
+	by cumeil9.prima.net.ar with SMTP; 22 May 2006 08:59:17 -0000
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k4M8xfOp025916
+	for <mcfall@cepi.com.ar>; Mon, 22 May 2006 01:59:41 -0700
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Subject: Your message to GPC-talk awaits moderator approval
+From: gpc-talk-bounces@grizz.org
+To: mcfall@cepi.com.ar
+Message-ID: <mailman.13312.1148288380.1568.gpc-talk@grizz.org>
+Date: Mon, 22 May 2006 01:59:40 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+Your mail to 'GPC-talk' with the subject
+
+    Re: test VmtAGGRA
+
+Is being held until the list moderator can review it for approval.
+
+The reason it is being held:
+
+    Post by non-member to a members-only list
+
+Either the message will get posted to the list, or you will receive
+notification of the moderator's decision.  If you would like to cancel
+this posting, please visit the following URL:
+
+    http://www.grizz.org/mailman/confirm/gpc-talk/7e863df2035f424bb9e4297dad6b1cb481f687a5
+
+
+--1148288358cumeils.prima.com.ar967579--
+
diff --git a/tests/bounces/simple_20.txt b/tests/bounces/simple_20.txt
new file mode 100755
index 00000000..84991148
--- /dev/null
+++ b/tests/bounces/simple_20.txt
@@ -0,0 +1,27 @@
+Return-Path: <Dsicspiibs.spi-internet@socgen.com>
+Received: from realmail20.socgen.com (realmail20.socgen.com [194.119.125.55])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k42GiYox017297
+	for <gpc-talk-bounces@grizz.org>; Tue, 2 May 2006 09:44:35 -0700
+Message-Id: <4u3ji0$p54bh@realmail20.socgen.com>
+X-IronPort-AV: i="4.05,80,1146434400"; d="scan'208"; a="26382705:sNHT28778673"
+From: Dsicspiibs.spi-internet@socgen.com
+To: gpc-talk-bounces@grizz.org
+Date: Tue, 2 May 2006 18:42:52 +0200 (MEST)
+Subject: RE: Your message to GPC-talk awaits moderator approval : non remis
+	(delivery failed)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: dsicspiibs.spi-internet@socgen.com
+
+***********************************************
+Votre message n'a pas pu etre delivre a
+duke@ald.socgen.com
+
+***********************************************
+Your message could not be delivered to
+duke@ald.socgen.com
+
+***********************************************
diff --git a/tests/bounces/simple_21.txt b/tests/bounces/simple_21.txt
new file mode 100755
index 00000000..dde9c444
--- /dev/null
+++ b/tests/bounces/simple_21.txt
@@ -0,0 +1,46 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from smtp6-haw.bigfish.com (smtp-haw.frontbridge.com
+	[12.129.219.126])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k55EO4mF019544
+	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=FAIL)
+	for <gpc-talk-bounces@grizz.org>; Mon, 5 Jun 2006 07:24:04 -0700
+Received: from outbound2-ash.bigfish.com (unknown [192.168.52.1])
+	by smtp6-haw.bigfish.com (Postfix) with ESMTP id 8154B66A1DAC
+	for <gpc-talk-bounces@grizz.org>; Mon,  5 Jun 2006 14:23:30 +0000 (UTC)
+Received: from mail43-ash-R.bigfish.com (unknown [172.18.2.3])
+	by outbound2-ash.bigfish.com (Postfix) with ESMTP id 622388946DE
+	for <gpc-talk-bounces@grizz.org>; Mon,  5 Jun 2006 14:23:30 +0000 (UTC)
+Received: from mail43-ash.bigfish.com (localhost.localdomain [127.0.0.1])
+	by mail43-ash-R.bigfish.com (Postfix) with ESMTP id 5400FA2F645
+	for <gpc-talk-bounces@grizz.org>; Mon,  5 Jun 2006 14:23:30 +0000 (UTC)
+X-BigFish: V
+Received: by mail43-ash (MessageSwitch) id 1149517410316439_20007;
+	Mon,  5 Jun 2006 14:23:30 +0000 (UCT)
+Received: from user (mail-cpk.bigfish.com [207.46.163.10])
+	by mail43-ash.bigfish.com (Postfix) with SMTP id 299DEA2EF77
+	for <gpc-talk-bounces@grizz.org>; Mon,  5 Jun 2006 14:23:30 +0000 (UTC)
+MIME-Version: 1.0
+Content-Type: text/plain
+From: MAILER-DAEMON@sb7.songbird.com (Mail Delivery System)
+To: gpc-talk-bounces@grizz.org
+Subject: Warning: message has not yet been delivered
+Message-Id: <20060605142330.299DEA2EF77@mail43-ash.bigfish.com>
+Date: Mon,  5 Jun 2006 14:23:30 +0000 (UTC)
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+Content-Transfer-Encoding: 8bit
+X-MIME-Autoconverted: from quoted-printable to 8bit by sb7.songbird.com id
+	k55EO4mF019544
+
+This is an automated message created by mail delivery software.
+
+Your message to:
+	assumpeatman@dsgmfg.com
+
+has not yet been delivered because the recipient server did not respond.
+
+This is just a warning, you do not need to take any action. We will continue to attempt delivery of this message for 5 days. 
+
+
diff --git a/tests/bounces/simple_22.txt b/tests/bounces/simple_22.txt
new file mode 100755
index 00000000..99b0cc5b
--- /dev/null
+++ b/tests/bounces/simple_22.txt
@@ -0,0 +1,25 @@
+Return-Path: <Symantec_AntiVirus_for_SMTP_Gateways@csri.org>
+Received: from mailscan.csri.org ([66.208.49.51])
+	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2KIvJEj025085
+	for <gpc-talk-bounces@grizz.org>; Mon, 20 Mar 2006 10:57:19 -0800
+Message-Id: <200603201857.k2KIvJEj025085@sb7.songbird.com>
+From: Symantec_AntiVirus_for_SMTP_Gateways@csri.org
+To: gpc-talk-bounces@grizz.org
+Date: Mon, 20 Mar 2006 13:56:41 -0500
+Subject: =?utf-8?B?RGVsaXZlcnkgZmFpbHVyZSBub3RpZmljYXRpb25=?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: symantec_antivirus_for_smtp_gateways@csri.org
+
+Your message with Subject: Re: [GPC] Bike lost and found.... 
+could not be delivered to the following recipients:
+
+RLipton@prev.org
+
+Please do not resend your original message.
+
+Delivery attempts will continue to be made for 5  day(s).
+
+
diff --git a/tests/bounces/simple_23.txt b/tests/bounces/simple_23.txt
new file mode 100755
index 00000000..7399315a
--- /dev/null
+++ b/tests/bounces/simple_23.txt
@@ -0,0 +1,152 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from spock.dadoservice.it (ip-49-45.sn1.eutelia.it [62.94.49.45])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k3H2DwGc027145
+	for <gpc-talk-bounces@grizz.org>; Sun, 16 Apr 2006 19:13:58 -0700
+Subject: Delivery failure
+From: postmaster@spock.dadoservice.it
+Message-Id: <B0024075754@spock.dadoservice.it>
+Date: Mon, 17 Apr 2006 04:07:34 +0200
+To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+Your message has encountered delivery problems
+to local user ketchuy.
+(Originally addressed to ketchuy@dadoservice.it)
+
+User not known
+
+Your message reads (in part):
+
+x-sender: gpc-talk-bounces@grizz.org
+x-receiver: ketchuy@dadoservice.it
+Received: from sb7.songbird.com ([208.184.79.137]) by spock.dadoservice.it  with Microsoft SMTPSVC(5.5.1877.197.19);
+	 Mon, 17 Apr 2006 04:05:35 +0200
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id k3H2BT2f026882
+	for <ketchuy@dadoservice.it>; Sun, 16 Apr 2006 19:11:29 -0700
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: ketchuy@dadoservice.it
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1455621846=="
+Message-ID: <mailman.3129.1145239888.1567.gpc-talk@grizz.org>
+Date: Sun, 16 Apr 2006 19:11:28 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+Return-Path: gpc-talk-bounces@grizz.org
+
+--===============1455621846==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+The results of your email command are provided below. Attached is your
+original message.
+
+- Results:
+    Ignoring non-text/plain MIME parts
+    ketchuy@dadoservice.it is not a member of the GPC-talk mailing list
+
+- Unprocessed:
+    V/AGRjA new
+    =20
+    M e r / d i a=20
+    S o m &=20
+    A m b / e n=20
+    X & n a x=20
+    V a l / u m   $ l , 2 1
+    C / a l i s   $ 3 , 7 5
+    V / a g r a   $ 3 , 3 l
+    =20
+    http://www.mylallinias.com
+
+- Done.
+
+
+--===============1455621846==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <ketchuy@dadoservice.it>
+Received: from agropolis.fi (201-24-69-128.fnsce701.dsl.brasiltelecom.net.br
+	[201.24.69.128])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k3H2Aj68026792
+	for <gpc-talk-unsubscribe@grizz.org>; Sun, 16 Apr 2006 19:11:15 -0700
+Message-ID: <000001c661c3$ef3edff0$3262a8c0@usz27>
+Reply-To: "Bjo Ketchum" <ketchuy@dadoservice.it>
+From: "Bjo Ketchum" <ketchuy@dadoservice.it>
+To: gpc-talk-unsubscribe@grizz.org
+Subject: V/AGRjA new
+Date: Sun, 16 Apr 2006 22:09:18 -0400
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C661A2.682D3FF0"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: ketchuy@dadoservice.it
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0001_01C661A2.682D3FF0
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+=20
+M e r / d i a=20
+S o m &=20
+A m b / e n=20
+X & n a x=20
+V a l / u m   $ l , 2 1
+C / a l i s   $ 3 , 7 5
+V / a g r a   $ 3 , 3 l
+=20
+http://www.mylallinias.com
+
+------=_NextPart_000_0001_01C661A2.682D3FF0
+Content-Type: text/html;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Dus-ascii">
+<META content=3D"MSHTML 6.00.2800.1106" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV>&nbsp;</DIV>
+<DIV> M e r / d i a </DIV>
+<DIV> S o m & </DIV>
+<DIV> A m b / e n </DIV>
+<DIV> X & n a x </DIV>
+<DIV><STRONG> V a l / u m  &nbsp; $ l , 2 1</STRONG></DIV>
+<DIV><STRONG> C / a l i s  &nbsp; $ 3 , 7 5</STRONG></DIV>
+<DIV><STRONG> V / a g r a  &nbsp; $ 3 , 3 l</STRONG></DIV>
+<DIV>&nbsp;</DIV><DIV><A =
+href=3D"http://www.mylallinias.com">http://www.mylallinias.com</A></DIV><=
+/BODY></HTML>
+------=_NextPart_000_0001_01C661A2.682D3FF0--
+
+
+
+
+--===============1455621846==--
+
diff --git a/tests/bounces/simple_24.txt b/tests/bounces/simple_24.txt
new file mode 100755
index 00000000..447a2201
--- /dev/null
+++ b/tests/bounces/simple_24.txt
@@ -0,0 +1,33 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from sl.gomaps.com (www.gomaps.com [207.178.107.65])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k4359uMK016999
+	for <gpc-talk-bounces@grizz.org>; Tue, 2 May 2006 22:09:56 -0700
+Received: from mail pickup service by sl.gomaps.com with Microsoft SMTPSVC;
+	Wed, 3 May 2006 00:09:22 -0500
+Message-ID: <SLND200605030009223890@gomaps.com>
+From: Postmaster <>
+To: gpc-talk-bounces@grizz.org
+Subject: Undeliverable: liberty@gomaps.com
+Date: Wed, 3 May 2006 00:09:22
+MIME-Version: 1.0
+X-Mailer: SpamLion (E 1.60.205)
+Content-Type: text/plain;
+     charset="us-ascii"
+X-OriginalArrivalTime: 03 May 2006 05:09:22.0389 (UTC)
+	FILETIME=[BD5A8850:01C66E6F]
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+--------------------------------------------------------------------------------
+Your Message
+
+To:      <liberty@gomaps.com>
+
+Subject: The results of your email commands
+
+Date:    Tue, 02 May 2006 22:09:32 -0700
+
+Did not reach the following recipient: liberty@gomaps.com
+
diff --git a/tests/bounces/simple_25.txt b/tests/bounces/simple_25.txt
new file mode 100755
index 00000000..1973ca3a
--- /dev/null
+++ b/tests/bounces/simple_25.txt
@@ -0,0 +1,379 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from vipmail-g1.xinnetdns.com (cemail171012.ce.net.cn
+	[210.51.171.12])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k4F8abax003550
+	for <gpc-talk-bounces@grizz.org>; Mon, 15 May 2006 01:36:38 -0700
+Received: (send program); Mon, 15 May 2006 16:35:54 +0800
+Message-ID: <347682154.08417@vipmail-g1.xinnetdns.com>
+Received: (EYOU MTA SYSTEM  8417 invoked for bounce);
+	Mon, 15 May 2006 16:35:54 +0800
+Date: Mon, 15 May 2006 16:35:54 +0800
+From: MAILER-DAEMON@vipmail-g1.xinnetdns.com
+To: gpc-talk-bounces@grizz.org
+Subject: failure notice
+Content-Type: multipart/mixed;
+	boundary="------=_1147682154_8417"
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+This is a multi-part message in MIME format.
+
+--------=_1147682154_8417
+Content-Type: text/html
+
+Hi. This is the deliver program at vipmail-g1.xinnetdns.com.<br>
+    I'm afraid I wasn't able to deliver your message to the following addresses.<br>
+            This is a permanent error; I've given up. Sorry it didn't work out.<br><br>
+
+mahau@cnbearing.com<br>
+
+No such user<br>
+
+--- Attachment is a copy of the message.<br><br>
+
+[这是服务器 vipmail-g1.xinnetdns.com 的投递程序返回的提示信息]<br><br>
+
+<font color=red>到下列地址的信件投递失败，对方服务器无法正常接受或者拒绝接受这封邮件，<br>这是一个永久性的错误，服务器已经放弃继续投递。</font><br>
+mahau@cnbearing.com<br><br>
+
+对方服务器返回错误提示:<br>
+<font color=red>No such user</font><br>
+--<br>
+[附件是您所发送信件的原件]<br>
+--------=_1147682154_8417
+Content-Type: message/rfc822;
+	name="att.eml"
+Content-Disposition: attachment;
+	filename="orig.eml"
+
+Received: (send program); Mon, 15 May 2006 16:35:54 +0800
+Message-ID: <347682154.08120@vipmail-g1.xinnetdns.com>
+Received: from unknown (HELO smg01.ce.net.cn) (210.51.171.27)
+	by 210.51.171.12 with SMTP; Mon, 15 May 2006 16:35:54 +0800
+Return-Path: <gpc-talk-bounces@grizz.org>
+Received: from [208.184.79.137] by 210.51.171.27 with StormMail ESMTP id
+	95530.1569491906; Mon, 15 May 2006 16:35:52 +0800 (CST)
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k4F8a9c0003447
+	for <mahau@cnbearing.com>; Mon, 15 May 2006 01:36:09 -0700
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: mahau@cnbearing.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============0182096736=="
+Message-ID: <mailman.3749.1147682168.1567.gpc-talk@grizz.org>
+Date: Mon, 15 May 2006 01:36:08 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+
+--===============0182096736==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+The results of your email command are provided below. Attached is your
+original message.
+
+- Results:
+    Ignoring non-text/plain MIME parts
+
+- Unprocessed:
+    Your c x re y di g t doesn't ma y tter to us!
+    If you O i WN x r g ea y l e j st k at h e and want
+    I a MM d EDIAT v E c q as q h to s s pe e nd ANY way you like,
+    or simply wish to L o OW x ER your mon d thly p s aym s ent e s
+    by a third or mor j e,
+    here are the d e ea m ls o we ha s ve T r OD j AY:
+    $ 4 r 90 , 00 n 0 a i s lo x w a v s 3 , 6 o 5 %
+    $ 3 n 70 , 00 l 0 a h s l q ow a b s 3 , 9 d 0 %
+    $ 49 y 0 , 00 v 0 a q s lo r w a k s 3 , 2 m 0 %
+    $ 25 l 0 , 0 q 00 a r s l c ow a m s 3 , 3 x 5 %
+    $ 20 d 0 , 00 b 0 a e s l s ow a q s 3 , 5 y 5 %
+    V j is i it ou w r s o it s e <http://geocities.com/AmalneCloutKeith/>=20
+    Pieter Mahaffey , A v ppr y ov z al Ma a na m ge y r
+      _____ =20
+    Well done! Mr. Baggins! he said, clapping Bilbo on the back. There
+    is always more about you than anyone expects! It was Gandalf. For the
+
+- Ignored:
+    first time for many a day Bilbo was really delighted. But there was no
+    time for all the questions that he immediately wished to ask. All in
+    
+
+- Done.
+
+
+--===============0182096736==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <mahau@cnbearing.com>
+Received: from alumnes.udl.es (host90-177.pool877.interbusiness.it
+	[87.7.177.90])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k4F8ZxSe003326
+	for <gpc-talk-request@grizz.org>; Mon, 15 May 2006 01:36:04 -0700
+Message-ID: <000001c677fa$01eb6050$9099a8c0@pvi37>
+Reply-To: "Pieter Mahaffey" <mahau@cnbearing.com>
+From: "Pieter Mahaffey" <mahau@cnbearing.com>
+To: gpc-talk-request@grizz.org
+Subject: Re: your crrdit
+Date: Mon, 15 May 2006 01:31:48 -0700
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C677BF.558EF950"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: mahau@cnbearing.com
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0001_01C677BF.558EF950
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+D v ea a r H w om j e O t wn p er,
+
+Your c x re y di g t doesn't ma y tter to us!
+
+If you O i WN x r g ea y l e j st k at h e and want
+I a MM d EDIAT v E c q as q h to s s pe e nd ANY way you like,
+or simply wish to L o OW x ER your mon d thly p s aym s ent e s
+by a third or mor j e,
+here are the d e ea m ls o we ha s ve T r OD j AY:
+
+$ 4 r 90 , 00 n 0 a i s lo x w a v s 3 , 6 o 5 %
+$ 3 n 70 , 00 l 0 a h s l q ow a b s 3 , 9 d 0 %
+$ 49 y 0 , 00 v 0 a q s lo r w a k s 3 , 2 m 0 %
+$ 25 l 0 , 0 q 00 a r s l c ow a m s 3 , 3 x 5 %
+$ 20 d 0 , 00 b 0 a e s l s ow a q s 3 , 5 y 5 %
+
+V j is i it ou w r s o it s e <http://geocities.com/AmalneCloutKeith/>=20
+
+Pieter Mahaffey , A v ppr y ov z al Ma a na m ge y r
+
+  _____ =20
+
+
+Well done! Mr. Baggins! he said, clapping Bilbo on the back. There
+is always more about you than anyone expects! It was Gandalf. For the
+first time for many a day Bilbo was really delighted. But there was no
+time for all the questions that he immediately wished to ask. All in
+
+
+------=_NextPart_000_0001_01C677BF.558EF950
+Content-Type: text/html;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Dus-ascii">
+<META content=3D"MSHTML 6.00.2800.1106" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><FONT face=3DArial size=3D2>D<SPAN style=3D"FLOAT
+
+:right;"> v </SPAN>ea<SPAN style=3D"FLOAT
+
+:right;"> a </SPAN>r H<SPAN style=3D"FLOAT
+
+:right;"> w </SPAN>om<SPAN style=3D"FLOAT
+
+:right;"> j </SPAN>e O<SPAN style=3D"FLOAT
+
+:right;"> t </SPAN>wn<SPAN style=3D"FLOAT
+
+:right;"> p </SPAN>er,<BR> <BR>
+Your c<SPAN style=3D"FLOAT
+
+:right;"> x </SPAN>re<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>di<SPAN style=3D"FLOAT
+
+:right;"> g </SPAN>t doesn't ma<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>tter to us!<BR> <BR>
+If you O<SPAN style=3D"FLOAT
+
+:right;"> i </SPAN>WN<SPAN style=3D"FLOAT
+
+:right;"> x </SPAN> r<SPAN style=3D"FLOAT
+
+:right;"> g </SPAN>ea<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>l e<SPAN style=3D"FLOAT
+
+:right;"> j </SPAN>st<SPAN style=3D"FLOAT
+
+:right;"> k </SPAN>at<SPAN style=3D"FLOAT
+
+:right;"> h </SPAN>e and want<BR>
+I<SPAN style=3D"FLOAT
+
+:right;"> a </SPAN>MM<SPAN style=3D"FLOAT
+
+:right;"> d </SPAN>EDIAT<SPAN style=3D"FLOAT
+
+:right;"> v </SPAN>E c<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>as<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>h to s<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>pe<SPAN style=3D"FLOAT
+
+:right;"> e </SPAN>nd ANY=20
+way you like,<BR> or simply wish to L<SPAN style=3D"FLOAT
+
+:right;"> o </SPAN>OW<SPAN style=3D"FLOAT
+
+:right;"> x </SPAN>ER your mon<SPAN style=3D"FLOAT
+
+:right;"> d </SPAN>thly p<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>aym<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>ent<SPAN style=3D"FLOAT
+
+:right;"> e </SPAN>s<BR>=20
+by a third or mor<SPAN style=3D"FLOAT
+
+:right;"> j </SPAN>e,<BR> here are the d<SPAN style=3D"FLOAT
+
+:right;"> e </SPAN>ea<SPAN style=3D"FLOAT
+
+:right;"> m </SPAN>ls<SPAN style=3D"FLOAT
+
+:right;"> o </SPAN> we ha<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>ve T<SPAN style=3D"FLOAT
+
+:right;"> r </SPAN>OD<SPAN style=3D"FLOAT
+
+:right;"> j </SPAN>AY:<BR> <BR>
+$ 4<SPAN style=3D"FLOAT
+
+:right;"> r </SPAN>90 , 00<SPAN style=3D"FLOAT
+
+:right;"> n </SPAN>0 a<SPAN style=3D"FLOAT
+
+:right;"> i </SPAN>s lo<SPAN style=3D"FLOAT
+
+:right;"> x </SPAN>w a<SPAN style=3D"FLOAT
+
+:right;"> v </SPAN>s 3 , 6<SPAN style=3D"FLOAT
+
+:right;"> o </SPAN>5 %<BR>
+$ 3<SPAN style=3D"FLOAT
+
+:right;"> n </SPAN>70 , 00<SPAN style=3D"FLOAT
+
+:right;"> l </SPAN>0 a<SPAN style=3D"FLOAT
+
+:right;"> h </SPAN>s l<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>ow a<SPAN style=3D"FLOAT
+
+:right;"> b </SPAN>s 3 , 9<SPAN style=3D"FLOAT
+
+:right;"> d </SPAN>0 %<BR>
+$ 49<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>0 , 00<SPAN style=3D"FLOAT
+
+:right;"> v </SPAN>0 a<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>s lo<SPAN style=3D"FLOAT
+
+:right;"> r </SPAN>w a<SPAN style=3D"FLOAT
+
+:right;"> k </SPAN>s 3 , 2<SPAN style=3D"FLOAT
+
+:right;"> m </SPAN>0 %<BR>
+$ 25<SPAN style=3D"FLOAT
+
+:right;"> l </SPAN>0 , 0<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>00 a<SPAN style=3D"FLOAT
+
+:right;"> r </SPAN>s l<SPAN style=3D"FLOAT
+
+:right;"> c </SPAN>ow a<SPAN style=3D"FLOAT
+
+:right;"> m </SPAN>s 3 , 3<SPAN style=3D"FLOAT
+
+:right;"> x </SPAN>5 %<BR>
+$ 20<SPAN style=3D"FLOAT
+
+:right;"> d </SPAN>0 , 00<SPAN style=3D"FLOAT
+
+:right;"> b </SPAN>0 a<SPAN style=3D"FLOAT
+
+:right;"> e </SPAN>s l<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>ow a<SPAN style=3D"FLOAT
+
+:right;"> q </SPAN>s 3 , 5<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>5 %<BR>
+<BR>
+<A href=3D"http://geocities.com/AmalneCloutKeith/">V<SPAN style=3D"FLOAT
+
+:right;"> j </SPAN>is<SPAN style=3D"FLOAT
+
+:right;"> i </SPAN>it ou<SPAN style=3D"FLOAT
+
+:right;"> w </SPAN>r s<SPAN style=3D"FLOAT
+
+:right;"> o </SPAN>it<SPAN style=3D"FLOAT
+
+:right;"> s </SPAN>e</A><BR>
+<BR>
+Pieter Mahaffey , A<SPAN style=3D"FLOAT
+
+:right;"> v </SPAN>ppr<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>ov<SPAN style=3D"FLOAT
+
+:right;"> z </SPAN>al Ma<SPAN style=3D"FLOAT
+
+:right;"> a </SPAN>na<SPAN style=3D"FLOAT
+
+:right;"> m </SPAN>ge<SPAN style=3D"FLOAT
+
+:right;"> y </SPAN>r</FONT></DIV>
+<DIV><BR><HR><BR><FONT face=3DArial size=3D2>   Well done! Mr. Baggins! =
+he said, clapping Bilbo on the back. There<BR>
+is always more about you than anyone expects! It was Gandalf. For =
+the<BR>
+first time for many a day Bilbo was really delighted. But there was =
+no<BR>
+time for all the questions that he immediately wished to ask. All =
+in<BR></FONT></DIV></BODY></HTML>
+------=_NextPart_000_0001_01C677BF.558EF950--
+
+
+
+
+--===============0182096736==--
+--------=_1147682154_8417--
+
diff --git a/tests/bounces/simple_26.txt b/tests/bounces/simple_26.txt
new file mode 100755
index 00000000..4c868946
--- /dev/null
+++ b/tests/bounces/simple_26.txt
@@ -0,0 +1,74 @@
+Return-Path: <MAILER-DAEMON@sb7.songbird.com>
+Received: from boeing.ieo-research.it (boeing.ieo-research.it [85.239.176.145])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k3MHGOfW014766
+	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
+	for <wed_ride-bounces@grizz.org>; Sat, 22 Apr 2006 10:16:25 -0700
+Received: (qmail 41487 invoked by uid 809); 22 Apr 2006 17:14:50 -0000
+Message-ID: <20060422171450.41486.qmail@boeing.ieo-research.it>
+Content-Disposition: inline
+Content-Transfer-Encoding: binary
+Content-Type: text/plain
+MIME-Version: 1.0
+X-Mailer: MIME::Lite 3.01 (F2.73; A1.66; B3.05; Q3.03)
+Date: Sat, 22 Apr 2006 17:14:50 UT
+From: IFOM-IEO Campus Mailserver <MAILER-DAEMON@ifom-ieo-campus.it>
+To: wed_ride-owner@grizz.org
+Subject: Your message to reilizavet@lar.ieo.it could not be delivered.
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+Hello,
+
+this is the email server at IFOM-IEO Campus.
+
+Your message to reilizavet@lar.ieo.it has reached our local address 
+reilizavet@lar.ieo.it, but this email address is wrong or no longer valid.
+
+Your message has NOT been delivered.
+
+You can find all the addresses in the campus on our web site at
+http://www.ifom-ieo-campus.it under the "Contacts" area.
+
+Best regards.
+
+A summary of the undelivered message you sent follows:
+--------------
+Subject: Re: PHugzARMACY
+From: wed_ride-owner@grizz.org
+To: reilizavet@lar.ieo.it
+Date: Sat, 22 Apr 2006 10:16:00 -0700
+
+--===============0374038884==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+You are not allowed to post to this mailing list, and your message has
+been automatically rejected.  If you think that your messages are
+being rejected in error, contact the mailing list owner at
+wed_ride-owner@grizz.org.
+
+
+--===============0374038884==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <reilizavet@lar.ieo.it>
+Received: from lar.ieo.it (nor75-5-82-235-173-174.fbx.proxad.net
+	[82.235.173.174])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k3MHFfsa014457
+	for <wed_ride@grizz.org>; Sat, 22 Apr 2006 10:15:43 -0700
+Message-ID: <000001c66630$3e9dcc30$a4e5a8c0@cuw44>
+Reply-To: "Lizaveta Reisinger" <reilizavet@lar.ieo.it>
+From: "Lizaveta Reisinger" <reilizavet@lar.ieo.it>
+To: wed_ride@grizz.org
+Subject: Re: PHugzARMACY
+Date: Sat, 22 Apr 2006 13:14:42 -0400
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C6660E.B78C2C30"
+... [message truncated]
+
diff --git a/tests/bounces/simple_27.txt b/tests/bounces/simple_27.txt
new file mode 100755
index 00000000..ad1abf2c
--- /dev/null
+++ b/tests/bounces/simple_27.txt
@@ -0,0 +1,279 @@
+Return-Path: <MDaemon@webmail.pla.net.py>
+Received: from webmail.pla.net.py (ms4-jupiter.pla.net.py [201.217.19.3])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k3BAZX1M004077
+	for <gpc-talk-bounces@grizz.org>; Tue, 11 Apr 2006 03:35:35 -0700
+Received: from webmail.pla.net.py [201.217.19.3] by webmail.pla.net.py
+	[201.217.19.3] with RAW (MDaemon.PRO.v5.0.4.R)
+	for <gpc-talk-bounces@grizz.org>; Tue, 11 Apr 2006 06:30:59 -0300
+Date: Tue, 11 Apr 2006 06:30:59 -0300
+From: MDaemon@webmail.pla.net.py
+Reply-To: MDaemon@webmail.pla.net.py
+Precedence: bulk
+X-MDSend-Notifications-To: [trash]
+Subject: Warning: kulp@webmail.pla.net.py - User unknown!
+To: gpc-talk-bounces@grizz.org
+X-MDaemon-Deliver-To: gpc-talk-bounces@grizz.org
+Message-ID: <MDAEMON11221122200604110630.AA3059037@webmail.pla.net.py>
+Mime-Version: 1.0
+X-Actual-From: MDaemon@webmail.pla.net.py
+Content-Type: multipart/mixed; boundary="0411-0630-59-PART-BREAK"
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: mdaemon@webmail.pla.net.py
+
+   The following data may contain sections which represent BASE64 encoded
+   file attachments.  These sections will be unreadable without MIME aware
+   tools.  Seek your system administrator if you need help extracting any
+   files which may be embedded within this message.
+
+--0411-0630-59-PART-BREAK
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+
+kulp@webmail.pla.net.py - no such user here.
+
+There is no user by that name at this server.
+
+: Message contains [1] file attachments
+
+--0411-0630-59-PART-BREAK
+Content-Type: message/rfc822; charset=US-ASCII; name="pd75019146383.md"
+Content-Transfer-Encoding: 7bit
+Content-ID: <MDAEMON11221122200604110630.AA3059037@webmail.pla.net.py>
+Content-Description: 
+
+Return-path: <gpc-talk-bounces@grizz.org>
+Received: from sb7.songbird.com [208.184.79.137]
+	by webmail.pla.net.py [201.217.19.3] with SMTP (MDaemon.PRO.v5.0.4.R)
+	for <kulp@webmail.pla.net.py>; Tue, 11 Apr 2006 06:30:52 -0300
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	k3BAYxac003924
+	for <kulp@webmail.com.py>; Tue, 11 Apr 2006 03:34:59 -0700
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: kulp@webmail.com.py
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1667214205=="
+Message-ID: <mailman.3020.1144751698.1567.gpc-talk@grizz.org>
+Date: Tue, 11 Apr 2006 03:34:58 -0700
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+X-Lookup-Warning: reverse lookup on original sender failed
+X-MDRcpt-To: kulp@webmail.com.py
+X-MDRemoteIP: 208.184.79.137
+X-Return-Path: gpc-talk-bounces@grizz.org
+X-MDaemon-Deliver-To: kulp@webmail.pla.net.py
+
+--===============1667214205==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+The results of your email command are provided below. Attached is your
+original message.
+
+- Results:
+    Ignoring non-text/plain MIME parts
+
+- Unprocessed:
+     =20
+    Your c e red t it doesn't matter to us ! If you OW q N real e y st l at
+    r e=20
+    and want I x MME n DIAT w E ca h sh to sp g e{ o nd ANY way you like, or
+    simply wish=20
+    to LO h WER your monthly pa o ymen s ts by a third or more, here are the
+    dea t ls=20
+    we have T o OD m AY :=20
+     =20
+    $ 48 z 8 , 000 at a 3 , 6 g 7% fi j xed - rat r e=20
+    $ 37 z 2 , 000 at a 3 , g 90% va u riab n le - rat g e=20
+    $ 4 w 92 , 000 at a 3 , 2 x 1% i g ntere l st - only=20
+    $ 24 x 8 , 000 at a 3 e , 36% f o ixed - rat c e=20
+    $ 1 o 98 , 000 at a 3 d , 55% varia s ble - rat w e=20
+     =20
+    Hur x ry, when these deaI e s are gone, they are gone !
+     =20
+    Don't worry about app f ro r val, your c m redi p t will not di z
+    squalif i y you !=20
+     =20
+    V g isi l t our h site <http://teaa48.k4829.net>=20
+     =20
+    Sincerely, Leander Kulp=20
+     =20
+
+- Ignored:
+    A z ppro h val Manager
+    
+
+- Done.
+
+
+--===============1667214205==
+Content-Type: message/rfc822
+MIME-Version: 1.0
+
+Return-Path: <kulp@webmail.com.py>
+Received: from viem.ru (81-170-4-166.homechoice.co.uk [81.170.4.166] (may be
+	forged)) by sb7.songbird.com (8.12.11.20060308/8.12.11) with SMTP id
+	k3BAYjnP003824
+	for <gpc-talk-request@grizz.org>; Tue, 11 Apr 2006 03:34:54 -0700
+Message-ID: <000001c65d53$7091cd30$2e8ea8c0@kkb85>
+Reply-To: "Leander Kulp" <kulp@webmail.com.py>
+From: "Leander Kulp" <kulp@webmail.com.py>
+To: gpc-talk-request@grizz.org
+Subject: Re: xeqet news
+Date: Tue, 11 Apr 2006 06:33:57 -0400
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0001_01C65D31.E9802D30"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: kulp@webmail.com.py
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0001_01C65D31.E9802D30
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+Dea s r Home O t wne z r ,=20
+ =20
+Your c e red t it doesn't matter to us ! If you OW q N real e y st l at
+r e=20
+and want I x MME n DIAT w E ca h sh to sp g e{ o nd ANY way you like, or
+simply wish=20
+to LO h WER your monthly pa o ymen s ts by a third or more, here are the
+dea t ls=20
+we have T o OD m AY :=20
+ =20
+$ 48 z 8 , 000 at a 3 , 6 g 7% fi j xed - rat r e=20
+$ 37 z 2 , 000 at a 3 , g 90% va u riab n le - rat g e=20
+$ 4 w 92 , 000 at a 3 , 2 x 1% i g ntere l st - only=20
+$ 24 x 8 , 000 at a 3 e , 36% f o ixed - rat c e=20
+$ 1 o 98 , 000 at a 3 d , 55% varia s ble - rat w e=20
+ =20
+Hur x ry, when these deaI e s are gone, they are gone !
+ =20
+Don't worry about app f ro r val, your c m redi p t will not di z
+squalif i y you !=20
+ =20
+V g isi l t our h site <http://teaa48.k4829.net>=20
+ =20
+Sincerely, Leander Kulp=20
+ =20
+A z ppro h val Manager
+
+
+------=_NextPart_000_0001_01C65D31.E9802D30
+Content-Type: text/html;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Dus-ascii">
+<META content=3D"MSHTML 6.00.2800.1106" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><FONT face=3DArial size=3D2>Dea<span style=3D"border: 0px; float
+: right"> s </span>r Home O<span style=3D"border: 0px; float
+: right"> t </span>wne<span style=3D"border: 0px; float
+: right"> z </span>r , <BR>
+&nbsp; <BR>
+Your c<span style=3D"border: 0px; float
+: right"> e </span>red<span style=3D"border: 0px; float
+: right"> t </span>it doesn't matter to us !=20
+If you OW<span style=3D"border: 0px; float
+: right"> q </span>N real e<span style=3D"border: 0px; float
+: right"> y </span>st<span style=3D"border: 0px; float
+: right"> l </span>at<span style=3D"border: 0px; float
+: right"> r </span>e <BR>
+and want I<span style=3D"border: 0px; float
+: right"> x </span>MME<span style=3D"border: 0px; float
+: right"> n </span>DIAT<span style=3D"border: 0px; float
+: right"> w </span>E ca<span style=3D"border: 0px; float
+: right"> h </span>sh to sp<span style=3D"border: 0px; float
+: right"> g </span>e{<span style=3D"border: 0px; float
+: right"> o </span>nd ANY=20
+way you like, or simply wish <BR> to LO<span style=3D"border: 0px; float
+: right"> h </span>WER your monthly pa<span style=3D"border: 0px; float
+: right"> o </span>ymen<span style=3D"border: 0px; float
+: right"> s </span>ts=20
+by a third or more, here are the dea<span style=3D"border: 0px; float
+: right"> t </span>ls <BR> we have T<span style=3D"border: 0px; float
+: right"> o </span>OD<span style=3D"border: 0px; float
+: right"> m </span>AY : <BR>
+&nbsp; <BR>
+$ 48<span style=3D"border: 0px; float
+: right"> z </span>8 , 000 at a 3 , 6<span style=3D"border: 0px; float
+: right"> g </span>7% fi<span style=3D"border: 0px; float
+: right"> j </span>xed - rat<span style=3D"border: 0px; float
+: right"> r </span>e <BR>
+$ 37<span style=3D"border: 0px; float
+: right"> z </span>2 , 000 at a 3 ,<span style=3D"border: 0px; float
+: right"> g </span> 90% va<span style=3D"border: 0px; float
+: right"> u </span>riab<span style=3D"border: 0px; float
+: right"> n </span>le - rat<span style=3D"border: 0px; float
+: right"> g </span>e <BR>
+$ 4<span style=3D"border: 0px; float
+: right"> w </span>92 , 000 at a 3 , 2<span style=3D"border: 0px; float
+: right"> x </span>1% i<span style=3D"border: 0px; float
+: right"> g </span>ntere<span style=3D"border: 0px; float
+: right"> l </span>st - only <BR>
+$ 24<span style=3D"border: 0px; float
+: right"> x </span>8 , 000 at a 3 <span style=3D"border: 0px; float
+: right"> e </span>, 36% f<span style=3D"border: 0px; float
+: right"> o </span>ixed - rat<span style=3D"border: 0px; float
+: right"> c </span>e <BR>
+$ 1<span style=3D"border: 0px; float
+: right"> o </span>98 , 000 at a 3<span style=3D"border: 0px; float
+: right"> d </span> , 55% varia<span style=3D"border: 0px; float
+: right"> s </span>ble - rat<span style=3D"border: 0px; float
+: right"> w </span>e <BR>
+&nbsp; <BR>
+Hur<span style=3D"border: 0px; float
+: right"> x </span>ry, when these deaI<span style=3D"border: 0px; float
+: right"> e </span>s are gone, they are gone !<BR>
+&nbsp; <BR>
+Don't worry about app<span style=3D"border: 0px; float
+: right"> f </span>ro<span style=3D"border: 0px; float
+: right"> r </span>val, your c<span style=3D"border: 0px; float
+: right"> m </span>redi<span style=3D"border: 0px; float
+: right"> p </span>t will=20
+not di<span style=3D"border: 0px; float
+: right"> z </span>squalif<span style=3D"border: 0px; float
+: right"> i </span>y you ! <BR> &nbsp; <BR>=20
+<A href=3D"http://teaa48.k4829.net">V<span style=3D"border: 0px; float
+: right"> g </span>isi<span style=3D"border: 0px; float
+: right"> l </span>t our<span style=3D"border: 0px; float
+: right"> h </span> site</A><BR> &nbsp; <BR>
+Sincerely, Leander Kulp <BR> &nbsp; <BR>
+A<span style=3D"border: 0px; float
+: right"> z </span>ppro<span style=3D"border: 0px; float
+: right"> h </span>val Manager<BR></FONT></DIV></BODY></HTML>
+------=_NextPart_000_0001_01C65D31.E9802D30--
+
+
+
+
+--===============1667214205==--
+
+--0411-0630-59-PART-BREAK--
+
diff --git a/tests/bounces/smtp32_07.txt b/tests/bounces/smtp32_07.txt
new file mode 100755
index 00000000..08167373
--- /dev/null
+++ b/tests/bounces/smtp32_07.txt
@@ -0,0 +1,81 @@
+Received: from smtp.digikom.net (smtp.digikom.net [195.43.38.47])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id
+	kBP0vmk8004590
+	for <gpc-talk-bounces@grizz.org>; Sun, 24 Dec 2006 16:57:49 -0800
+Received: from s05.dknet.se ([195.43.38.5]) by smtp.digikom.net with Microsoft
+	SMTPSVC(5.0.2195.6713); Mon, 25 Dec 2006 01:57:36 +0100
+Date: Mon, 25 Dec 2006 01:57:35 +0100
+Message-Id: <10612250157.AA21532089@s05.dknet.se>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+From: "Postmaster" <postmaster@s05.dknet.se>
+Sender: <postmaster@s05.dknet.se>
+To: <gpc-talk-bounces@grizz.org>
+Subject: Undeliverable Mail
+X-Mailer: <SMTP32 v8.15>
+X-Declude-Sender: <> [208.184.79.137]
+X-OriginalArrivalTime: 25 Dec 2006 00:57:36.0535 (UTC)
+	FILETIME=[AB0D2270:01C727BF]
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: 
+
+Invalid final delivery userid: info@husbyran.com
+
+
+Original message follows.
+
+Received: from sb7.songbird.com [208.184.79.137] by s05.dknet.se with ESMTP
+  (SMTPD32-8.15) id A1F789D00148; Mon, 25 Dec 2006 01:57:27 +0100
+Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
+	by sb7.songbird.com (8.12.11.20060308/8.12.11) with ESMTP id kBP0vFHx004449
+	for <powell@husbyran.com>; Sun, 24 Dec 2006 16:57:15 -0800
+Subject: The results of your email commands
+From: gpc-talk-bounces@grizz.org
+To: powell@husbyran.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============1423078280=="
+Message-ID: <mailman.17028.1167008234.1567.gpc-talk@grizz.org>
+Date: Sun, 24 Dec 2006 16:57:14 -0800
+Precedence: bulk
+X-BeenThere: gpc-talk@grizz.org
+X-Mailman-Version: 2.1.5
+List-Id: Grizzly Peak Cyclists general discussion list <gpc-talk.grizz.org>
+X-List-Administrivia: yes
+Sender: gpc-talk-bounces@grizz.org
+Errors-To: gpc-talk-bounces@grizz.org
+X-SongbirdInformation: support@songbird.com for more information
+X-Songbird: Clean
+X-Songbird-From: gpc-talk-bounces@grizz.org
+X-Declude-Sender: gpc-talk-bounces@grizz.org [208.184.79.137]
+
+--===============1423078280==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+The results of your email command are provided below. Attached is your
+original message.
+
+- Results:
+    Powell@husbyran.com is not a member of the GPC-talk mailing list
+
+- Unprocessed:
+    + 5 inches or money back
+    YO Chap
+    I don't care why your member is so small, but 82% of women do.
+    They are pretty sure that bigger Johnson will make their desire
+    stronger. You have the chance to change your life.
+    Here http://www.baleful.us you can get the thing.
+    It will help you for sure.
+    The remedy can be sent worldwide.
+    If you wont be satisfied - we will return all you money.
+    No bullshit.
+    -- 
+    sknkoinmrnohnlnjnhrmotnhotoqnsniohnfopolofqlofnpofnfngshohnron
+    dfkjghwenflgkdwdfwkjgghs
+    was whirling round inside his head. Among  them were the villa in Nice,  the
+
+[message truncated]
+
+
diff --git a/tests/test_bounces.py b/tests/test_bounces.py
index 91d79403..649ecf13 100644
--- a/tests/test_bounces.py
+++ b/tests/test_bounces.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -57,10 +57,21 @@ class BounceTest(unittest.TestCase):
                                           'iqxwmmfauudpo@dachamp.com']),
         ('SimpleMatch', 'simple_15.txt', ['isam@kviv.be']),
         ('SimpleMatch', 'simple_16.txt', ['xvlogtfsei@the-messenger.com']),
+        ('SimpleMatch', 'simple_17.txt', ['internetsailing@gmail.com']),
+        ('SimpleMatch', 'simple_18.txt', ['powell@kesslersupply.com']),
+        ('SimpleMatch', 'simple_19.txt', ['mcfall@cepi.com.ar']),
+        ('SimpleMatch', 'simple_20.txt', ['duke@ald.socgen.com']),
+        ('SimpleMatch', 'simple_23.txt', ['ketchuy@dadoservice.it']),
+        ('SimpleMatch', 'simple_24.txt', ['liberty@gomaps.com']),
+        ('SimpleMatch', 'simple_25.txt', ['mahau@cnbearing.com']),
+        ('SimpleMatch', 'simple_26.txt', ['reilizavet@lar.ieo.it']),
+        ('SimpleMatch', 'simple_27.txt', ['kulp@webmail.pla.net.py']),
         ('SimpleMatch', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']),
         ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']),
         # SimpleWarning
         ('SimpleWarning', 'simple_03.txt', Stop),
+        ('SimpleWarning', 'simple_21.txt', Stop),
+        ('SimpleWarning', 'simple_22.txt', Stop),
         # GroupWise
         ('GroupWise', 'groupwise_01.txt', ['thoff@MAINEX1.ASU.EDU']),
         # This one really sucks 'cause it's text/html.  Just make sure it
@@ -87,6 +98,7 @@ class BounceTest(unittest.TestCase):
         ('DSN', 'dsn_12.txt', ['auaauqdgrdz@jtc-con.co.jp']),
         ('DSN', 'dsn_13.txt', ['marcooherbst@cardinal.com']),
         ('DSN', 'dsn_14.txt', ['artboardregistration@home.dk']),
+        ('DSN', 'dsn_15.txt', ['horu@ccc-ces.com']),
         # Microsoft Exchange
         ('Exchange', 'microsoft_01.txt', ['DJBENNETT@IKON.COM']),
         ('Exchange', 'microsoft_02.txt', ['MDMOORE@BALL.COM']),
@@ -98,10 +110,13 @@ class BounceTest(unittest.TestCase):
                                      'one_bad_address@pacbell.net']),
         ('SMTP32', 'smtp32_05.txt', ['jmrpowersports@jmrpowersports.com']),
         ('SMTP32', 'smtp32_06.txt', ['Absolute_garbage_addr@pacbell.net']),
+        ('SMTP32', 'smtp32_07.txt', ['info@husbyran.com']),
         # Qmail
         ('Qmail', 'qmail_01.txt', ['psadisc@wwwmail.n-h.de']),
         ('Qmail', 'qmail_02.txt', ['rauschlo@frontfin.com']),
         ('Qmail', 'qmail_03.txt', ['crown@hbc.co.jp']),
+        ('Qmail', 'qmail_04.txt', ['merotiia@tennisnsw.com.au']),
+        ('Qmail', 'qmail_05.txt', ['ivokggrrdvc@caixaforte.freeservers.com']),
         # LLNL's custom Sendmail
         ('LLNL', 'llnl_01.txt', ['trotts1@llnl.gov']),
         # Netscape's server...