Sanitized the bounce test data.

99 files changed, 657 insertions, 6094 deletions

diff --git a/tests/bounces/bounce_01.txt b/tests/bounces/bounce_01.txt
index ab7f45d4..1dec2668 100644
--- a/tests/bounces/bounce_01.txt
+++ b/tests/bounces/bounce_01.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "" "6" "February" "2001" "14:41:27" "GMT" "\"Jetmail System\" <>" "\"Jetmail System\" <>" nil "48" "Mail Error" "^From:" nil nil "2" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id 1AE74D37AC
-	for <barry@wooz.org>; Tue,  6 Feb 2001 01:41:50 -0500 (EST)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id 1AE74D37AC
+	for <usery@example.org>; Tue,  6 Feb 2001 01:41:50 -0500 (EST)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.3.2)
+  by example.com (CommuniGate Pro RULES 3.3.2)
   with RULES id 1443386; Tue, 06 Feb 2001 01:43:53 -0500
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.3.2)
-  with ESMTP id 1443385 for barry@mail.digicool.com; Tue, 06 Feb 2001 01:43:53 -0500
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.3.2)
+  with ESMTP id 1443385 for usery@mail.example.com; Tue, 06 Feb 2001 01:43:53 -0500
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id BAA24701
-	for <barry@digicool.com>; Tue, 6 Feb 2001 01:42:30 -0500
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id BAA24701
+	for <usery@example.com>; Tue, 6 Feb 2001 01:42:30 -0500
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14Q1pg-0006hx-00
-	for barry@digicool.com; Tue, 06 Feb 2001 01:42:32 -0500
+	for usery@example.com; Tue, 06 Feb 2001 01:42:32 -0500
 Received: from host2.btamail.net.cn ([202.106.196.72] helo=btamail.net.cn)
 	by mail.python.org with smtp (Exim 3.21 #1)
 	id 14Q1oj-0006ek-00
@@ -52,29 +52,29 @@ Please check the above address(es) and then try again.
 
 ---- Header of the source mail attached ----
 
-Received: from bjmx2.163.net([202.108.255.253]) by btamail.net.cn(JetMail 2.5.3.0)
+Received: from bjmx2.example.net([202.108.255.253]) by btamail.net.cn(JetMail 2.5.3.0)
 	with SMTP id jmb3a800bb6; Tue,  6 Feb 2001 06:41:26 -0000
-Received: by bjmx2.163.net (Postfix)
+Received: by bjmx2.example.net (Postfix)
 	id ; Tue,  6 Feb 2001 06:31:28 +0800 (CST)
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by bjmx2.163.net (Postfix) with ESMTP id A468F1CB4210C
-	for <windchi@163.net>; Tue,  6 Feb 2001 06:31:27 +0800 (CST)
+	by bjmx2.example.net (Postfix) with ESMTP id A468F1CB4210C
+	for <userz@example.net>; Tue,  6 Feb 2001 06:31:27 +0800 (CST)
 Received: from mail.python.org (localhost.localdomain [127.0.0.1])
 	by mail.python.org (Postfix) with ESMTP
 	id 1B087E827; Mon,  5 Feb 2001 17:31:27 -0500 (EST)
 Delivered-To: mm+python-list@python.org
-Received: from onca.catsden.net (unknown [216.218.194.20])
+Received: from onca.example.net (unknown [216.218.194.20])
 	by mail.python.org (Postfix) with ESMTP id F004BE72E
 	for <python-list@python.org>; Mon,  5 Feb 2001 17:30:44 -0500 (EST)
 Received: from localhost (chris@localhost)
-	by onca.catsden.net (8.9.3/8.9.3) with ESMTP id OAA28446;
+	by onca.example.net (8.9.3/8.9.3) with ESMTP id OAA28446;
 	Mon, 5 Feb 2001 14:23:15 -0800
-From: <chris@onca.catsden.net>
-To: Sam Wun <swun@esec.com.au>
+From: <chris@onca.example.net>
+To: Sam Wun <swun@example.com.au>
 Cc: <python-list@python.org>
 Subject: Re: sorting on IP addresses
 In-Reply-To: <3A7F26CB.BE85C96F@esec.com.au>
-Message-ID: <Pine.LNX.4.30.0102051415240.27504-100000@onca.catsden.net>
+Message-ID: <Pine.LNX.4.30.0102051415240.27504-100000@onca.example.net>
 MIME-Version: 1.0
 Content-Type: TEXT/PLAIN; charset=US-ASCII
 Sender: python-list-admin@python.org
diff --git a/tests/bounces/bounce_02.txt b/tests/bounces/bounce_02.txt
index 0f7d7f32..29921417 100644
--- a/tests/bounces/bounce_02.txt
+++ b/tests/bounces/bounce_02.txt
@@ -1,36 +1,36 @@
-From: E500_SMTP_Mail_Service@lerctr.org
-To: <macarthur1975-bounces@lerctr.org>
+From: E500_SMTP_Mail_Service@example.org
+To: <macarthur1975-bounces@example.org>
 Subject: Returned Mail - Error During Delivery
 Date: Wed, 20 Nov 2002 19:58:47 -0500 (EST)
 X-Virus-Scanned: by amavisd-milter (http://amavis.org/)
 
 ------ Failed Recipients ------
 
-<acinsp1@midsouth.rr.com>: Requested action not taken: mailbox unavailable. [SMTP Error Code 550]
+<userx@example.com>: Requested action not taken: mailbox unavailable. [SMTP Error Code 550]
 -------- Returned Mail --------
 
 Received: from tnmx01.mgw.rr.com(24.165.200.11) by tnav01.midsouth.rr.com via csmap 
 	 id 26013; Wed, 20 Nov 2002 19:58:47 -0500 (EST)
-Received: from lerami.lerctr.org (lerami.lerctr.org [207.158.72.11])
+Received: from lerami.example.org (lerami.lerctr.org [207.158.72.11])
 	by tnmx01.mgw.rr.com (8.12.5/8.12.5) with ESMTP id gAL0wLBM020447
-	for <acinsp1@midsouth.rr.com>; Wed, 20 Nov 2002 19:58:21 -0500 (EST)
-Received: from lerami.lerctr.org (localhost [127.0.0.1])
-	by lerami.lerctr.org (8.12.6/8.12.6/20020902/$Revision: 5940 $) with ESMTP id gAL0wHwV016400
-	for <acinsp1@midsouth.rr.com>; Wed, 20 Nov 2002 18:58:18 -0600 (CST)
+	for <userx@example.com>; Wed, 20 Nov 2002 19:58:21 -0500 (EST)
+Received: from lerami.example.org (localhost [127.0.0.1])
+	by lerami.example.org (8.12.6/8.12.6/20020902/$Revision: 5940 $) with ESMTP id gAL0wHwV016400
+	for <userx@example.com>; Wed, 20 Nov 2002 18:58:18 -0600 (CST)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Subject: You have been unsubscribed from the MacArthur1975 mailing list
-From: macarthur1975-bounces@lerctr.org
-To: acinsp1@midsouth.rr.com
-Message-ID: <mailman.0.1037840296.16399.macarthur1975@lerctr.org>
+From: macarthur1975-bounces@example.org
+To: userx@example.com
+Message-ID: <mailman.0.1037840296.16399.macarthur1975@example.org>
 Date: Wed, 20 Nov 2002 18:58:16 -0600
 Precedence: bulk
-X-BeenThere: macarthur1975@lerctr.org
+X-BeenThere: macarthur1975@example.org
 X-Mailman-Version: 2.1b4
-List-Id: MacArthur Class of 1975 Discussion <macarthur1975.lerctr.org>
+List-Id: MacArthur Class of 1975 Discussion <macarthur1975.example.org>
 X-List-Administrivia: yes
-Sender: macarthur1975-bounces@lerctr.org
-Errors-To: macarthur1975-bounces@lerctr.org
+Sender: macarthur1975-bounces@example.org
+Errors-To: macarthur1975-bounces@example.org
 X-Virus-Scanned: by amavisd-milter (http://amavis.org/)
 
diff --git a/tests/bounces/bounce_03.txt b/tests/bounces/bounce_03.txt
index fc62dcab..5d8a20b6 100644
--- a/tests/bounces/bounce_03.txt
+++ b/tests/bounces/bounce_03.txt
@@ -18,14 +18,14 @@ This message was created automatically by mail delivery
 software. A message that you sent could not be delivered
 to all of its recipients.
 
-The following message, addressed to 'james@jeborall.demon.co.uk',
+The following message, addressed to 'userx@example.uk',
 failed because it has not been collected after 30 days
 
 Here is a copy of the first part of the message, including
 all headers.
 
 ---- START OF RETURNED MESSAGE ----
-Received: from punt-2.mail.demon.net by mailstore for james@jeborall.demon.co.uk
+Received: from punt-2.mail.demon.net by mailstore for userx@example.uk
           id 1035738253:20:01723:229; Sun, 27 Oct 2002 17:04:13 GMT
 Received: from mail.python.org ([12.155.117.29]) by punt-2.mail.demon.net
            id aa2004462; 27 Oct 2002 17:02 GMT
@@ -80,20 +80,6 @@ Content-description: Today's Topics (14 msgs)
 
 Today's Topics:
 
-   1. RELEASED Mailman 2.1 beta 4 (Barry A. Warsaw)
-   2. bin/arch not working (Aparajita Fishman)
-   3. Can't receive mail (Aparajita Fishman)
-   4. I have the same problem with the list not sending mail..but
-       getting confirmations... (jared sanders)
-   5. Re: RELEASED Mailman 2.1 beta 4 (Jeremy Portzer)
-   6. Re: I have the same problem with the list not sending mail..but getting confirmations... (Aparajita Fishman)
-   7. 2.1b4 problem (Fuzzy)
-   8. inetd doesn't start mailman...? (Nick Arnett)
-   9. Re: rejecting non-subscriber postings (G. Armour Van Horn)
-  10. Re: No public lists? (Armando Soto Baeza)
-  11. Re: No public lists? (Armando Soto Baeza)
-  12. Re: I have the same problem with the list not sending mail..but getting confirmations... (Armando Soto Baeza)
-  13. Re: Can't subscribe via web (Armando Soto Baeza)
 
 --10.0.11.1.506.27298.1035738004.364.17787
 Content-type: multipart/digest; boundary="__--__--"
diff --git a/tests/bounces/dsn_01.txt b/tests/bounces/dsn_01.txt
index d09768c6..e3cb593e 100644
--- a/tests/bounces/dsn_01.txt
+++ b/tests/bounces/dsn_01.txt
@@ -56,14 +56,14 @@ This report relates to a message you sent with the following header fields:
 
   Message-id: <F1218V8zDv60gxapzha000001ae@hotmail.com>
   Date: Tue, 03 Oct 2000 19:28:29 +0000 (GMT)
-  From: heiho1@hotmail.com
-  To: thaank@nl.packardbell.org, jpython-interest@python.org
+  From: heiho1@example.com
+  To: thaank@nl.example.org, jpython-interest@python.org
   Subject: [JPython] Re: JPython testing framework
 
 Your message cannot be delivered to the following recipients:
 
-  Recipient address: JimmyMcEgypt@sims-ms-daemon
-  Original address: JimmyMcEgypt@go.com
+  Recipient address: userx@sims-ms-daemon
+  Original address: userx@example.com
   Reason: recipient reached disk quota
 
 
@@ -74,8 +74,8 @@ Reporting-MTA: dns;msg00.seamail.go.com
 
 Action: failed
 Status: 5.0.0 (recipient reached disk quota)
-Original-recipient: rfc822;JimmyMcEgypt@go.com
-Final-recipient: rfc822;JimmyMcEgypt@sims-ms-daemon
+Original-recipient: rfc822;userx@example.com
+Final-recipient: rfc822;userx@sims-ms-daemon
 
 --Boundary_(ID_+h6gzBCYzjhP3wCVCkWTrg)
 Content-type: MESSAGE/RFC822
@@ -105,7 +105,7 @@ Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Tue,
 Received: from 206.41.27.49 by pv1fd.pav1.hotmail.msn.com with HTTP; Tue,
  03 Oct 2000 19:28:29 +0000 (GMT)
 Date: Tue, 03 Oct 2000 19:28:29 +0000 (GMT)
-From: heiho1@hotmail.com
+From: heiho1@example.com
 Subject: [JPython] Re: JPython testing framework
 X-Originating-IP: [206.41.27.49]
 Sender: jpython-interest-admin@python.org
@@ -136,82 +136,6 @@ Otto,
 Thanks for the reply.  I remembered hearing of this PyUnit but had lost 
 track of it for a while.  I just visited the sourceforge homepage:
 
-http://pyunit.sourceforge.net/pyunit.html
-
-I'm pretty sure that PyUnit [as its coded to Python 1.5.2] should be 
-workable with JPython, but the web page says:
-
-"""
-PyUnit cannot be used with JPython, the users of which should probably use 
-JUnit and create JPython subclasses of its TestCase class. I haven't tried 
-doing this.
-"""
-
-Now, I don't see why this would be the case, so I'm going to download PyUnit 
-and sniff around.  Are any of these modifications you mentioned to get 
-PyUnit running under JPython published on the Web anywhere?  I'd like to 
-take a look, as they would probably save me some time.
-
-Thanks again,
-
-James
-
->
->James,
->
->I'm using PyUnit from within JPython to drive unit tests that test a Java 
->applications. Some minor changes had to be made to PyUnit to make it work 
->with JPython, and the testrunner only works textually. But nevertheless, 
->it's a much better option than using JUnit from within JPython.
->
->-Otto Perdeck
->
->
->Hello all,
->
->I've used JPython for close to two years and I find the language to be
->indispensable.  The recent, protracted silence regarding the "official"
->status of JPython has concerned me quite a bit as I didn't want this
->language to die out when it shows such promise.
->
->I hope that BeOpen and CNRI can come to an agreement that will benefit the
->community as a whole.
->
->Regardless, my major use of JPython [due to the status of the 1.1 release
->and its errata (not an attack on Finn Bock, just an engineer not willing to
->deploy certain software on "unofficial" patches)] has been to facilitate
->prototyping and [almost ;)] XP style repetitive testing.  My interest is if
->a JPython testing framework exists?  Something that is a JUnit for JPython,
->but with functional level testing as well [similar to what Inline-Standard
->provides: http://www.inline-software.com/products/datasheet.html but not
->restricted to EJBs].
->
->If not, what is the interest of the JPython mailing list on collaborating 
->to
->produce such an entity [maybe sourceforge.net]?
->
->Also, has anybody played around with AspectJ [ www.aspectj.org very cool
->stuff ;)] and JPython?  It seems that AOP and JPython could be a pretty 
->good
->one-two punch for knocking out larger scale Java problems.
->
->James Richards
->Java Software Engineer
->
->
->- Tjitske Haank & Otto Perdeck
-
-_________________________________________________________________________
-Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.
-
-Share information about yourself, create your own public profile at 
-http://profiles.msn.com.
-
-
-_______________________________________________
-JPython-Interest maillist  -  JPython-Interest@python.org
-http://www.python.org/mailman/listinfo/jpython-interest
-
 --Boundary_(ID_+h6gzBCYzjhP3wCVCkWTrg)--
 
 
diff --git a/tests/bounces/dsn_02.txt b/tests/bounces/dsn_02.txt
index 3525605f..371344ef 100644
--- a/tests/bounces/dsn_02.txt
+++ b/tests/bounces/dsn_02.txt
@@ -38,7 +38,7 @@ List-Archive: <http://www.python.org/pipermail/python-list/>
 From: postmaster@hud.ac.uk
 Sender: python-list-owner@python.org
 To: python-list-admin@python.org
-Subject: Delivery Report (failure) for zzzzz@zeus.hud.ac.uk
+Subject: Delivery Report (failure) for zzzzz@example.uk
 Date: Tue, 26 Dec 2000 21:47:28 +0000
 X-BeenThere: python-list@python.org
 X-Mailman-Version: 2.0
@@ -54,7 +54,7 @@ Subject: RE: A Q concerning map (a comparison to Maple V),
 of Tue, 26 Dec 2000 21:47:27 +0000
 
 Your message was not delivered to:
-	zzzzz@zeus.hud.ac.uk
+	zzzzz@example.uk
 for the following reason:
 Diagnostic was Unable to transfer, Message timed out
 Information Message timed out
@@ -76,8 +76,8 @@ X400-Content-Correlator: Subject: RE: A Q concerning map (a comparison to Maple
 	Message-ID: <LNBBLJKPBEHFEDALKOLCMEEDIFAA.tim.one@home.com>,
 	To: <python-list@python.org>
 
-Original-Recipient: rfc822; zzzzz@zeus.hud.ac.uk
-Final-Recipient: x400; /S=zzzzz/OU=zeus/O=hud/PRMD=UK.AC/ADMD= /C=GB/
+Original-Recipient: rfc822; zzzzz@example.uk
+Final-Recipient: x400; /S=zzzzz/OU=example/PRMD=UK.AC/ADMD= /C=GB/
 X400-Originally-Specified-Recipient-Number: 1
 Action: failed
 Diagnostic-Code: Reason 1 (Unable-To-Transfer); Diagnostic 5 (Maximum-Time-Expired)
diff --git a/tests/bounces/dsn_03.txt b/tests/bounces/dsn_03.txt
index 4e4fef05..7399c898 100644
--- a/tests/bounces/dsn_03.txt
+++ b/tests/bounces/dsn_03.txt
@@ -17,13 +17,13 @@ Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14QqF1-0002hJ-00
 	for yyyyy@digicool.com; Thu, 08 Feb 2001 07:32:03 -0500
-Received: from [194.78.23.194] (helo=pigeon.advalvas.be)
+Received: from [194.78.23.194] (helo=pigeon.example.be)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14QqCJ-0002UN-00
 	for python-list-admin@python.org; Thu, 08 Feb 2001 07:29:15 -0500
-Message-Id: <12334670553230@pigeon.advalvas.be>
+Message-Id: <12334670553230@pigeon.example.be>
 Mime-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status; boundary="==_12334670553231@pigeon.advalvas.be==_"
+Content-Type: multipart/report; report-type=delivery-status; boundary="==_12334670553231@pigeon.example.be==_"
 Precedence: bulk
 List-Help: <mailto:python-list-request@python.org?subject=help>
 List-Post: <mailto:python-list@python.org>
@@ -33,7 +33,7 @@ List-Id: General discussion list for the Python programming language <python-lis
 List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-list>,
 	<mailto:python-list-request@python.org?subject=unsubscribe>
 List-Archive: <http://mail.python.org/pipermail/python-list/>
-From: "postmaster@advalvas.be" <postmaster@advalvas.be>
+From: "postmaster@example.be" <postmaster@advalvas.be>
 Sender: python-list-owner@python.org
 To: "python-list-admin@python.org" <python-list-admin@python.org>
 Subject: Failed mail: exceeded maximum incoming message size
@@ -46,31 +46,31 @@ X-Mailman-Version: 2.0.1 (101270)
 
 This is a MIME-encapsulated message
 
---==_12334670553231@pigeon.advalvas.be==_
+--==_12334670553231@pigeon.example.be==_
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Your message was not delivered to
  
-    ddd.kkk@advalvas.be
+    userx@example.be
  
 This mail message has exceeded the maximum incoming message size.
 
 
---==_12334670553231@pigeon.advalvas.be==_
+--==_12334670553231@pigeon.example.be==_
 Content-Type: message/delivery-status
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Reporting-MTA: dns;pigeon.net7.be
  
-Final-Recipient: rfc822;ddd.kkk@advalvas.be
+Final-Recipient: rfc822;userx@example.be
 Action: failure
 Status: 553 Exceeded maximum inbound message size
 
 
---==_12334670553231@pigeon.advalvas.be==_
+--==_12334670553231@pigeon.example.be==_
 Content-Type: message/rfc822
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
@@ -139,6 +139,5 @@ accept liability for statements made which are clearly the senders own.
 -- 
 http://mail.python.org/mailman/listinfo/python-list
 
---==_12334670553231@pigeon.advalvas.be==_--
 
 
diff --git a/tests/bounces/dsn_04.txt b/tests/bounces/dsn_04.txt
index 9bea9758..76f7d4e5 100644
--- a/tests/bounces/dsn_04.txt
+++ b/tests/bounces/dsn_04.txt
@@ -1,35 +1,35 @@
 From VM Sat Jun 30 11:29:01 2001
 X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
-	[nil "Saturday" "30" "June" "2001" "00:21:42" "+0200" "PMDF e-Mail Interconnect" "postmaster@yogi.urz.unibas.ch" nil "147" "Delivery Notification: Delivery has failed" "^From:" nil nil "6" nil nil nil nil nil]
+	[nil "Saturday" "30" "June" "2001" "00:21:42" "+0200" "PMDF e-Mail Interconnect" "postmaster@yogi.urz.example.ch" nil "147" "Delivery Notification: Delivery has failed" "^From:" nil nil "6" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: barry@wooz.org
-Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id 2852FD36EC
-	for <barry@wooz.org>; Fri, 29 Jun 2001 18:21:58 -0400 (EDT)
+Delivered-To: usery@example.org
+Received: from example.com (unknown [63.100.190.15])
+	by mail.example.org (Postfix) with ESMTP id 2852FD36EC
+	for <usery@example.org>; Fri, 29 Jun 2001 18:21:58 -0400 (EDT)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 2122693; Fri, 29 Jun 2001 18:23:52 -0400
-Received: from ns2.digicool.com ([63.100.190.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2122692 for barry@mail.digicool.com; Fri, 29 Jun 2001 18:23:52 -0400
+Received: from ns2.example.com ([63.100.190.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 2122692 for usery@mail.example.com; Fri, 29 Jun 2001 18:23:52 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id SAA15102
-	for <barry@digicool.com>; Fri, 29 Jun 2001 18:22:00 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id SAA15102
+	for <usery@example.com>; Fri, 29 Jun 2001 18:22:00 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15G6eH-0006NJ-00
-	for barry@digicool.com; Fri, 29 Jun 2001 18:22:01 -0400
-Received: from [131.152.1.4] (helo=yogi.urz.unibas.ch)
+	for usery@example.com; Fri, 29 Jun 2001 18:22:01 -0400
+Received: from [131.152.1.4] (helo=yogi.urz.example.ch)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15G6d4-0006Lg-00
 	for python-list-admin@python.org; Fri, 29 Jun 2001 18:20:46 -0400
-Received: from PROCESS-DAEMON by yogi.urz.unibas.ch (PMDF V5.2-29 #33343)
- id <01K5CWRKUM2O8X1X1D@yogi.urz.unibas.ch> for python-list-admin@python.org;
+Received: from PROCESS-DAEMON by yogi.urz.example.ch (PMDF V5.2-29 #33343)
+ id <01K5CWRKUM2O8X1X1D@yogi.urz.example.ch> for python-list-admin@python.org;
  Sat, 30 Jun 2001 00:21:44 +0200
-Received: from yogi.urz.unibas.ch (PMDF V5.2-29 #33343)
- id <01K5CWRINUF48X46F4@yogi.urz.unibas.ch>; Sat, 30 Jun 2001 00:21:42 +0200
-Message-id: <01K5CWRJIDYU8X46F4@yogi.urz.unibas.ch>
+Received: from yogi.urz.example.ch (PMDF V5.2-29 #33343)
+ id <01K5CWRINUF48X46F4@yogi.urz.example.ch>; Sat, 30 Jun 2001 00:21:42 +0200
+Message-id: <01K5CWRJIDYU8X46F4@yogi.urz.example.ch>
 MIME-version: 1.0
 Content-type: MULTIPART/REPORT;
  BOUNDARY="Boundary_(ID_MUSA353qRe9PeqtdeP14tg)"; REPORT-TYPE=DELIVERY-STATUS
@@ -42,7 +42,7 @@ List-Id: General discussion list for the Python programming language <python-lis
 List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-list>,
 	<mailto:python-list-request@python.org?subject=unsubscribe>
 List-Archive: <http://mail.python.org/pipermail/python-list/>
-From: PMDF e-Mail Interconnect <postmaster@yogi.urz.unibas.ch>
+From: PMDF e-Mail Interconnect <postmaster@yogi.urz.example.ch>
 Sender: python-list-owner@python.org
 To: python-list-admin@python.org
 Subject: Delivery Notification: Delivery has failed
@@ -61,14 +61,14 @@ This report relates to a message you sent with the following header fields:
 
   Message-id: <Pine.LNX.4.31.0106300001530.2750-100000@athlon.de>
   Date: Sat, 30 Jun 2001 00:18:49 +0200 (CEST)
-  From: Carsten Geckeler <uioziaremwpl@spammotel.com>
+  From: Carsten Geckeler <userz@example.com>
   To: Python <python-list@python.org>
   Subject: Re: Augmented Assignement (was: Re: PEP scepticism)
 
 Your message cannot be delivered to the following recipients:
 
-  Recipient address: HAASM@yogi.urz.unibas.ch
-  Original address: max.haas@unibas.ch
+  Recipient address: HAASM@yogi.urz.example.ch
+  Original address: userx@example.ch
 %MAIL-E-OPENOUT, error opening !AS as output
 -RMS-E-CRE, ACP file create failed
 -SYSTEM-F-EXDISKQUOTA, disk quota exceeded
@@ -78,33 +78,33 @@ Your message cannot be delivered to the following recipients:
 Content-type: message/DELIVERY-STATUS
 
 Original-envelope-id: 0GFP00202Q2DR3@mailhub.unibas.ch
-Reporting-MTA: dns;yogi.urz.unibas.ch
+Reporting-MTA: dns;yogi.urz.example.ch
 
 Action: failed
 Status: 5.0.0
-Original-recipient: rfc822;max.haas@unibas.ch
-Final-recipient: rfc822;HAASM@yogi.urz.unibas.ch
+Original-recipient: rfc822;userx@example.ch
+Final-recipient: rfc822;HAASM@yogi.urz.example.ch
 
 --Boundary_(ID_MUSA353qRe9PeqtdeP14tg)
 Content-type: MESSAGE/RFC822
 
 Return-path: python-list-admin@python.org
-Received: from yogi.urz.unibas.ch by yogi.urz.unibas.ch (PMDF V5.2-29 #33343)
- id <01K5CWRINUF48X46F4@yogi.urz.unibas.ch>
+Received: from yogi.urz.example.ch by yogi.urz.unibas.ch (PMDF V5.2-29 #33343)
+ id <01K5CWRINUF48X46F4@yogi.urz.example.ch>
  (original mail from python-list-admin@python.org); Sat,
  30 Jun 2001 00:21:42 +0200
-Received: from maser.urz.unibas.ch ([131.152.1.5])
- by yogi.urz.unibas.ch (PMDF V5.2-29 #33343)
- with ESMTP id <01K5CWRGK0V68X4CRC@yogi.urz.unibas.ch> for
- HAASM@yogi.urz.unibas.ch (ORCPT rfc822;max.haas@unibas.ch); Sat,
+Received: from maser.urz.example.ch ([131.152.1.5])
+ by yogi.urz.example.ch (PMDF V5.2-29 #33343)
+ with ESMTP id <01K5CWRGK0V68X4CRC@yogi.urz.example.ch> for
+ HAASM@yogi.urz.example.ch (ORCPT rfc822;userx@example.ch); Sat,
  30 Jun 2001 00:21:38 +0200
 Received: from DIRECTORY-DAEMON.mailhub.unibas.ch by mailhub.unibas.ch
  (PMDF V6.0-24 #41480) id <0GFP00201Q2DR3@mailhub.unibas.ch> for
- HAASM@yogi.urz.unibas.ch (ORCPT max.haas@unibas.ch); Sat,
+ HAASM@yogi.urz.example.ch (ORCPT userx@example.ch); Sat,
  30 Jun 2001 00:20:37 +0200 (MET DST)
 Received: from mail.python.org (mail.python.org [63.102.49.29])
  by mailhub.unibas.ch (PMDF V6.0-24 #41480)
- with ESMTP id <0GFP00BEAQ2C5Y@mailhub.unibas.ch> for max.haas@unibas.ch; Sat,
+ with ESMTP id <0GFP00BEAQ2C5Y@mailhub.unibas.ch> for userx@example.ch; Sat,
  30 Jun 2001 00:20:37 +0200 (MET DST)
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
  by mail.python.org with esmtp (Exim 3.21 #1)	id 15G6bK-0006HW-00; Fri,
@@ -119,7 +119,7 @@ Received: from s-gec3 by justitia.jura.uni-tuebingen.de with local
  (Exim 3.12 #1 (Debian))	id 15G6Zo-0002Zx-00	for <python-list@python.org>; Sat,
  30 Jun 2001 00:17:24 +0200
 Date: Sat, 30 Jun 2001 00:18:49 +0200 (CEST)
-From: Carsten Geckeler <uioziaremwpl@spammotel.com>
+From: Carsten Geckeler <userz@example.com>
 Subject: Re: Augmented Assignement (was: Re: PEP scepticism)
 In-reply-to: <ubsn7hte7.fsf@ctwd0143.fitlinxx.com>
 Sender: python-list-admin@python.org
@@ -143,60 +143,6 @@ List-Id: General discussion list for the Python programming language
 
 On 29 Jun 2001, David Bolen wrote:
 
-> Carsten Geckeler <uioziaremwpl@spammotel.com> writes:
->
-> > The problem which some people have with augmented assignment is not that
-> > they exist, but that they do not work as they expect (at least from the
-> > POV of some readers).  I expect that
-> > 	ident op= expr
-> > works like
-> > 	ident = ident op expr
-> >
-> > At least that's what I'd have expectd comming from other programming
-> > languages.
->
-> Of course, one interesting point is that while you may think the above
-> if coming from, say, C, what "ident = ident op expr" means in C is not
-> what "ident = ident op expr" means in Python.
-
-Yes, that's completely true.  I can accept, that Python work differently
-in many cases.  Actually I love Python's object stuff.  That's something
-more natural that in many other languages.  And I can accept, that objects
-(which are bound to different variable names) can be changed (like with
-l.extend).
-
-The point is not that Python differs from C (or other languages), but that
-the two statements above work differently.  I can accept that, of course
-(well I have to, I thing ;) ).  But, when I write the following three
-statements,
-	l = l + [3, 4]
-	l += [3, 4]
-	l.extend([3,4])
-it seems more logical to me, that the first two do the same than the last
-two.  I know, of course, that the last two do the same.  But anyway, the
-first two just _look_ more the same.
-
-> In C it has the result of changing data (in either case) that is
-> stored in a named location ident, in Python the long form just rebinds
-> the reference ident to a new object and doesn't touch the original
-> object.  The short form can actually get closer to the C idiom if the
-> object is mutable.
->
-> So I wonder if some of the confusion is people familiar with other
-> language's augmented assignment trying to extrapolate that into Python
-> and then running into the pre-existing differences in assignment
-> versus binding?
-
-No, that's at least no problem for me (see above).
-
-Cheers, Carsten
--- 
-Carsten Geckeler
-
-
--- 
-http://mail.python.org/mailman/listinfo/python-list
+> Carsten Geckeler <userz@example.com> writes:
 
 --Boundary_(ID_MUSA353qRe9PeqtdeP14tg)--
-
-
diff --git a/tests/bounces/dsn_05.txt b/tests/bounces/dsn_05.txt
index 73331578..e4ab3b61 100644
--- a/tests/bounces/dsn_05.txt
+++ b/tests/bounces/dsn_05.txt
@@ -1,25 +1,25 @@
 From VM Wed Mar 21 22:20:23 2001
 X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
-	[nil "Thursday" "22" "March" "2001" "02:52:34" "+0100" "postmaster@relay.atlas.cz" "postmaster@relay.atlas.cz" nil "76" "Message delayed (pkocmid@atlas.cz)" "^From:" nil nil "3" nil nil nil nil nil]
+	[nil "Thursday" "22" "March" "2001" "02:52:34" "+0100" "postmaster@relay.atlas.cz" "postmaster@relay.atlas.cz" nil "76" "Message delayed (userx@example.cz)" "^From:" nil nil "3" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id 97D9ED37AC
-	for <barry@wooz.org>; Wed, 21 Mar 2001 21:34:33 -0500 (EST)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id 97D9ED37AC
+	for <usery@example.org>; Wed, 21 Mar 2001 21:34:33 -0500 (EST)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1706776; Wed, 21 Mar 2001 21:39:26 -0500
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1706775 for barry@mail.digicool.com; Wed, 21 Mar 2001 21:39:26 -0500
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1706775 for usery@mail.example.com; Wed, 21 Mar 2001 21:39:26 -0500
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id VAA12152
-	for <barry@digicool.com>; Wed, 21 Mar 2001 21:36:03 -0500
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id VAA12152
+	for <usery@example.com>; Wed, 21 Mar 2001 21:36:03 -0500
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14fuxH-0002AK-00
-	for barry@digicool.com; Wed, 21 Mar 2001 21:36:03 -0500
+	for usery@example.com; Wed, 21 Mar 2001 21:36:03 -0500
 Received: from [195.119.187.242] (helo=cuk.atlas.cz)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14fuwk-00028x-00
@@ -39,7 +39,7 @@ List-Archive: <http://mail.python.org/pipermail/python-list/>
 From: postmaster@relay.atlas.cz
 Sender: python-list-owner@python.org
 To: python-list-admin@python.org
-Subject: Message delayed (pkocmid@atlas.cz)
+Subject: Message delayed (userx@example.cz)
 Date: Thu, 22 Mar 2001 02:52:34 +0100
 X-Autogenerated: Mirror
 X-Mirrored-by: <python-list-admin@python.org>
@@ -52,7 +52,7 @@ Content-Type: text/plain
 Your message has been delayed and is still awaiting delivery
 to the following recipient(s):
 
-pkocmid@atlas.cz
+userx@example.cz
 Message delayed
 
 
@@ -72,7 +72,7 @@ Reporting-MTA: dns; cuk.atlas.cz
 Received-From-MTA: dns; mail.python.org (unverified [63.102.49.29])
 Arrival-Date: Wed, 21 Mar 2001 15:08:54 +0100
 
-Final-Recipient: rfc822; pkocmid@atlas.cz
+Final-Recipient: rfc822; userx@example.cz
 Action: delayed
 Status: 4.4.1 (Persistent transient failure - routing/network: no answer from host)
 Will-Retry-Until: Mon, 26 Mar 2001 03:42:45 +0100
@@ -81,13 +81,13 @@ Will-Retry-Until: Mon, 26 Mar 2001 03:42:45 +0100
 Content-Type: message/rfc822-headers
 
 Received: from mail.python.org (unverified [63.102.49.29]) by cuk.atlas.cz
- (Vircom SMTPRS 4.5.186) with ESMTP id <B0008514592@cuk.atlas.cz> for <pkocmid@atlas.cz>;
+ (Vircom SMTPRS 4.5.186) with ESMTP id <B0008514592@cuk.atlas.cz> for <userx@example.cz>;
  Wed, 21 Mar 2001 15:08:54 +0100
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14fjGM-0007PZ-00; Wed, 21 Mar 2001 09:06:58 -0500
 Path: news.baymountain.net!uunet!ash.uu.net!sac.uu.net!newsfeed.attap.net!enews.sgi.com!feeder.via.net!news.he.net!typhoon.aracnet.com!not-for-mail
-From: Daniel Klein <danielk@aracnet.com>
+From: Daniel Klein <userk@example.com>
 Newsgroups: comp.lang.python
 Subject: Re: Pick Systems D3 Database
 Message-ID: <pfchbtkf3j0p7prf0sp45vi21fro3bs7ad@4ax.com>
diff --git a/tests/bounces/dsn_06.txt b/tests/bounces/dsn_06.txt
index 22f69760..6b850874 100644
--- a/tests/bounces/dsn_06.txt
+++ b/tests/bounces/dsn_06.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Sunday" "1" "July" "2001" "16:07:50" "+0200" "Mail Delivery Service" "mailadm@thales-is.com" nil "72" "Delivery Status Notification (Mail Delivery Delayed)" "^From:" nil nil "7" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: barry@wooz.org
-Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id 1F5FED36EC
-	for <barry@wooz.org>; Sun,  1 Jul 2001 10:07:00 -0400 (EDT)
+Delivered-To: usery@example.org
+Received: from example.com (unknown [63.100.190.15])
+	by mail.example.org (Postfix) with ESMTP id 1F5FED36EC
+	for <usery@example.org>; Sun,  1 Jul 2001 10:07:00 -0400 (EDT)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 2125237; Sun, 01 Jul 2001 10:08:57 -0400
-Received: from ns2.digicool.com ([63.100.190.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2125244 for barry@mail.digicool.com; Sun, 01 Jul 2001 10:08:57 -0400
+Received: from ns2.example.com ([63.100.190.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 2125244 for usery@mail.example.com; Sun, 01 Jul 2001 10:08:57 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id KAA26383
-	for <barry@digicool.com>; Sun, 1 Jul 2001 10:07:00 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id KAA26383
+	for <usery@example.com>; Sun, 1 Jul 2001 10:07:00 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15GhsL-0001Ey-00
-	for barry@digicool.com; Sun, 01 Jul 2001 10:07:01 -0400
+	for usery@example.com; Sun, 01 Jul 2001 10:07:01 -0400
 Received: from [195.101.39.226] (helo=gwsmtp.thomson-csf.com)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15GhrZ-0001D4-00
@@ -59,7 +59,7 @@ Content-Type: text/plain; charset=us-ascii
  - There is no need to resend your message at this time.
  - The following recipients have not yet received your message:
 
-hao-nghi.au@fr.thalesgroup.com; Action: Delayed
+userx@example.com; Action: Delayed
 
  - The server will continue trying for up to 21 hours.
 
@@ -71,7 +71,7 @@ Reporting-MTA: dns; gwsmtp.thomson-csf.com
 Received-from-MTA: dns; mail.python.org (63.102.49.29)
 Arrival-Date: Sun, 1 Jul 2001 13:07:44 +0200
 
-Final-Recipient: rfc822; hao-nghi.au@fr.thalesgroup.com
+Final-Recipient: rfc822; userx@example.com
 Action: Delayed
 Status: 4.4.0 (other or undefined network or routing status)
 Will-Retry-Until: Mon, 2 Jul 2001 13:07:44 +0200
@@ -81,12 +81,12 @@ Content-Type: Text/RFC822-headers
 
 Return-Path: <python-list-admin@python.org>
 Received: from mail.python.org (63.102.49.29) by gwsmtp.thomson-csf.com (NPlex 5.1.053)
-        id 3B3CE20D00004815 for hao-nghi.au@fr.thalesgroup.com; Sun, 1 Jul 2001 13:07:44 +0200
+        id 3B3CE20D00004815 for userx@example.com; Sun, 1 Jul 2001 13:07:44 +0200
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15Gf3C-0005ft-00; Sun, 01 Jul 2001 07:06:02 -0400
 Path: news.baymountain.net!uunet!ash.uu.net!dca.uu.net!feed2.onemain.com!feed1.onemain.com!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed00.sul.t-online.de!newsfeed01.sul.t-online.de!t-online.de!fu-berlin.de!hahn.informatik.hu-berlin.de!not-for-mail
-From: Martin von Loewis <loewis@informatik.hu-berlin.de>
+From: Martin von Loewis <user@example.de>
 Newsgroups: comp.lang.python
 Subject: Re: GCC 3.0, Standard ABI & C++/Python Integration
 Organization: Humboldt University Berlin, Department of Computer Science
diff --git a/tests/bounces/dsn_07.txt b/tests/bounces/dsn_07.txt
index 2e5a0e5d..2c618b95 100644
--- a/tests/bounces/dsn_07.txt
+++ b/tests/bounces/dsn_07.txt
@@ -1,21 +1,21 @@
 From VM Wed Aug  1 17:56:11 2001
 X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
-	[nil "Thursday" "2" "August" "2001" "08:02:07" "+1200" "postmaster@Parliament.govt.nz" "postmaster@Parliament.govt.nz" nil "73" "Message delayed (david.farrar@parliament.govt.nz)" "^From:" "mailman-users-admin@python.org" "mailman-users-admin@python.org" "8" nil nil nil nil nil]
+	[nil "Thursday" "2" "August" "2001" "08:02:07" "+1200" "postmaster@Parliament.govt.nz" "postmaster@Parliament.govt.nz" nil "73" "Message delayed (userx@example.nz)" "^From:" "mailman-users-admin@python.org" "mailman-users-admin@python.org" "8" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: barry@wooz.org
+Delivered-To: usery@example.org
 Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id D431ED35F0
-	for <barry@wooz.org>; Wed,  1 Aug 2001 16:26:59 -0400 (EDT)
+	by mail.example.org (Postfix) with ESMTP id D431ED35F0
+	for <usery@example.org>; Wed,  1 Aug 2001 16:26:59 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
   by digicool.com (CommuniGate Pro RULES 3.4)
   with RULES id 2462291; Wed, 01 Aug 2001 16:27:02 -0400
-Received: from smtp.zope.com ([63.100.190.10] verified)
+Received: from smtp.example.com ([63.100.190.10] verified)
   by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2462289 for barry@mail.zope.com; Wed, 01 Aug 2001 16:27:02 -0400
+  with ESMTP id 2462289 for usery@mail.example.com; Wed, 01 Aug 2001 16:27:02 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by smtp.zope.com (8.11.2/8.11.2) with ESMTP id f71KR2X19854
-	for <barry@zope.com>; Wed, 1 Aug 2001 16:27:02 -0400
+	by smtp.example.com (8.11.2/8.11.2) with ESMTP id f71KR2X19854
+	for <usery@example.com>; Wed, 1 Aug 2001 16:27:02 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15S2a4-0003D5-00; Wed, 01 Aug 2001 16:27:00 -0400
@@ -38,7 +38,7 @@ List-Archive: <http://mail.python.org/pipermail/mailman-users/>
 From: postmaster@Parliament.govt.nz
 Sender: mailman-users-owner@python.org
 To: mailman-users-admin@python.org
-Subject: Message delayed (david.farrar@parliament.govt.nz)
+Subject: Message delayed (userx@example.nz)
 Date: Thu, 2 Aug 2001 08:02:07 +1200
 X-Autogenerated: Mirror
 X-Mirrored-by: <mailman-users-admin@python.org>
@@ -51,8 +51,8 @@ Content-Type: text/plain
 Your message has been delayed and is still awaiting delivery
 to the following recipient(s):
 
-david.farrar@Parliament.govt.nz
-(Was addressed to david.farrar@parliament.govt.nz)
+userx@example.nz
+(Was addressed to userx@example.nz)
 Message delayed
 
 
@@ -72,7 +72,7 @@ Reporting-MTA: dns; ns1.parliament.govt.nz
 Received-From-MTA: dns; mail.python.org (unverified [63.102.49.29])
 Arrival-Date: Thu, 2 Aug 2001 02:00:22 +1200
 
-Final-Recipient: rfc822; david.farrar@parliament.govt.nz
+Final-Recipient: rfc822; userx@example.nz
 Action: delayed
 Status: 4.4.1 (Persistent transient failure - routing/network: no answer from host)
 Will-Retry-Until: Sun, 5 Aug 2001 02:02:05 +1200
@@ -81,7 +81,7 @@ Will-Retry-Until: Sun, 5 Aug 2001 02:02:05 +1200
 Content-Type: message/rfc822-headers
 
 Received: from mail.python.org (unverified) by ns1.parliament.govt.nz
- (Content Technologies SMTPRS 4.1.5) with ESMTP id <Tcb61e85d551d68b75d@ns1.parliament.govt.nz> for <david.farrar@parliament.govt.nz>;
+ (Content Technologies SMTPRS 4.1.5) with ESMTP id <Tcb61e85d551d68b75d@ns1.parliament.govt.nz> for <userx@example.nz>;
  Thu, 2 Aug 2001 02:00:22 +1200
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
@@ -93,7 +93,7 @@ Received: from [144.122.169.16] (helo=robot.metu.edu.tr)
 Received: from localhost (ceyhun@localhost)
 	by robot.metu.edu.tr (8.11.2/8.11.2) with ESMTP id f71DBH312336
 	for <mailman-users@python.org>; Wed, 1 Aug 2001 16:11:18 +0300
-From: <ceyhun@robot.metu.edu.tr>
+From: <user@example.edu.tr>
 To: <mailman-users@python.org>
 Message-ID: <Pine.LNX.4.33.0108011605240.12261-100000@robot.metu.edu.tr>
 MIME-Version: 1.0
diff --git a/tests/bounces/dsn_08.txt b/tests/bounces/dsn_08.txt
index 8d4d3b8b..4a3a61c5 100644
--- a/tests/bounces/dsn_08.txt
+++ b/tests/bounces/dsn_08.txt
@@ -59,7 +59,7 @@ For further assistance, please send mail to <postmaster>
 
 			The Postfix program
 
-<news-list.zope@localhost.bln.innominate.de>: temporary failure. Command
+<userx@example.de>: temporary failure. Command
     output: avpcheck: unable to connect to avp daemon: Connection refused
 
 --A216D2D16B.1002185128/mate.bln.innominate.de
@@ -69,7 +69,7 @@ Content-Type: message/delivery-status
 Reporting-MTA: dns; mate.bln.innominate.de
 Arrival-Date: Thu,  4 Oct 2001 10:20:46 +0200 (CEST)
 
-Final-Recipient: rfc822; news-list.zope@localhost.bln.innominate.de
+Final-Recipient: rfc822; userx@example.de
 Action: delayed
 Status: 4.0.0
 Diagnostic-Code: X-Postfix; temporary failure. Command output: avpcheck: unable
@@ -96,9 +96,9 @@ Received: from [65.32.1.43] (helo=smtp-server6.tampabay.rr.com)
 Received: from tlc2 (242850hfc162.tampabay.rr.com [24.28.50.162])
 	by smtp-server6.tampabay.rr.com (8.11.2/8.11.2) with SMTP id f943dcd28305;
 	Wed, 3 Oct 2001 23:39:42 -0400 (EDT)
-From: "Trevor Toenjes" <zope@toenjes.com>
-To: "Martijn Pieters" <mj@zope.com>,
-	"Trevor Toenjes" <zope@toenjes.com>
+From: "Trevor Toenjes" <user@example.com>
+To: "Martijn Pieters" <user@example.com>,
+	"Trevor Toenjes" <user@example.com>
 Cc: <zope@zope.org>
 Subject: RE: [Zope] what is error_message and how do I alter it??
 Message-ID: <NEBBLDPBKLOKNHPAEECGAENDCIAA.zope@toenjes.com>
diff --git a/tests/bounces/dsn_09.txt b/tests/bounces/dsn_09.txt
index 89c0f9ad..91c3cc92 100644
--- a/tests/bounces/dsn_09.txt
+++ b/tests/bounces/dsn_09.txt
@@ -1,16 +1,16 @@
 Return-Path: <postmaster@btconnect.com>
-Delivered-To: bob@nlenet.net
+Delivered-To: user@example.net
 Received: from c2bapps1.btconnect.com (c2bapps1.btconnect.com [193.113.209.21])
         by main.nlenet.net (Postfix) with SMTP id ED8D113D126
-        for <bob@nleaudio.com>; Sun,  4 Nov 2001 02:45:49 -0500 (EST)
+        for <user@example.com>; Sun,  4 Nov 2001 02:45:49 -0500 (EST)
 Received: from btconnect.com by c2bapps1.btconnect.com id <g.02673-0@c2bapps1.btconnect.com>; Sun, 4 Nov 2001 07:45:32 +0000
 Message-Type: Delivery Report
 X400-Received: by /ADMD= /C=WW/; Relayed; Sun, 4 Nov 2001 07:45:31 +0000
 X400-Received: by mta c2bapps1-hme1 in /ADMD= /C=WW/; Relayed; Sun, 4 Nov 2001 07:45:31 +0000
 X400-MTS-Identifier: [/ADMD= /C=WW/;c2bapps1.b:026710:20011104074531]
 From: postmaster@btconnect.com
-To: bob@nleaudio.com
-Subject: Delivery Report (failure) for pr@allen-heath.com
+To: user@example.com
+Subject: Delivery Report (failure) for userx@example.com
 Date: Sun, 4 Nov 2001 07:45:32 +0000
 Message-ID: <"c2bapps1.b:026710:20011104074531"@btconnect.com>
 Content-Identifier: test
@@ -26,15 +26,15 @@ X-UIDL: 34456246710d0000
 This report relates to your message:
 Subject: test,
         Message-ID: <3BE4F1EC.8306C281@nleaudio.com>,
-        To: pr@allen-heath.com
+        To: userx@example.com
 
 of Sun, 4 Nov 2001 07:45:31 +0000
 
 Your message was not delivered to:
-        pr@allen-heath.com
+        userx@example.com
 for the following reason:
 Diagnostic was Unable to transfer, -1
-Information MTA '62.6.150.133' gives error message 5.7.1 Unable to relay for pr@allen-heath.com
+Information MTA '62.6.150.133' gives error message 5.7.1 Unable to relay for userx@example.com
 
 The Original Message follows:
 
@@ -50,9 +50,9 @@ X400-Content-Identifier: test
 X400-Encoded-Info: ia5-text
 X400-Content-Correlator: Subject: test,
         Message-ID: <3BE4F1EC.8306C281@nleaudio.com>,
-        To: pr@allen-heath.com
+        To: userx@example.com
 
-Original-Recipient: rfc822; pr@allen-heath.com
+Original-Recipient: rfc822; userx@example.com
 Final-Recipient: x400; /RFC-822=pr(a)allen-heath.com/ADMD= /C=WW/
 X400-Originally-Specified-Recipient-Number: 1
 Action: failed
@@ -67,14 +67,14 @@ Content-Type: message/rfc822
 Received: from ns.nlenet.net by c2bapps1 with SMTP (XT-PP); Sun, 4 Nov 2001 07:45:00 +0000
 Received: from nleaudio.com (66-133-142-213.roc.frontiernet.net [66.133.142.213])
         by ns.nlenet.net (Postfix) with ESMTP id E354A770C
-        for <pr@allen-heath.com>; Sun,  4 Nov 2001 02:44:57 -0500 (EST)
+        for <userx@example.com>; Sun,  4 Nov 2001 02:44:57 -0500 (EST)
 Message-ID: <3BE4F1EC.8306C281@nleaudio.com>
 Date: Sun, 04 Nov 2001 02:44:44 -0500
-From: "Bob Puff@NLE" <bob@nleaudio.com>
+From: "Bob Puff@NLE" <user@example.com>
 X-Mailer: Mozilla 4.78 [en] (Win95; U)
 X-Accept-Language: en
 MIME-Version: 1.0
-To: pr@allen-heath.com
+To: userx@example.com
 Subject: test
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
diff --git a/tests/bounces/dsn_12.txt b/tests/bounces/dsn_12.txt
index 473abb8b..04ef526f 100644
--- a/tests/bounces/dsn_12.txt
+++ b/tests/bounces/dsn_12.txt
@@ -23,7 +23,7 @@ X-Songbird-From:
 Content-Type: text/plain; charset=us-ascii
 
    ----- The following addresses have delivery notifications -----
-<auaauqdgrdz@jtc-con.co.jp> (failed: Bad destination mailbox address)
+<userx@example.jp> (failed: Bad destination mailbox address)
 
 --12006021214472475
 Content-Type: message/delivery-status
@@ -31,8 +31,8 @@ Content-Type: message/delivery-status
 Reporting-MTA: SV-03.jtc-con.local (TeamWARE Connector for MIME v5.x)
 Original-Envelope-Id: mailman.6301.1139723231.1568.wed_ride@grizz.org
 
-Original-Recipient: rfc822;auaauqdgrdz@jtc-con.co.jp
-Final-Recipient: rfc822;auaauqdgrdz@jtc-con.co.jp
+Original-Recipient: rfc822;userx@example.jp
+Final-Recipient: rfc822;userx@example.jp
 Action: failed (Bad destination mailbox address)
 Status: 5.1.1
 
diff --git a/tests/bounces/dsn_13.txt b/tests/bounces/dsn_13.txt
index c9156f3a..cc167517 100644
--- a/tests/bounces/dsn_13.txt
+++ b/tests/bounces/dsn_13.txt
@@ -40,7 +40,7 @@ This is an automatically generated Delivery Status Notification.
 
 Delivery to the following recipients failed.
 
-       marcooherbst@cardinal.com
+       userx@example.com
 
 
 
@@ -53,7 +53,7 @@ Reporting-MTA: dns;DUBCONN01.cahapps.net
 Received-From-MTA: dns;smtp.cardhealth.com
 Arrival-Date: Wed, 22 Mar 2006 15:43:26 -0500
 
-Final-Recipient: rfc822;marcooherbst@cardinal.com
+Final-Recipient: rfc822;userx@example.com
 Action: failed
 Status: 5.1.1
 
@@ -78,10 +78,10 @@ X-IronPort-AV: i="4.03,119,1141621200"; d="scan'208,217";
 	a="85180828:sNHT33494874"
 Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1]) by
 	sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2MKhO3d010225
-	for <marcooherbst@cardinal.com>; Wed, 22 Mar 2006 12:43:24 -0800
+	for <userx@example.com>; Wed, 22 Mar 2006 12:43:24 -0800
 Subject: Re: Duhod86 news
 From: <wed_ride-owner@grizz.org>
-To: <marcooherbst@cardinal.com>
+To: <userx@example.com>
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
 	boundary="===============0094818700=="
@@ -120,192 +120,9 @@ Content-Transfer-Encoding: 7bit
 Content-Type: message/rfc822
 MIME-Version: 1.0
 
-Return-Path: <marcooherbst@cardinal.com>
-Received: from cardinal.com (co-217-129-109-80.netvisao.pt [217.129.109.80]
-	(may be forged))
-	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2MKhEj4010189
-	for <wed_ride@grizz.org>; Wed, 22 Mar 2006 12:43:15 -0800
-Message-ID: <000001c64df1$1d48df90$4eb2a8c0@pzi68>
-Reply-To: "Marco Herbst" <marcooherbst@cardinal.com>
-From: "Marco Herbst" <marcooherbst@cardinal.com>
-To: wed_ride@grizz.org
-Subject: Re: Duhod86 news
-Date: Wed, 22 Mar 2006 15:42:20 -0500
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
-	boundary="----=_NextPart_000_0001_01C64DC7.3472D790"
-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: marcooherbst@cardinal.com
-
-This is a multi-part message in MIME format.
-
-------=_NextPart_000_0001_01C64DC7.3472D790
-Content-Type: text/plain;
-	charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-=20
-d C w I w A g L u I d S
-z V l A l L b I w U b M
-e V x I n A x G w R u A
-=20
-B qb uy your z M d e r d f i w c u a t t b i r o w n o sh nline at half
-r p c r y i a c p e http://www.seterekever.com
-<http://www.seterekever.com>=20
-
-------=_NextPart_000_0001_01C64DC7.3472D790
-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></FONT>&nbsp;</DIV>
-<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
-float
-:right
-"> d </SPAN>C<SPAN style=3D"
-float
-:right
-"> w </SPAN>I<SPAN style=3D"
-float
-:right
-"> w </SPAN>A<SPAN style=3D"
-float
-:right
-"> g </SPAN>L<SPAN style=3D"
-float
-:right
-"> u </SPAN>I<SPAN style=3D"
-float
-:right
-"> d </SPAN>S</FONT></DIV>
-<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
-float
-:right
-"> z </SPAN>V<SPAN style=3D"
-float
-:right
-"> l </SPAN>A<SPAN style=3D"
-float
-:right
-"> l </SPAN>L<SPAN style=3D"
-float
-:right
-"> b </SPAN>I<SPAN style=3D"
-float
-:right
-"> w </SPAN>U<SPAN style=3D"
-float
-:right
-"> b </SPAN>M</FONT></DIV>
-<DIV><FONT face=3DArial size=3D2><SPAN style=3D"
-float
-:right
-"> e </SPAN>V<SPAN style=3D"
-float
-:right
-"> x </SPAN>I<SPAN style=3D"
-float
-:right
-"> n </SPAN>A<SPAN style=3D"
-float
-:right
-"> x </SPAN>G<SPAN style=3D"
-float
-:right
-"> w </SPAN>R<SPAN style=3D"
-float
-:right
-"> u </SPAN>A</FONT></DIV>
-<DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
-<DIV><FONT face=3DArial size=3D2>B<SPAN style=3D"
-float
-:right
-"> qb </SPAN>uy your <SPAN style=3D"
-float
-:right
-"> z </SPAN>M<SPAN style=3D"
-float
-:right
-"> d </SPAN>e<SPAN style=3D"
-float
-:right
-"> r </SPAN>d<SPAN style=3D"
-float
-:right
-"> f </SPAN>i<SPAN style=3D"
-float
-:right
-"> w </SPAN>c<SPAN style=3D"
-float
-:right
-"> u </SPAN>a<SPAN style=3D"
-float
-:right
-"> t </SPAN>t<SPAN style=3D"
-float
-:right
-"> b </SPAN>i<SPAN style=3D"
-float
-:right
-"> r </SPAN>o<SPAN style=3D"
-float
-:right
-"> w </SPAN>n o<SPAN style=3D"
-float
-:right
-"> sh </SPAN>nline at half <SPAN style=3D"
-float
-:right
-"> r </SPAN>p<SPAN style=3D"
-float
-:right
-"> c </SPAN>r<SPAN style=3D"
-float
-:right
-"> y </SPAN>i<SPAN style=3D"
-float
-:right
-"> a </SPAN>c<SPAN style=3D"
-float
-:right
-"> p </SPAN>e <A href=3D"http://www.seterekever.com"><FONT face=3DArial =
-size=3D2>http://www.seterekever.com</FONT></A></FONT></DIV></BODY></HTML>
-------=_NextPart_000_0001_01C64DC7.3472D790--
-
-
-
-
+Message Removed
 --===============0094818700==--
 
 
 --9B095B5ADSN=_01C62FAF9E9AB60F0001694BDUBCONN01.cahapp--
---54yQd.43vjuhqdb.1v2/Po.1DfUMdh
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: inline
-
-
-Working together.  For life.(sm)
-_________________________________________________
-
-This message is for the designated recipient only and may contain privilege=
-d, proprietary, or otherwise private information. If you have received it i=
-n error, please notify the sender immediately and delete the original. Any =
-other use of the email by you is prohibited.
-
-Dansk - Deutsch - Espanol - Francais - Italiano - Japanese - Nederlands - N=
-orsk - Portuguese - Svenska: www.cardinalhealth.com/legal/email
 --54yQd.43vjuhqdb.1v2/Po.1DfUMdh--
diff --git a/tests/bounces/dsn_14.txt b/tests/bounces/dsn_14.txt
index 448b4e04..0ff57bf2 100644
--- a/tests/bounces/dsn_14.txt
+++ b/tests/bounces/dsn_14.txt
@@ -27,7 +27,7 @@ The original mail was received at Mon Mar 27 18:06:29 2006 GMT from sb7.songbird
 YOUR MAIL WAS NOT DELIVERED TO ALL RECIPIENTS!
 
   ----- The following addresses had permanent fatal errors -----
-<artboardregistration@home.dk>
+<userx@example.com.dk>
 
   ----- Transcript of the session follows -----
 550 5.1.1 User unknown
@@ -47,7 +47,7 @@ Reporting-MTA: dns; SMTP-GATEWAY01.intra.home.dk
 Received-From-MTA: dns; sb7.songbird.com (208.184.79.137)
 Arrival-Date: Mon Mar 27 18:06:29 2006 GMT
 
-Final-Recipient: <artboardregistration@home.dk>
+Final-Recipient: <userx@example.com.dk>
 Action: failed
 Remote-MTA: MRT; 10.0.0.103
 Diagnostic-Code: SMTP; 550 5.1.1 User unknown
@@ -61,10 +61,10 @@ Received: from (sb7.songbird.com [208.184.79.137])
 	(envelope-from <gpc-talk-bounces@grizz.org>)
 Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
 	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2RI7087026411
-	for <artboardregistration@home.dk>; Mon, 27 Mar 2006 10:07:00 -0800
+	for <userx@example.com.dk>; Mon, 27 Mar 2006 10:07:00 -0800
 Subject: The results of your email commands
 From: gpc-talk-bounces@grizz.org
-To: artboardregistration@home.dk
+To: userx@example.com.dk
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="===============1150126487=="
 Message-ID: <mailman.2721.1143482819.1567.gpc-talk@grizz.org>
@@ -90,7 +90,7 @@ original message.
 
 - Results:
     Ignoring non-text/plain MIME parts
-    artboardregistration@home.dk is not a member of the GPC-talk mailing list
+    userx@example.com.dk is not a member of the GPC-talk mailing list
 
 - Unprocessed:
     Re:
@@ -102,46 +102,7 @@ original message.
 Content-Type: message/rfc822
 MIME-Version: 1.0
 
-Return-Path: <gpc-talk-unsubscribe@grizz.org>
-Received: from email2desk.com (bl5-223-133.dsl.telepac.pt [82.154.223.133])
-	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2RI6OZT026269
-	for <gpc-talk-unsubscribe@grizz.org>; Mon, 27 Mar 2006 10:06:40 -0800
-Received: from 213.226.165.165
-	(SquirrelMail authenticated user artboardregistration@home.dk);
-	by email2desk.com with HTTP; Mon, 27 Mar 2006 18:05:12 +0000
-Message-Id: <5JcF2k.squirrel@213.226.165.165>
-Date: Mon, 27 Mar 2006 18:05:12 +0000
-Subject: Re:
-From: "Octavio" <artboardregistration@home.dk>
-To: gpc-talk-unsubscribe@grizz.org
-User-Agent: SquirrelMail/1.4.3a
-X-Mailer: SquirrelMail/1.4.3a
-MIME-Version: 1.0
-Content-Type: text/html; charset=iso-8859-1
-Content-Transfer-Encoding: 8bit
-X-Priority: 3 (Normal)
-Importance: Normal
-X-SongbirdInformation: support@songbird.com for more information
-X-Songbird: Clean
-X-Songbird-From: gpc-talk-unsubscribe@grizz.org
-
-<html>
-<body>
-Good morning,<br><br>
-We would like to offer everything for your health from our Canadian online store!<br><br>
-- All meds are FDA-approved!<br>
-- No prescription required!<br>
-- Worldwide shippinq!<br>
-- 24/7 Customer support!<br><br>
-<a href="http://gnlqgn.ulcercod.biz/?35917758">Just have a Iook at our site</a><br><br>
-Best reqards,<br>
-&nbsp;&nbsp;&nbsp;Octavio<br><br><br>
-_____________________________________________________<br>
-Remove <a href="http://gnlqgn.ulcercod.biz/?35917758">here</a><br>
-_____________________________________________________
-</body>
-</html>
-
+Message removed
 
 --===============1150126487==--
 ----=_smtp442829A200.A7C.2824.1811939338--
diff --git a/tests/bounces/dsn_15.txt b/tests/bounces/dsn_15.txt
index 1e3c62de..9a63e1f4 100644
--- a/tests/bounces/dsn_15.txt
+++ b/tests/bounces/dsn_15.txt
@@ -67,7 +67,7 @@ This is an automatically generated Delivery Status Notification.
 
 Delivery to the following recipients failed.
 
-       horu@ccc-ces.com
+       userx@example.com
 
 
 
@@ -79,7 +79,7 @@ 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
+Final-Recipient: rfc822;userx@example.com
 Action: failed
 Status: 5.1.1
 
@@ -94,10 +94,10 @@ Received: from sb7.songbird.com ([208.184.79.137]) by
 	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
+	k552hf0f018557for <userx@example.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
+To: userx@example.com
 MIME-Version: 1.0
 Content-Type: multipart/mixed;
 	boundary="===============1628420505=="
@@ -133,127 +133,15 @@ original message.
 
 - Results:
     Ignoring non-text/plain MIME parts
-    horu@ccc-ces.com is not a member of the GPC-talk mailing list
+    userx@example.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>
+Message removed
 ------=_NextPart_000_0001_01C6880F.0B172130--
 
 --===============1628420505==--
diff --git a/tests/bounces/dsn_16.txt b/tests/bounces/dsn_16.txt
index b1f9b9ec..4d45bce9 100644
--- a/tests/bounces/dsn_16.txt
+++ b/tests/bounces/dsn_16.txt
@@ -1,6 +1,6 @@
 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
 	by strategicnetwork.org (Postfix) with ESMTP id E71AC73423D
-	for <hishealinghand@pastors.com>; Sat, 17 May 2008 11:15:50 -0600 (MDT)
+	for <userx@example.com>; Sat, 17 May 2008 11:15:50 -0600 (MDT)
 From: "Mail Delivery System" <MAILER-DAEMON@strategicnetwork.org>
 To: <mailman-bounces@strategicnetwork.org>
 Subject: Undelivered Mail Returned to Sender
@@ -33,8 +33,8 @@ delete your own text from the attached returned message.
 
 			The Postfix program
 
-<hishealinghand@pastors.com>: host mx.pastors.com[70.183.18.160] said: 550
-    unknown user <hishealinghand@pastors.com> (in reply to RCPT TO command)
+<userx@example.com>: host mx.pastors.com[70.183.18.160] said: 550
+    unknown user <userx@example.com> (in reply to RCPT TO command)
 
 ------=_NextPart_000_0092_01C8B8BF.529D6450
 Content-Type: message/delivery-status;
@@ -48,166 +48,18 @@ X-Postfix-Queue-ID: E71AC73423D
 X-Postfix-Sender: rfc822; mailman-bounces@strategicnetwork.org
 Arrival-Date: Sat, 17 May 2008 11:15:50 -0600 (MDT)
 
-Final-Recipient: rfc822; hishealinghand@pastors.com
+Final-Recipient: rfc822; userx@example.com
 Action: failed
 Status: 5.0.0
 Diagnostic-Code: X-Postfix; host mx.pastors.com[70.183.18.160] said: 550
-	unknown user <hishealinghand@pastors.com> (in reply to RCPT TO command)
+	unknown user <userx@example.com> (in reply to RCPT TO command)
 
 ------=_NextPart_000_0092_01C8B8BF.529D6450
 Content-Type: message/rfc822
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment
 
-Received: from nt-server.mmv.int (unknown [81.17.109.140])
-	by ipx14075.ipxserver.de (Postfix) with ESMTP id 24DA5E28456
-	for <prayer-needs-bounces@strategicnetwork.org>;
-	Sat, 17 May 2008 19:15:46 +0200 (CEST)
-From: <mailman-bounces@strategicnetwork.org>
-To: <prayer-needs-owner@strategicnetwork.org>
-Subject: Uncaught bounce notification
-Date: Sun, 18 May 2008 01:15:50 +0800
-Message-ID: <mailman.331.1211044550.3366.prayer-needs@strategicnetwork.org>
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="----=_NextPart_000_008E_01C8B8BF.529D6450"
-X-Mailer: Microsoft Office Outlook 12.0
-Thread-Index: Aci4QadXUNJ/Y2gvR9+59kbk4uSejw==
-
-This is a multipart message in MIME format.
-
-------=_NextPart_000_008E_01C8B8BF.529D6450
-Content-Type: text/plain;
-	boundary="===============0013193983==";
-	charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
-The attached message was received as a bounce, but either the bounce
-format was not recognized, or no member addresses could be extracted
-from it.  This mailing list has been configured to send all
-unrecognized bounce messages to the list administrator(s).
-
-For more information see:
-http://strategicnetwork.org/mailman/admin/prayer-needs/bounce
-
-
-------=_NextPart_000_008E_01C8B8BF.529D6450
-Content-Type: message/rfc822
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment
-
-Received: from strategicnetwork.org ([66.35.39.241]) by nt-server.mmv.int with
-	Microsoft SMTPSVC(6.0.3790.3959); Sat, 17 May 2008 07:14:58 +0200
-Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by
-	strategicnetwork.org (Postfix) with ESMTP id 6B793734E95 for
-	<oNlore.marr-bieger@michael-mueller-verlag.de>;
-	Fri, 16 May 2008 23:09:37 -0600 (MDT)
-From: <postmaster@michael-mueller-verlag.de>
-To: <prayer-needs-bounces@strategicnetwork.org>
-Subject: =?utf-7?Q?Benachrichtigung__zum__	+ANw-bermitt?=
-	=?utf-7?Q?lungsstatus__=28Verz+APY-gerung=29?=
-Date: Sun, 18 May 2008 01:21:01 +0800
-Message-ID: <vCWO6hm8U00000059@nt-server.mmv.int>
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="----=_NextPart_000_008A_01C8B8BF.5298A960"
-X-Mailer: Microsoft Office Outlook 12.0
-Thread-Index: Aci4QaYm8cki4UrMStOQ1CvDilgOdw==
-
-This is a multipart message in MIME format.
-
-------=_NextPart_000_008A_01C8B8BF.5298A960
-Content-Type: text/plain;
-	boundary="9B095B5ADSN=_01C8B2602C2F6AEE0007F371nt?server.mmv.in";
-	charset="utf-7";
-	report-type=delivery-status
-Content-Transfer-Encoding: quoted-printable
-
-Dies ist eine automatisch erstellte Benachrichtigung +APw-ber den =
-Zustellstatus.
-
-DIES IST NUR EINE WARNUNG.
-
-SIE M+ANw-SSEN DIE NACHRICHT NICHT ERNEUT SENDEN.
-
-+ANw-bermittlung an folgende Empf+AOQ-nger wurde verz+APY-gert.
-
-       spam+AEA-michael-mueller-verlag.de
-
-
-
-
-------=_NextPart_000_008A_01C8B8BF.5298A960
-Content-Type: message/delivery-status;
-	name="details.txt"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-	filename="details.txt"
-
-Reporting-MTA: dns;nt-server.mmv.int
-Received-From-MTA: dns;strategicnetwork.org
-Arrival-Date: Sat, 17 May 2008 07:14:58 +0200
-
-Final-Recipient: rfc822;spam@michael-mueller-verlag.de
-Action: delayed
-Status: 4.4.7
-Will-Retry-Until: Mon, 19 May 2008 07:15:00 +0200
-X-Display-Name: Spam
-
-------=_NextPart_000_008A_01C8B8BF.5298A960
-Content-Type: message/rfc822
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment
-
-Return-Path: <prayer-needs-bounces@strategicnetwork.org>
-Reply-To: <prayer-needs-request@strategicnetwork.org>
-From: <prayer-needs-request@strategicnetwork.org>
-Sender: <prayer-needs-bounces@strategicnetwork.org>
-To: <oNlore.marr-bieger@michael-mueller-verlag.de>
-Subject: confirm 3804b2ed9538e463f662ee4b2c3676ffec2658be
-Date: Sat, 17 May 2008 13:09:36 +0800
-Message-ID: <mailman.21740.1211000976.3367.prayer-needs@strategicnetwork.org>
-MIME-Version: 1.0
-Content-Type: text/plain;
-	charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-X-Mailer: Microsoft Office Outlook 12.0
-Thread-Index: Aci33PPN66MaDZVxS0+jRAs9I4FtWw==
-Content-Class: urn:content-classes:message
-
-Mailing list subscription confirmation notice for mailing list
-Prayer-needs
-
-We have received a request from
-onlore.marr-bieger@michael-mueller-verlag.de for subscription of your
-email address, "oNlore.marr-bieger@michael-mueller-verlag.de", to the
-prayer-needs@strategicnetwork.org mailing list.  To confirm that you
-want to be added to this mailing list, simply reply to this message,
-keeping the Subject: header intact.  Or visit this web page:
-
- 
-http://strategicnetwork.org/mailman/confirm/prayer-needs/3804b2ed9538e463f66
-2ee4b2c3676ffec2658be
-
-
-Or include the following line -- and only the following line -- in a
-message to prayer-needs-request@strategicnetwork.org:
-
-    confirm 3804b2ed9538e463f662ee4b2c3676ffec2658be
-
-Note that simply sending a `reply' to this message should work from
-most mail readers, since that usually leaves the Subject: line in the
-right form (additional "Re:" text in the Subject: is okay).
-
-If you do not wish to be subscribed to this list, please simply
-disregard this message.  If you think you are being maliciously
-subscribed to the list, or have any other questions, send them to
-prayer-needs-owner@strategicnetwork.org.
-
-
-------=_NextPart_000_008A_01C8B8BF.5298A960--
-
-------=_NextPart_000_008E_01C8B8BF.529D6450--
+Message removed
 
 ------=_NextPart_000_0092_01C8B8BF.529D6450--
 
diff --git a/tests/bounces/dsn_17.txt b/tests/bounces/dsn_17.txt
index 2fc60838..8fd39ce6 100644
--- a/tests/bounces/dsn_17.txt
+++ b/tests/bounces/dsn_17.txt
@@ -34,7 +34,7 @@ delete your own text from the attached returned message.
 
                    The mail system
 
-<kb3543.50@be37.mail.saunalahti.fi> (expanded from
+<xxx@example.fi> (expanded from
     <kb3543@be37.mail.saunalahti.fi>): temporary failure. Command output:
 Quota
     exceeded message delivery failed to /mail/mbx/p/5/kb3543/INBOX
@@ -51,8 +51,8 @@ X-Postfix-Queue-ID: ED106133145
 X-Postfix-Sender: rfc822; pray4-team-bounces@strategicnetwork.org
 Arrival-Date: Sun,  4 May 2008 05:51:07 +0300 (EEST)
 
-Final-Recipient: rfc822; kb3543.50@be37.mail.saunalahti.fi
-Original-Recipient: rfc822;christine.barsas@sivarikeskus.fi
+Final-Recipient: rfc822; xxx@example.fi
+Original-Recipient: rfc822;userx@example.fi
 Action: delayed
 Status: 4.3.0
 Diagnostic-Code: x-unix; Quota exceeded message delivery failed to
@@ -74,17 +74,17 @@ Received: from emh07.mail.saunalahti.fi (emh07.mail.saunalahti.fi =
 Received: from strategicnetwork.org (strategicnetwork.org =
 [66.35.39.241])
 	by emh07.mail.saunalahti.fi (Postfix) with ESMTP id D3C661C639E
-	for <christine.barsas@sivarikeskus.fi>; Sun,  4 May 2008 05:51:06 +0300 =
+	for <userx@example.fi>; Sun,  4 May 2008 05:51:06 +0300 =
 (EEST)
 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
 	by strategicnetwork.org (Postfix) with ESMTP id 27DF4734B75
-	for <christine.barsas@sivarikeskus.fi>; Sat,  3 May 2008 20:51:05 -0600 =
+	for <userx@example.fi>; Sat,  3 May 2008 20:51:05 -0600 =
 (MDT)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=3D"us-ascii"
 Content-Transfer-Encoding: 7bit
 From: pray4-team-request@strategicnetwork.org
-To: christine.barsas@sivarikeskus.fi
+To: userx@example.fi
 Subject: confirm d35a398026f31a7462cc90622a1e6180cd63ba60
 Reply-To: pray4-team-request@strategicnetwork.org
 Message-ID: =
diff --git a/tests/bounces/dumbass_01.txt b/tests/bounces/dumbass_01.txt
index c4e40d4b..0da64b65 100644
--- a/tests/bounces/dumbass_01.txt
+++ b/tests/bounces/dumbass_01.txt
@@ -1,14 +1,14 @@
 From VM Tue Dec 26 22:41:02 2000
 Return-Path: <python-list-admin@python.org>
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.3.1)
-  with ESMTP id 400019 for xxxxx@mail.digicool.com; Tue, 26 Dec 2000 18:02:35 -0500
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.3.1)
+  with ESMTP id 400019 for xxxxx@mail.example.com; Tue, 26 Dec 2000 18:02:35 -0500
 Received: from mail.python.org (starship.python.net [63.102.49.30])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id SAA02602
-	for <xxxxx@digicool.com>; Tue, 26 Dec 2000 18:02:28 -0500
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id SAA02602
+	for <xxxxx@example.com>; Tue, 26 Dec 2000 18:02:28 -0500
 Received: from ns1.zope.org (localhost.localdomain [127.0.0.1])
 	by mail.python.org (Postfix) with ESMTP id 9D20DE71C
-	for <xxxxx@digicool.com>; Tue, 26 Dec 2000 12:47:01 -0500 (EST)
+	for <xxxxx@example.com>; Tue, 26 Dec 2000 12:47:01 -0500 (EST)
 Delivered-To: mm+python-list-admin@python.org
 Received: from mail1.microsoft.com (mail1.microsoft.com [131.107.3.125])
 	by mail.python.org (Postfix) with SMTP id 23085E950
@@ -60,7 +60,7 @@ Received: from ns1.zope.org (localhost.localdomain [127.0.0.1])
 	by mail.python.org (Postfix) with ESMTP
 	id 80C4BE86C; Mon, 25 Dec 2000 11:41:09 -0500 (EST)
 Path: news.baymountain.net!uunet!ash.uu.net!news.netins.net!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!howland.erols.net!panix!news.panix.com!panix2.panix.com!not-for-mail
-From: aahz@panix.com (Aahz Maruch)
+From: userx@example.com (Aahz Maruch)
 Newsgroups: comp.lang.python
 Subject: Season's greetings (was Re: Some Python 2.1 ideas)
 Organization: The Cat & Dragon
diff --git a/tests/bounces/exim_01.txt b/tests/bounces/exim_01.txt
index 42ceb0b0..2997d5e7 100644
--- a/tests/bounces/exim_01.txt
+++ b/tests/bounces/exim_01.txt
@@ -1,11 +1,11 @@
-Received: from localhost (k298r.balpol.tudelft.nl) [127.0.0.1] 
+Received: from localhost (k298r.balpol.example.nl) [127.0.0.1] 
         by stereo.rotzorg.org with esmtp (Exim 2.05 #1 (Debian))
         id 11SrFm-000595-00; Mon, 20 Sep 1999 02:24:22 +0200
 Received: from mail by stereo.rotzorg.org with local (Exim 2.05 #1 (Debian))
         id 11SrFM-00058o-00; Mon, 20 Sep 1999 02:23:56 +0200
-X-Failed-Recipients: delangen@its.tudelft.nl
+X-Failed-Recipients: userx@its.example.nl
 From: Mail Delivery System <Mailer-Daemon@rotzorg.org>
-To: lanparty-helden-admin@rotzorg.org
+To: user@rotzorg.org
 Subject: Mail delivery failed: returning message to sender
 Message-Id: <E11SrFM-00058o-00@stereo.rotzorg.org>
 Date: Mon, 20 Sep 1999 02:23:56 +0200
@@ -18,17 +18,17 @@ This message was created automatically by mail delivery software.
 A message that you sent could not be delivered to all of its recipients. The
 following address(es) failed:
 
-  delangen@its.tudelft.nl:
+  userx@its.example.nl:
     SMTP error from remote mailer after RCPT TO:
-    <delangen@its.tudelft.nl>:
-    host mailhost1.et.tudelft.nl [130.161.33.163]:
+    <userx@its.example.nl>:
+    host mailhost1.et.example.nl [130.161.33.163]:
     553 5.1.1 unknown or illegal user:
-    delangen@its.tudelft.nl
+    userx@its.example.nl
 
 ----- This is a copy of the message, including all the headers. ------
 
 Return-path: <lanparty-helden-admin@rotzorg.org>
-Received: from localhost (k298r.balpol.tudelft.nl) [127.0.0.1] 
+Received: from localhost (k298r.balpol.example.nl) [127.0.0.1] 
         by stereo.rotzorg.org with esmtp (Exim 2.05 #1 (Debian))
         id 11SrFJ-00058j-00; Mon, 20 Sep 1999 02:23:53 +0200
 Received: from sgr by stereo.rotzorg.org with local (Exim 2.05 #1 (Debian))
diff --git a/tests/bounces/groupwise_01.txt b/tests/bounces/groupwise_01.txt
index 68101ba0..6a91c34f 100644
--- a/tests/bounces/groupwise_01.txt
+++ b/tests/bounces/groupwise_01.txt
@@ -3,19 +3,19 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Friday" "20" "July" "2001" "11:09:00" "-0700" "System Administrator" "postmaster@mainex1.asu.edu" nil "93" "Undeliverable: [Mailman-Users] [ alexandria-Bugs-442987 ] mailman	bug" "^From:" "mailman-users-admin@python.org" "mailman-users-admin@python.org" "7" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: barry@wooz.org
-Received: from digicool.com (unknown [63.100.190.15])
+Delivered-To: usery@wooz.org
+Received: from example.com (unknown [63.100.190.15])
 	by mail.wooz.org (Postfix) with ESMTP id 2193BD35F0
-	for <barry@wooz.org>; Fri, 20 Jul 2001 14:11:42 -0400 (EDT)
+	for <usery@wooz.org>; Fri, 20 Jul 2001 14:11:42 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 2267275; Fri, 20 Jul 2001 14:11:10 -0400
-Received: from ns2.digicool.com ([63.100.190.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2267274 for barry@mail.digicool.com; Fri, 20 Jul 2001 14:11:10 -0400
+Received: from ns2.example.com ([63.100.190.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 2267274 for usery@mail.example.com; Fri, 20 Jul 2001 14:11:10 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id OAA18755
-	for <barry@digicool.com>; Fri, 20 Jul 2001 14:11:40 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id OAA18755
+	for <usery@example.com>; Fri, 20 Jul 2001 14:11:40 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15NekX-00065F-00; Fri, 20 Jul 2001 14:11:41 -0400
@@ -69,7 +69,7 @@ Your message
 
 did not reach the following recipient(s):
 
-thoff@MAINEX1.ASU.EDU on Fri, 20 Jul 2001 11:08:59 -0700
+userx@example.EDU on Fri, 20 Jul 2001 11:08:59 -0700
     The recipient name is not recognized
 	The MTS-ID of the original message is: c=us;a= ;p=arizona state
 un;l=MAINEX101072018083MQDQNKX
@@ -82,10 +82,10 @@ Recipient
 Content-type: message/rfc822
 
 Date: Fri, 20 Jul 2001 08:53:08 -0700
-From: Marc MERLIN <marc@merlins.org>
+From: Marc MERLIN <marc@example.org>
 Subject: [Mailman-Users] [ alexandria-Bugs-442987 ] mailman bug
 To: mailman-users@python.org
-Message-id: <20010720085308.H17468@magic.merlins.org>
+Message-id: <20010720085308.H17468@magic.example.org>
 MIME-version: 1.0
 X-Mailer: Internet Mail Service (5.5.2653.19)
 Content-type: text/plain
@@ -98,50 +98,6 @@ List-Help: <mailto:mailman-users-request@python.org?subject=help>
 
 Anyone has a clue about this error?
 
------ Forwarded message from noreply@sourceforge.net -----
-
-To: noreply@sourceforge.net
-From: noreply@sourceforge.net
-Subject: [ alexandria-Bugs-442987 ] mailman bug
-Date: Fri, 20 Jul 2001 07:47:39 -0700
-
-Initial Comment:
------Forwarded Message-----
-From: rtfs-project-admin@lists.sourceforge.net
-To: rtfs-project-admin@lists.sourceforge.net
-Subject: Unexpected Mailman error
-
-
-An unexpected Mailman error has occurred in
-MailCommandHandler.ParseMailCommands().  Here is the
-traceback:
-
-Traceback (innermost last):
-  File
-"/var/local/mailman/Mailman/MailCommandHandler.py",
-line 221, in ParseMailCommands
-    self.__dispatch[cmd](args, line, msg)
-  File
-"/var/local/mailman/Mailman/MailCommandHandler.py",
-line 362, in ProcessSetCmd
-    self.ConfirmUserPassword(sender, args[2])
-  File "/var/local/mailman/Mailman/SecurityManager.py",
-line 140, in ConfirmUserPassword
-    raise Errors.MMBadUserError
-MMBadUserError
-
-----------------------------------------------------------------------
-
------ End forwarded message -----
-
--- 
-Microsoft is to operating systems & security ....
-                                      .... what McDonalds is to gourmet
-cooking
-  
-Home page: http://marc.merlins.org/   |   Finger marc_f@merlins.org for PGP
-key
-
 ------------------------------------------------------
 Mailman-Users maillist  -  Mailman-Users@python.org
 http://mail.python.org/mailman/listinfo/mailman-users
diff --git a/tests/bounces/groupwise_02.txt b/tests/bounces/groupwise_02.txt
index 3abfdf86..87f46804 100644
--- a/tests/bounces/groupwise_02.txt
+++ b/tests/bounces/groupwise_02.txt
@@ -47,7 +47,7 @@ Content-Type: text/html;
 <BR>
 did not reach the following recipient(s):<BR>
 <BR>
-omarmo@thebas.com on Thu, 11 Jul 2002 16:54:54 -0300<BR>
+userx@example.com on Thu, 11 Jul 2002 16:54:54 -0300<BR>
 &nbsp;&nbsp;&nbsp; The recipient name is not recognized<BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; The MTS-ID of the original message is: c=us;a= ;p=thebas sa;l=THEDC020207111954NZ5X2T9P<BR>
 &nbsp;&nbsp;&nbsp; MSEXCH:IMS:Thebas sa:CENTRAL:THEDC02 0 (000C05A6) Unknown Recipient<BR>
@@ -61,126 +61,8 @@ omarmo@thebas.com on Thu, 11 Jul 2002 16:54:54 -0300<BR>
 ------_=_NextPart_000_01C22914.D8CBF488
 Content-Type: message/rfc822
 
-Message-ID: <15661.57857.753290.942668@anthem.wooz.org>
-From: barry@zope.com
-To: mailman-announce@python.org
-Cc: mailman-developers@python.org, mailman-users@python.org
-Subject: [Mailman-Developers] RELEASED Mailman 2.0.12
-Date: Thu, 11 Jul 2002 16:52:33 -0300
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-X-MS-Embedded-Report: 
-List-Help: <mailto:mailman-developers-request@python.org?subject=help>
-List-Subscribe: <http://mail.python.org/mailman-21/listinfo/mailman-developers>,<mailto:mailman-developers-request@python.org?subject=subscribe>
-List-Unsubscribe: <http://mail.python.org/mailman-21/listinfo/mailman-developers>,<mailto:mailman-developers-request@python.org?subject=unsubscribe>
-Content-Type: text/html;
-	charset="iso-8859-1"
-Content-Transfer-Encoding: quoted-printable
+Message removed
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =
-charset=3Diso-8859-1">
-<META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version =
-5.5.2653.12">
-<TITLE>[Mailman-Developers] RELEASED Mailman 2.0.12</TITLE>
-</HEAD>
-<BODY>
-<BR>
-
-<P><FONT SIZE=3D2>I' released Mailman 2.0.12 which fixes a cross-site =
-scripting</FONT>
-<BR><FONT SIZE=3D2>vulnerability, among other changes.&nbsp; I =
-recommend that folks upgrade</FONT>
-<BR><FONT SIZE=3D2>their 2.0.x systems to this new version.&nbsp; See =
-below for a NEWS file</FONT>
-<BR><FONT SIZE=3D2>excerpt.</FONT>
-</P>
-
-<P><FONT SIZE=3D2>As usual, I've made both full source tarballs and =
-patches available.</FONT>
-<BR><FONT SIZE=3D2>See</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; <A =
-HREF=3D"http://sourceforge.net/project/showfiles.php?group_id=3D103" =
-TARGET=3D"_blank">http://sourceforge.net/project/showfiles.php?group_id=3D=
-103</A></FONT>
-</P>
-
-<P><FONT SIZE=3D2>for links to download all the patches and the source =
-tarball.&nbsp; If you</FONT>
-<BR><FONT SIZE=3D2>decide to install the patches, please do read the =
-release notes first:</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; <A =
-HREF=3D"http://sourceforge.net/project/shownotes.php?release_id=3D97760"=
- =
-TARGET=3D"_blank">http://sourceforge.net/project/shownotes.php?release_i=
-d=3D97760</A></FONT>
-</P>
-
-<P><FONT SIZE=3D2>See also:</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; <A =
-HREF=3D"http://www.gnu.org/software/mailman" =
-TARGET=3D"_blank">http://www.gnu.org/software/mailman</A></FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; <A HREF=3D"http://www.list.org" =
-TARGET=3D"_blank">http://www.list.org</A></FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; <A HREF=3D"http://mailman.sf.net" =
-TARGET=3D"_blank">http://mailman.sf.net</A></FONT>
-</P>
-
-<P><FONT SIZE=3D2>Cheers,</FONT>
-<BR><FONT SIZE=3D2>-Barry</FONT>
-</P>
-
-<P><FONT SIZE=3D2>-------------------- snip snip =
---------------------</FONT>
-<BR><FONT SIZE=3D2>2.0.12 (02-Jul-2002)</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; - Implemented a guard against some =
-reply loops and 'bot</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; subscription =
-attacks.&nbsp; Specifically, if a message to -request</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; has a Precedence: =
-bulk (or list, or junk) header, the command is</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ignored.&nbsp; =
-Well-behaved 'bots should always include such a</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; header.</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; - Changes to the configure script =
-so that you can pass in the mail</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; host and web host by =
-setting the environment variables MAILHOST</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and WWWHOST =
-respectively.&nbsp; configure will also exit if it can't</FONT>
-<BR><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; figure out these =
-values (usually due to broken dns).</FONT>
-</P>
-
-<P><FONT SIZE=3D2>&nbsp;&nbsp;&nbsp; - Closed another minor cross-site =
-scripting vulnerability.</FONT>
-</P>
-<BR>
-
-<P><FONT =
-SIZE=3D2>_______________________________________________</FONT>
-<BR><FONT SIZE=3D2>Mailman-Developers mailing list</FONT>
-<BR><FONT SIZE=3D2>Mailman-Developers@python.org</FONT>
-<BR><FONT SIZE=3D2><A =
-HREF=3D"http://mail.python.org/mailman-21/listinfo/mailman-developers" =
-TARGET=3D"_blank">http://mail.python.org/mailman-21/listinfo/mailman-dev=
-elopers</A></FONT>
-</P>
-
-</BODY>
-</HTML>
 ------_=_NextPart_000_01C22914.D8CBF488--
 
 
diff --git a/tests/bounces/hotpop_01.txt b/tests/bounces/hotpop_01.txt
index b02f4265..10da30d0 100644
--- a/tests/bounces/hotpop_01.txt
+++ b/tests/bounces/hotpop_01.txt
@@ -53,7 +53,7 @@ This is a MIME-encapsulated message.
 Content-Description: Notification
 Content-Type: text/plain
 
-Undeliverable Address: allensmithee@hotpop.com
+Undeliverable Address: userx@example.com
 
 Reason: The email you sent to the address specified
 above has been returned because the recipient is over disk quota.  This
@@ -70,109 +70,7 @@ Original message attached (Max 5k)
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from babylon.socal-raves.org (ip-209-85-222-117.dreamhost.com
-	[209.85.222.117])
-	by mx1.hotpop.com (Postfix) with ESMTP
-	id 3F802249091;
-	Tue, 13 Nov 2001 20:48:57 +0000 (UTC)
-Received: from babylon.socal-raves.org (localhost [127.0.0.1])
-	by babylon.socal-raves.org (Postfix) with ESMTP
-	id 62A6E51D4C; Tue, 13 Nov 2001 12:47:47 -0800 (PST)
-Delivered-To: scr-post@babylon.socal-raves.org
-Received: by babylon.socal-raves.org (Postfix, from userid 60001)
-	id D4A4551D4C; Tue, 13 Nov 2001 12:47:43 -0800 (PST)
-Delivered-To: scr@socal-raves.org
-Received: from mail24.bigmailbox.com (mail24.bigmailbox.com
-  [209.132.220.207]) by babylon.socal-raves.org (Postfix) with ESMTP id
-  0750D51B8A for <scr@socal-raves.org>; Tue, 13 Nov 2001 12:47:43 -0800
-  (PST)
-Received: (from www@localhost) by mail24.bigmailbox.com (8.10.0/8.10.0)
-  id fADKmeG21560; Tue, 13 Nov 2001 12:48:40 -0800
-Date: Tue, 13 Nov 2001 12:48:40 -0800
-Message-Id: <200111132048.fADKmeG21560@mail24.bigmailbox.com>
-Content-Type: text/plain
-Content-Disposition: inline
-Content-Transfer-Encoding: 8bit
-X-Mailer: MIME-tools 4.104 (Entity 4.116)
-Mime-Version: 1.0
-X-Originating-Ip: [192.76.84.68]
-From: "Jim C" <globalenergymusik@housemusic.com>
-To: scr@socal-raves.org, fitrhaper@aol.com, pbrock@odin.ac.hmc.edu
-Subject: RE: Re: [scr] scary
-Sender: scr-admin@socal-raves.org
-Errors-To: scr-admin@socal-raves.org
-X-BeenThere: scr@socal-raves.org
-X-Mailman-Version: 2.1a3+
-Precedence: bulk
-List-Help: <mailto:scr-request@socal-raves.org?subject=help>
-List-Post: <mailto:scr@socal-raves.org>
-List-Subscribe: <http://socal-raves.org/mailman/listinfo/scr>,
-	<mailto:scr-request@socal-raves.org?subject=subscribe>
-List-Id: SoCal-Raves <scr.socal-raves.org>
-List-Unsubscribe: <http://socal-raves.org/mailman/listinfo/scr>,
-	<mailto:scr-request@socal-raves.org?subject=unsubscribe>
-List-Archive: <http://socal-raves.org/mailman/private/scr/>
-
-[demime could not interpret encoding binary - treating as plain text]
-Hi New to the List.   Just curious.  What would you have the government do instead?    I see alot of passion over this topic so I assume you have an alternative to Ashcroft.     These are tough times, and call for quick and concise thinking, Gov is doing its best, Do we have anything better in mind that can be implemented in a short amount of time like this is.? 
-
-> FitRhapER@aol.comDate: Tue, 13 Nov 2001 00:39:20 EST
-> Re: [scr] scary pbrock@odin.ac.hmc.edu, scr@socal-raves.org
->argh! That makes me so angry. Every time i see another people happily not 
->questioning anything and going along with the government for some idiotic 
->reason (i cant really figure out why people happily go along with things, i 
->guess just less stress or something) it just disheartens me further. Why 
->don't these people see just a bit further. I mean it's not hard to see how 
->this could be misused is it? And alot of these people wont be convinced 
->otherwise. You tell them the facts. They give you the obivious retort (the 
->one they've been spoon fed), you show them how that could be side stepped to 
->hurt the innocent, they give you another answer (usually one they thought up 
->themselves, oo how clever), you again show em how this is 
->wrong/unconstitutional/gonna fuck everything  up. They give you a "yeah well, 
->the government needs to stop terrorism somehow!" kind of answer.
->
->grrrr. *slap* WAKE UP BITCH!!! then they ask you why your eyes are all glazed 
->over and you're smiling funny.
->
->peace
->olly the limey
->
->> i know many mudders who think the goverenment is being perfectly
->>  reasonable and that everything about the war and the new laws is
->>  correct.  one girl lives like a few doors down from me and it just cracks
->>  me up....
->>  
->>  jesus i can understand not hating everyth9ing, but being happy with every
->>  action the government is taking now just boggles my mind
->>  
->>  on an unrelated note./......
->>  
->>  i like buffy songs...yay buffy songs
->>  
->>  ,tricia
->>  
->>  AIM amphitrite27
->>  
->>  http://www.geocities.com/amphitrite27/index.html
->>  
->>  I wanted a perfect ending. Now I've learned, the hard way, that some poems
->>  don't rhyme, and some stories don't have a clear beginning, middle, and
->>  end. Life is about not knowing, having to change, taking the moment and
->>  making the best of it without knowing what's going to happen next.
->>          ~Gilda Radner
->_______________________________________________
->For event info, list questions, or to unsubscribe, see http://www.socal-raves.org/
-
-
-
-
-------------------------------------------------------------
-House music all night long...
-<a href="http://www.housemusic.com">http://www.housemusic.com</a> 
-_______________________________________________
-For event info, list questions, or to unsubscribe, see http://www.socal-raves.org/
-
-
+Message removed
 
 --------------1903.1005687801/HotPOP.com--
 
diff --git a/tests/bounces/llnl_01.txt b/tests/bounces/llnl_01.txt
index 9a6de7f9..145654d3 100644
--- a/tests/bounces/llnl_01.txt
+++ b/tests/bounces/llnl_01.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Sunday" "27" "May" "2001" "14:25:17" "-0700" "Automated response from LLNL postmaster" "postmaster@llnl.gov" nil "153" "FAILED MAIL to \"trotts1\" regarding \"[ANNOUNCE] wxPython 2.3.0\"" "^From:" nil nil "5" nil nil nil nil nil]
 	nil)
 Return-Path: <python-announce-list-admin@python.org>
-Delivered-To: barry@wooz.org
-Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id 307A8D38E0
-	for <barry@wooz.org>; Sun, 27 May 2001 17:26:43 -0400 (EDT)
+Delivered-To: usery@example.org
+Received: from example.com (unknown [63.100.190.15])
+	by mail.example.org (Postfix) with ESMTP id 307A8D38E0
+	for <usery@example.org>; Sun, 27 May 2001 17:26:43 -0400 (EDT)
 Received: from <python-announce-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1985528; Sun, 27 May 2001 17:27:06 -0400
-Received: from ns2.digicool.com ([63.100.190.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1985527 for barry@mail.digicool.com; Sun, 27 May 2001 17:27:06 -0400
+Received: from ns2.example.com ([63.100.190.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1985527 for usery@mail.example.com; Sun, 27 May 2001 17:27:06 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id RAA21782
-	for <barry@digicool.com>; Sun, 27 May 2001 17:26:42 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id RAA21782
+	for <usery@example.com>; Sun, 27 May 2001 17:26:42 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15483f-000890-00
-	for barry@digicool.com; Sun, 27 May 2001 17:26:43 -0400
+	for usery@example.com; Sun, 27 May 2001 17:26:43 -0400
 Received: from [128.115.41.100] (helo=pierce.llnl.gov)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15482m-00086w-00
@@ -49,155 +49,18 @@ X-Mailman-Version: 2.0.5 (101270)
 
 The standard form of email address at LLNL is lastnameNumber@llnl.gov
 although individuals may choose an alternate email address. The address to
-which your message was addressed, trotts1@llnl.gov, did not exactly match an
+which your message was addressed, user1@example.gov, did not exactly match an
 LLNL email address.
 
 The following locator information may be of help in finding another means
-of contacting "trotts1":
+of contacting "user1":
 
-  Judy L. Trotter            +1 925-423-5635       trotter4@llnl.gov
+  Judy L. User            +1 925-xxx-xxxx       user4@example.gov
                              L-149
 
 
 Original message as received is as follows:
 ========================================================================
 >Return-Path: <python-announce-list-admin@python.org>
->Received: from smtp-in-2.llnl.gov (smtp-in-2.llnl.gov [128.115.249.72]) by pierce.llnl.gov (8.8.8/LLNL-3.0.2/llnl.gov-5.1) with ESMTP id OAA03514 for <trotts1@llnl.gov>; Sun, 27 May 2001 14:21:25 -0700 (PDT)
->Received: from mail.python.org (localhost [127.0.0.1])	by smtp-in-2.llnl.gov (8.9.3/8.9.3/LLNL-gateway-1.0) with ESMTP id OAA20597	for <trotts1@llnl.gov>; Sun, 27 May 2001 14:21:23 -0700 (PDT)
->Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)	by mail.python.org with esmtp (Exim 3.21 #1)	id 1547yA-0007w7-00; Sun, 27 May 2001 17:21:02 -0400
->Path: news.baymountain.net!not-for-mail
->From: "Robin Dunn" <robin@alldunn.com>
->Newsgroups: comp.lang.python.announce
->Subject: [ANNOUNCE] wxPython 2.3.0
->Organization: Baymountain
->Lines: 150
->Message-ID: <mailman.990998285.30333.clpa-moderators@python.org>
->NNTP-Posting-Host: mail.python.org
->X-Trace: news.baymountain.net 990998285 26598 63.102.49.29 (27 May 2001 21:18:05 GMT)
->X-Complaints-To: abuse@baymountain.net
->NNTP-Posting-Date: 27 May 2001 21:18:05 GMT
->X-Priority: 3
->X-MSMail-Priority: Normal
->X-Mailer: Microsoft Outlook Express 5.50.4133.2400
->X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
->X-BeenThere: clpa-moderators@python.org
->X-Mailman-Version: 2.0.5 (101270)
->Precedence: bulk
->X-BeenThere: clpa-moderators@python.org
->Xref: news.baymountain.net comp.lang.python.announce:1064
->X-Originally-To: <wx-announce@lists.wxwindows.org>, <python-announce-list@python.org>, <python-list@python.org>
->To: python-announce-list@python.org
->Sender: python-announce-list-admin@python.org
->Errors-To: python-announce-list-admin@python.org
->X-BeenThere: python-announce-list@python.org
->List-Help: <mailto:python-announce-list-request@python.org?subject=help>
->List-Post: <mailto:python-announce-list@python.org>
->List-Subscribe: <http://mail.python.org/mailman/listinfo/python-announce-list>,	<mailto:python-announce-list-request@python.org?subject=subscribe>
->List-Id: Announcement-only list for the Python programming language <python-announce-list.python.org>
->List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-announce-list>,	<mailto:python-announce-list-request@python.org?subject=unsubscribe>
->List-Archive: <http://mail.python.org/pipermail/python-announce-list/>
->Date: Fri, 25 May 2001 10:24:51 -0700
->
->wxPython 2.3.0 is now available for download.  Unfortunately the shell
->server at sourceforge is down for a few days and so I can't update the
->wxPython.org web page, but in the meantime you can get the files directly
->from
->
->http://sourceforge.net/project/showfiles.php?group_id=10718.
->
->Sources and binaries for win32 and Linux for Python 1.5.2, 2.0 and 2.1 are
->available.  (The win32 binaries with "-hybrid" in the name are built with
->extra debugging code enabled so some things that caused mysterious problems
->before will now pop-up a slightly less mysterious message dialog.)
->
->There have been a large number of changes for this release.  I'll include
->the relevant portion of CHANGES.txt here:
->
->
->
->Removed initial startup dependency on the OpenGL DLLs so only the
->glcanvasc.pyd depends on them, (on wxMSW.)
->
->Changed wxFont, wxPen, wxBrush to not implicitly use the
->wxThe[Font|Pen|Brush]List objects behind the scenes, but to use normal
->ctor and dtors.
->
->Exposed the wxThe[Font|Pen|Brush]List to wxPython.
->
->Also added wxTheColourDatabase and added a library module (in the
->wxPython.lib.colourdb module) to load LOTS more colour names into the
->colour database.
->
->Added wxWakeUpMainThread, wxMutexGuiEnter, wxMutexGuiLeave,
->wxMutexGuiLocker and wxThread_IsMain to assist with dealing with GUI
->access from non-GUI threads.
->
->wxPyOnDemandOutputWindow is now (more) thread safe if non-GUI threads
->use print, sys.stdout.write, etc.
->
->Added CreateTextSizer and CreateButtonSizer to wxDialog
->
->Added wxPython/lib/infoframe.py from Chris Fama.  It contains a class
->that can be used in place of wxPyOnDemandOutputWindow.
->
->Added colourselect.py, imagebrowser.py and an updated calendar.py to
->wxPython/lib from Lorne White.
->
->Added patch to wxPoint_LIST_helper from Tim Hochberg that should make
->it gobs faster in certain situations.
->
->Added tools that will take an image file in a wx supported format and
->convert it to data embedded in a Python source file.  The image is
->converted to XPM format which is essentially a list of strings
->containing info about each pixel.  The image's transparency mask is
->included, if there is one, or a mask can be added if a mask colour is
->specified on the command line.  It is then pickled and optionally
->compressed and written to a Python source file along with functions to
->convert it to either a wxBitmap or a wxImage.  See
->wxPython/demo/images.py for examples, and wxPython/Tools/img2py.py for
->the implementation.
->
->Fixed wxStyledTextCtrl to be much faster on wxGTK.  There was some
->experimental code that got left in place that ended up causing way too
->many refreshes.
->
->A couple more hacks in my_distutils.py so wxPython can be built with
->the distutils that comes with Python 2.1.
->
->Added a ton of missing methods for wxPrintData.
->
->Switched to InnoSetup for MSW distributions.
->
->Added wxToggleButton.
->
->Fixed bug that prevented wxTreeCtrl.OnCompareItems from being called.
->
->Added some methods to wxGrid:
->      GetCellHighlightPenWidth
->      GetCellHighlightROPenWidth
->      SetCellHighlightPenWidth
->      SetCellHighlightROPenWidth
->      GetGridWindow
->      GetGridRowLabelWindow
->      GetGridColLabelWindow
->      GetGridCornerLabelWindow
->
->Added wxGetClientDisplayRect which on wxMSW returns a wxRect
->representing the area on screen not occupied by the taskbar and such.
->On other platforms it is equivallent to wxGetDisplaySize.
->
->
->***---***---***---***---***---***---***---***---***---***---***---
->   Implemented the first phase of OOR (Original Object Return).  See
->   the text in the demo for more details of what this means, but in a
->   nutshell methods such as wxWindow.GetParent or FindWindowById will
->   now return a shadow object of the proper type if it can.  By
->   "proper type" I mean that if the wxWindow pointer returned from
->   FindWindowById really points to a wxButton then the Python object
->   constructed will be of a wxButtonPtr class instead of wxWindowPtr
->   as before.  This should reduce or eliminiate the need for
->   wxPyTypeCast.  (Woo Hoo!)  The objects returned are still not the
->   original Python object, but that is the next step.  (Although it
-
-
-
+>Received: from smtp-in-2.llnl.gov (smtp-in-2.llnl.gov [128.115.249.72]) by pierce.llnl.gov (8.8.8/LLNL-3.0.2/llnl.gov-5.1) with ESMTP id OAA03514 for <user1@example.gov>; Sun, 27 May 2001 14:21:25 -0700 (PDT)
+>Received: from mail.python.org (localhost [127.0.0.1])	by smtp-in-2.llnl.gov (8.9.3/8.9.3/LLNL-gateway-1.0) with ESMTP id OAA20597	for <user1@example.gov>; Sun, 27 May 2001 14:21:23 -0700 (PDT)
diff --git a/tests/bounces/microsoft_01.txt b/tests/bounces/microsoft_01.txt
index 92465f78..67e2d25b 100644
--- a/tests/bounces/microsoft_01.txt
+++ b/tests/bounces/microsoft_01.txt
@@ -30,7 +30,7 @@ Your message
 
 did not reach the following recipient(s):
 
-c=US;a= ;p=IKON;o=Nexus2;dda:SMTP=DJBENNETT@IKON.COM; on Fri, 4 Oct 2002
+c=US;a= ;p=IKON;o=Nexus2;dda:SMTP=userx@example.COM; on Fri, 4 Oct 2002
 17:12:28 -0400
     The recipient name is not recognized
 	The MTS-ID of the original message is: c=us;a=
@@ -42,67 +42,7 @@ c=US;a= ;p=IKON;o=Nexus2;dda:SMTP=DJBENNETT@IKON.COM; on Fri, 4 Oct 2002
 ------_=_NextPart_000_01C26BEA.C2970D56
 Content-Type: message/rfc822
 
-Message-ID: <5.1.1.5.2.20021004224506.00bd9ff8@mail.chello.se>
-From: Mikael Hedberg <mhedberg@chello.se>
-To: pit-penguins@plaidworks.com
-Subject: RE: Waiver draft results explained
-Date: Fri, 4 Oct 2002 17:10:56 -0400 
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2656.59)
-X-MS-Embedded-Report: 
-List-Help: <mailto:pit-penguins-request@plaidworks.com?subject=help>
-List-Subscribe: <http://plaidworks.com/mailman/listinfo/pit-penguins>,<mailto:pit-penguins-request@plaidworks.com?subject=subscribe>
-List-Unsubscribe: <http://plaidworks.com/mailman/listinfo/pit-penguins>,<mailto:pit-penguins-request@plaidworks.com?subject=unsubscribe>
-Content-Type: text/plain;
-	charset="iso-8859-1"
-
-
-OK, one more time...slowly:
-
-Youngsters like Berry, Meloche and TK are no longer exempt from regular 
-season waivers. Hence, they'd have to pass through waivers to be sent down 
-to WBS.
-
-Now, during the waiver draft, to claim a player you must also unprotect one 
-of your own players. This is different from the regular waivers, where any 
-team can claim any player without giving up anything but the waiver fee. 
-This means teams are more reluctant to claim guys, since they run the risk 
-of losing one of their own players.
-
-However, if a player was to pass through the waiver draft *unclaimed*, he 
-would also count as having passed regular waivers -- and then be allowed to 
-be sent down immidiately. This was most definitely Patrick's reasoning for 
-Meloche and TK -- he said as much yesterday -- and probably also for Berry; 
-ie. management wanted them playing in the minors, and this was the best 
-chance of getting them there. The only other option would be to keep them 
-on the big team for the entire season.
-
-Also, if Washington ever wants to send Berry down, they must put him 
-through waivers, where the Pens have the option of claiming him back -- and 
-would then, as the original owning team, be free to send him down to THEIR 
-minor club without putting him on waivers (NHL CBA, article 13.20, I
-believe).
-
-Personally, I think this whole Rick Berry issue has been totally blown out 
-of proportion. It's not like he's the second coming of Ray Bourque or even 
-Scott Stevens. He's a borderline NHL:er who probably would've played out 
-most of the season in the minors anyway (seeing as how Penguins management 
-weren't too high on him after camp). While I can't say I feel content to 
-lose one asset of the Kasparaitis trade already, the reasoning behind this 
-move is sound, and all you Pittsburgh/Mario/CP-bashers are really making a 
-chicken out of a feather here.
-
-__________________________________________________________________
-  Mikael Hedberg                                mhedberg@chello.se
-
-  "It does not do to leave a live dragon out of your calculations,
-   if you live near one." ---J.R.R. Tolkien
-
-_______________________________________________
-Do not post admin requests to the list. They will be ignored.
-pit-penguins mailing list
-pit-penguins@plaidworks.com
-http://plaidworks.com/mailman/listinfo/pit-penguins
+Message removed
 
 ------_=_NextPart_000_01C26BEA.C2970D56--
 
diff --git a/tests/bounces/microsoft_02.txt b/tests/bounces/microsoft_02.txt
index 3c6c5416..cccc4816 100644
--- a/tests/bounces/microsoft_02.txt
+++ b/tests/bounces/microsoft_02.txt
@@ -36,7 +36,7 @@ Your message
 
 did not reach the following recipient(s):
 
-MDMOORE@BALL.COM on Fri, 18 Oct 2002 09:13:24 -0600
+userx@example.COM on Fri, 18 Oct 2002 09:13:24 -0600
     The recipient name is not recognized
 	The MTS-ID of the original message is: c=us;a=
 ;p=ball;l=AEROMSG2021018151347W14KQ9
@@ -48,71 +48,7 @@ MDMOORE@BALL.COM on Fri, 18 Oct 2002 09:13:24 -0600
 ------_=_NextPart_000_01C276B8.EB5EB90E
 Content-Type: message/rfc822
 
-Message-ID: <NGBBLKFIDENNFHKFMGAIGEMNCJAA.badmangabriel@lycos.co.uk>
-From: Angel Gabriel <badmangabriel@lycos.co.uk>
-To: K12 <k12osn@redhat.com>
-Cc: Mailman <mailman-users@python.org>, RedHat Mail List
-	 <redhat-install-list@redhat.com>
-Subject: [Mailman-Users] Virus in ma mail ... these are the headers....
-Date: Fri, 18 Oct 2002 09:25:07 -0600
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-X-MS-Embedded-Report: 
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,<mailto:mailman-users-request@python.org?subject=unsubscribe>
-Content-Type: text/plain;
-	charset="iso-8859-1"
-
-This is a continuation of my viral problem.... I'm guessing that this person
-was either infected by my, or infected me.... but how do I notify them??
-These are the headers of one of the problem mails. Is there anything I can
-do?
-
-Return-Path: <friends@shakeit.net> 
-Received: from smtp.lycos.co.uk (croy-gw1.homechoice.co.uk [212.187.250.18])
-
-        by mailbox-8.st1.spray.net (Postfix) with SMTP id 7E1E3252DF 
-        for <badmangabriel@lycos.co.uk>; Fri, 18 Oct 2002 17:01:29 +0200
-(DST) 
-From: werfriends <friends@shakeit.net> 
-To: badmangabriel@lycos.co.uk 
-Subject: Bullshit Screensaver to ur friends !! 
-Date: Fri,18 Oct 2002 16:03:06 PM 
-X-Mailer: Microsoft Outlook Express 5.50.4133.2400 
-MIME-Version: 1.0 
-Content-Type: multipart/mixed; 
-        boundary=simqlgr 
-Message-Id: <20021018150129.7E1E3252DF@mailbox-8.st1.spray.net> 
-
-  
-
-***
-
-Not everyone is touched by an Angel......and those that are, never forget
-the experience.
-
-***
-
-If you want guest list for bare club nights.....
-http://raw-talent.hopto.org/mailman/clubnights
-<http://raw-talent.hopto.org/mailman/clubnights> 
-
-***
-
-Can you sing, dance, MC, DJ, do you have talent? Send an email to
-sign-me@raw-talent.hopto.org
-
-***
-
-
----
-Outgoing mail is certified Virus Free.
-Checked by AVG anti-virus system ( http://www.grisoft.com
-<http://www.grisoft.com> ).
-Version: 6.0.394 / Virus Database: 224 - Release Date: 10/3/02
-  
-
+Message removed
 
 ------_=_NextPart_000_01C276B8.EB5EB90E--
 
diff --git a/tests/bounces/microsoft_03.txt b/tests/bounces/microsoft_03.txt
index e4216e0c..366db641 100644
--- a/tests/bounces/microsoft_03.txt
+++ b/tests/bounces/microsoft_03.txt
@@ -4,22 +4,22 @@ Received: from acsnt26.acsnet.net (acsnt26.acsnet.net [64.57.128.126])
 Received: from mail pickup service by acsnt26.acsnet.net with Microsoft
 	SMTPSVC; Sat, 21 Jan 2006 21:40:13 -0800
 x-ReceivedDate: 1/21/2006 9:40:12 PM send off later
-x-Original-RecipientList: SMTP:midica@banknbr.com;
+x-Original-RecipientList: SMTP:userx@example.com;
 Accept-Status: Accept
-x-Original-To: "midica@banknbr.com" <midica@banknbr.com>
+x-Original-To: "userx@example.com" <userx@example.com>
 Thread-Topic: Non-Delivery: Your message to GPC-talk awaits moderator approval
 Content-Class: urn:content-classes:message
 Received: from sb7.songbird.com ([208.184.79.137]) by acsnt26.acsnet.net with
 	Microsoft SMTPSVC(5.0.2195.6713); Sat, 21 Jan 2006 21:40:12 -0800
 Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1]) by
 	sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k0M5ZXVc012945
-	for <midica@banknbr.com>; Sat, 21 Jan 2006 21:35:33 -0800
+	for <userx@example.com>; Sat, 21 Jan 2006 21:35:33 -0800
 MIME-Version: 1.0
 Content-Type: text/plain;
 	charset="us-ascii"
 Message-ID: <118901c61f16$50a88200$7e803940@ACSNET.NET>
 Subject: Non-Delivery: Your message to GPC-talk awaits moderator approval
-From: <admin@banknbr.com>
+From: <admin@example.com>
 X-Mailer: Microsoft CDO for Windows 2000
 To: <gpc-talk-bounces@grizz.org>
 Date: Sat, 21 Jan 2006 21:40:12 -0800
@@ -43,7 +43,7 @@ X-MIME-Autoconverted: from quoted-printable to 8bit by sb7.songbird.com id
 --- Non-Delivery Report ---
 The email below could not be delivered to the following user:
 
-"midica@banknbr.com" <midica@banknbr.com>
+"userx@example.com" <userx@example.com>
 
 Old message:
 
diff --git a/tests/bounces/netscape_01.txt b/tests/bounces/netscape_01.txt
index adcde15b..40c8c2c1 100644
--- a/tests/bounces/netscape_01.txt
+++ b/tests/bounces/netscape_01.txt
@@ -71,53 +71,6 @@ Content-Type: message/rfc822
 Content-Disposition: inline
 Content-Transfer-Encoding: 7bit
 
-Received: from fwsb1 ([120.2.1.9]) by nsmail.corel.com
-          (Netscape Messaging Server 3.61)  with SMTP id AAA41D0
-          for <philipr@corel.com>; Wed, 24 May 2000 16:50:34 -0400
-Received: by master.kde.org id <S741513AbQEXUuI>;
-        Wed, 24 May 2000 22:50:08 +0200
-Received: from smtp.mail.yahoo.com ([128.11.68.32]:5906 "HELO
-        smtp.mail.yahoo.com") by master.kde.org with SMTP
-        id <S741709AbQEXUtl>; Wed, 24 May 2000 22:49:41 +0200
-Received: from pec-151-5.tnt7.b2.uunet.de (HELO yahoo.com) (149.225.151.5)
-  by smtp.mail.yahoo.com with SMTP; 24 May 2000 12:29:34 -0700
-X-Apparently-From: <gigafalk@yahoo.com>
-Message-ID: <392C2D67.C072CDA8@yahoo.com>
-Date:   Wed, 24 May 2000 21:28:39 +0200
-From:   Falk Brettschneider <gigafalk@yahoo.com>
-Organization: FBI (Falk Brettschneider International)
-X-Mailer: Mozilla 4.7 [de] (X11; I; Linux 2.2.13 i686)
-X-Accept-Language: en
-MIME-Version: 1.0
-To:     kde-core-devel@kde.org
-Subject: private classes in KDE
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Sender: kde-core-devel-admin@master.kde.org
-Resent-Sender: kde-core-devel-admin@master.kde.org
-Resent-From: kde-core-devel@master.kde.org
-X-Mailing-List: <kde-core-devel@master.kde.org>
-Errors-To: kde-core-devel-admin@master.kde.org
-X-BeenThere: kde-core-devel@master.kde.org
-X-Mailman-Version: 2.0beta2
-Precedence: bulk
-Reply-To: kde-core-devel@master.kde.org
-List-Id: KDE's core development crew <kde-core-devel.master.kde.org>
-Resent-Date: Wed, 24 May 2000 22:50:08 +0200
-
-Hi,
-
-Can I move a class away from the public classes of KDE to a private
-header/source file of KDE when one of the public classes declares this
-private candidate as friend class?
-
-Thanks + Bye,
-  F@lk
-
-
+Message removed
 
-__________________________________________________
-Do You Yahoo!?
-Talk to your friends online with Yahoo! Messenger.
-http://im.yahoo.com
 --===========================_ _= 461730(24445)--
diff --git a/tests/bounces/newmailru_01.txt b/tests/bounces/newmailru_01.txt
index 7802c151..a5d2712c 100644
--- a/tests/bounces/newmailru_01.txt
+++ b/tests/bounces/newmailru_01.txt
@@ -47,66 +47,6 @@ This person's account is exceeding their quota.
 Return-Path: <python-list-admin@python.org>
 Received: (qmail 1924 invoked from network); 7 Dec 2000 19:57:26 -0000
 Received: from unknown (HELO dinsdale.python.org) (132.151.1.21)
-  by grif.newmail.ru with SMTP; 7 Dec 2000 19:57:26 -0000
-Received: from dinsdale.python.org (localhost [127.0.0.1])
-	by dinsdale.python.org (Postfix) with ESMTP
-	id 8E2A81CD7A; Thu,  7 Dec 2000 14:56:18 -0500 (EST)
-Message-ID: <3A2FEB05.5E9531C4@san.rr.com>
-From: Darren New <dnew@san.rr.com>
-Organization: Bookshelves and file cabinets?
-X-Mailer: Mozilla 4.06 [en] (WinNT; U)
-MIME-Version: 1.0
-Newsgroups: comp.lang.python
-Subject: Re: Python Origins
-References: <90k3pq$50p$1@nnrp1.deja.com> <3A2DD2CA.14A5D7E2@engcorp.com> <90l3j9$4bn$1@kapsel.intranet> <udzoi9cedt.fsf@box.home.de> <KHOX5.3213$TU6.94362@ptah.visi.com>
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-Lines: 22
-NNTP-Posting-Host: 204.210.39.121
-X-Complaints-To: abuse@rr.com
-X-Trace: typhoon.san.rr.com 976218885 204.210.39.121 (Thu, 07 Dec 2000 11:54:45 PST)
-NNTP-Posting-Date: Thu, 07 Dec 2000 11:54:45 PST
-Path: news!uunet!ash.uu.net!hermes.visi.com!news-out.visi.com!cyclone-sjo1.usenetserver.com!news-out.usenetserver.com!cyclone-west.rr.com!news.rr.com!news-west.rr.com!lsnws01.we.mediaone.net!cyclone-LA3.rr.com!typhoon.san.rr.com.POSTED!not-for-mail
-Xref: news comp.lang.python:121135
-To: python-list@python.org
-Sender: python-list-admin@python.org
-Errors-To: python-list-admin@python.org
-X-BeenThere: python-list@python.org
-X-Mailman-Version: 2.0
-Precedence: bulk
-List-Help: <mailto:python-list-request@python.org?subject=help>
-List-Post: <mailto:python-list@python.org>
-List-Subscribe: <http://www.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=subscribe>
-List-Id: General discussion list for the Python programming language <python-list.python.org>
-List-Unsubscribe: <http://www.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=unsubscribe>
-List-Archive: <http://www.python.org/pipermail/python-list/>
-Date: Thu, 07 Dec 2000 19:54:45 GMT
-
-Grant Edwards wrote:
-> If a person who speaks two languages is "bilingual" and a
-> person who speaks three languages is "trilingual", then what do
-> you call a person who only speaks one langage?
-> 
-> American!
-
-Yah. We just export our culture to y'all. ;-)
-
-Actually, we don't all speak the same language. We can just all understand
-each other.
-
-The traveling salesman saw "grits" on the menu. He asked the waitress "What
-are grits?"  She said "They're extra."  "But what *are* they?" he asked
-again.  "They're fifty cents" she answered.  "Yes, I'll have the grits,
-please."
-
--- 
-Darren New / Senior MTS & Free Radical / Invisible Worlds Inc.
-San Diego, CA, USA (PST).  Cryptokeys on demand.
-Personal malapropism generator free with purchase!
-Steganography: The manual is hidden in the source code.
--- 
-http://www.python.org/mailman/listinfo/python-list
 
+Message truncated
 
diff --git a/tests/bounces/postfix_01.txt b/tests/bounces/postfix_01.txt
index 186cc763..ddc0e8f1 100644
--- a/tests/bounces/postfix_01.txt
+++ b/tests/bounces/postfix_01.txt
@@ -60,63 +60,7 @@ delete your own text from the message returned below.
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from dinsdale.python.org (localhost [127.0.0.1])
-	by dinsdale.python.org (Postfix) with ESMTP
-	id BDD021CF6B; Tue,  3 Oct 2000 18:03:05 -0400 (EDT)
-Delivered-To: mailman-developers@python.org
-Received: from public.lists.apple.com (public.lists.apple.com [17.254.0.151])
-	by dinsdale.python.org (Postfix) with ESMTP id D05861CDC9
-	for <mailman-developers@python.org>; Tue,  3 Oct 2000 18:02:10 -0400 (EDT)
-Received: from [17.216.27.250] (A17-216-27-250.apple.com [17.216.27.250])
-	by public.lists.apple.com (8.9.1a/8.9.1) with ESMTP id PAA50322
-	; Tue, 3 Oct 2000 15:09:09 -0700
-Mime-Version: 1.0
-Message-Id: <p04330122b60007b33216@[17.216.27.250]>
-To: mailman-developers@python.org
-From: Chuq Von Rospach <chuqui@plaidworks.com>
-Content-Type: text/plain; charset="us-ascii" ; format="flowed"
-Subject: [Mailman-Developers] broken CVS!
-Sender: mailman-developers-admin@python.org
-Errors-To: mailman-developers-admin@python.org
-X-BeenThere: mailman-developers@python.org
-X-Mailman-Version: 2.0beta6
-Precedence: bulk
-List-Help: <mailto:mailman-developers-request@python.org?subject=help>
-List-Post: <mailto:mailman-developers@python.org>
-List-Subscribe: <http://www.python.org/mailman/listinfo/mailman-developers>, <mailto:mailman-developers-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list developers <mailman-developers.python.org>
-List-Unsubscribe: <http://www.python.org/mailman/listinfo/mailman-developers>, <mailto:mailman-developers-request@python.org?subject=unsubscribe>
-List-Archive: <http://www.python.org/pipermail/mailman-developers/>
-Date: Tue, 3 Oct 2000 15:01:50 -0700
-
-
-I just updated to the current CVS, and it's broken:
-
-Traceback (innermost last):
-   File "/home/mailman/cron/qrunner", line 85, in ?
-     from Mailman import MailList
-   File "/home/mailman/Mailman/MailList.py", line 45, in ?
-     from Mailman.Archiver import Archiver
-   File "/home/mailman/Mailman/Archiver/__init__.py", line 17, in ?
-     from Archiver import *
-   File "/home/mailman/Mailman/Archiver/Archiver.py", line 33, in ?
-     from Mailman import Mailbox
-   File "/home/mailman/Mailman/Mailbox.py", line 43
-     <<<<<<< Mailbox.py
-     ^
-SyntaxError: invalid syntax
-
-
--- 
-Chuq Von Rospach - Plaidworks Consulting (mailto:chuqui@plaidworks.com)
-Apple Mail List Gnome (mailto:chuq@apple.com)
-
-You seem a decent fellow. I hate to die.
-
-_______________________________________________
-Mailman-Developers mailing list
-Mailman-Developers@python.org
-http://www.python.org/mailman/listinfo/mailman-developers
+Message removed
 
 --BDD021CF6B.970610818/dinsdale.python.org--
 
diff --git a/tests/bounces/postfix_03.txt b/tests/bounces/postfix_03.txt
index 5204712c..3e703543 100644
--- a/tests/bounces/postfix_03.txt
+++ b/tests/bounces/postfix_03.txt
@@ -73,72 +73,7 @@ delete your own text from the message returned below.
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from mail.i-s-o.net (mail.i-s-o.net [212.55.96.66])
-	by proxy.ggggg.com (Postfix on SuSE Linux 6.4 (i386)) with SMTP id 11D14D1045
-	for <ttttt@ggggg.com>; Thu,  8 Feb 2001 14:00:06 +0100 (CET)
-Received: (qmail 14297 invoked by uid 0); 8 Feb 2001 11:56:43 -0000
-Received: from mail.python.org (63.102.49.29)
-  by mail.i-s-o.net with SMTP; 8 Feb 2001 11:56:43 -0000
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14QpgG-0000Lg-00; Thu, 08 Feb 2001 06:56:08 -0500
-Received: from [194.183.224.20] (helo=relay.ppppp.net)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14QpeE-0000DS-00
-	for python-list@python.org; Thu, 08 Feb 2001 06:54:03 -0500
-Received: from hercule.ppppp.be (hercule.ppppp.be [194.183.229.151])
-	by relay.ppppp.net (8.11.0/8.11.0) with ESMTP id f18Bruv05655
-	for <python-list@python.org>; Thu, 8 Feb 2001 12:53:56 +0100 (MET)
-From: Gregoire Welraeds <greg@ppppp.be>
-X-Sender: gwelr@localhost
-To: Python Mailling list <python-list@python.org>
-Subject: None assigment
-Message-ID: <Pine.BSF.4.21.0102081248050.4685-100000@localhost>
-MIME-Version: 1.0
-Content-Type: TEXT/PLAIN; charset=US-ASCII
-Sender: python-list-admin@python.org
-Errors-To: python-list-admin@python.org
-X-BeenThere: python-list@python.org
-X-Mailman-Version: 2.0.1 (101270)
-Precedence: bulk
-List-Help: <mailto:python-list-request@python.org?subject=help>
-List-Post: <mailto:python-list@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=subscribe>
-List-Id: General discussion list for the Python programming language <python-list.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/python-list/>
-Date: Thu, 8 Feb 2001 12:54:00 +0100 (CET)
-
-
-While playing a bit with python 2.0, I found that I can assign some value
-to None
-
-EG: None= 2
-
-which I found to be very pernicious because then the following, for
-example, won't work any more:
-
->>> b= filter(None, [1,2,'',3])
-
-Bug or feature ?
-
-If it is a feature (I suppose it is not a bug :), what is the interest of
-this ?
-
-Ppppp Development team
--------------------------------------------------------------------------------
-Ppppp Technologies sa/nv	Tel: +32-2-6409194		
-Rue Tenbosch, 9			Fax: +32-2-6403154		
-B-1000 Brussels			general information:   info@ppppp.net
-BELGIUM				technical information: helpdesk@ppppp.net
-URL: http://www.ppppp.be/
--------------------------------------------------------------------------------
-
-
--- 
-http://mail.python.org/mailman/listinfo/python-list
+Message removed
 
 --11D14D1045.981637207/proxy.ggggg.com--
 
diff --git a/tests/bounces/postfix_04.txt b/tests/bounces/postfix_04.txt
index 86a60ea8..68665d52 100644
--- a/tests/bounces/postfix_04.txt
+++ b/tests/bounces/postfix_04.txt
@@ -1,25 +1,25 @@
 From VM Wed Mar  7 11:06:03 2001
 X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
-	[nil "Tuesday" "6" "March" "2001" "09:29:58" "-0800" "Mail Delivery System" "MAILER-DAEMON@keftamail.com" nil "185" "Undelivered Mail Returned to Sender" "^From:" nil nil "3" nil nil nil nil nil]
+	[nil "Tuesday" "6" "March" "2001" "09:29:58" "-0800" "Mail Delivery System" "MAILER-DAEMON@example.com" nil "185" "Undelivered Mail Returned to Sender" "^From:" nil nil "3" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-announce-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id 6C2DCD37AC
-	for <barry@wooz.org>; Tue,  6 Mar 2001 12:30:35 -0500 (EST)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id 6C2DCD37AC
+	for <usery@example.org>; Tue,  6 Mar 2001 12:30:35 -0500 (EST)
 Received: from <mailman-announce-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1650903; Tue, 06 Mar 2001 12:33:44 -0500
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1650896 for barry@mail.digicool.com; Tue, 06 Mar 2001 12:33:44 -0500
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1650896 for usery@mail.example.com; Tue, 06 Mar 2001 12:33:44 -0500
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id MAA08939
-	for <barry@digicool.com>; Tue, 6 Mar 2001 12:31:02 -0500
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id MAA08939
+	for <usery@example.com>; Tue, 6 Mar 2001 12:31:02 -0500
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14aLIc-0001Wp-00
-	for barry@digicool.com; Tue, 06 Mar 2001 12:31:02 -0500
+	for usery@example.com; Tue, 06 Mar 2001 12:31:02 -0500
 Received: from [64.75.1.85] (helo=postal-worker1.kefta.com)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14aLIB-0001VP-00
@@ -42,7 +42,7 @@ List-Id: Announce-only list for Mailman releases and news <mailman-announce.pyth
 List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-announce>,
 	<mailto:mailman-announce-request@python.org?subject=unsubscribe>
 List-Archive: <http://mail.python.org/pipermail/mailman-announce/>
-From: MAILER-DAEMON@keftamail.com (Mail Delivery System)
+From: MAILER-DAEMON@example.com (Mail Delivery System)
 Sender: mailman-announce-owner@python.org
 To: mailman-announce-admin@python.org
 Subject: Undelivered Mail Returned to Sender
@@ -63,14 +63,14 @@ This is the Keftamail program at host mail1.kefta.com.
 I'm sorry to have to inform you that the message returned
 below could not be delivered to one or more destinations.
 
-For further assistance, please contact <postmaster@keftamail.com>
+For further assistance, please contact <postmaster@example.com>
 
 If you do so, please include this problem report. You can
 delete your own text from the message returned below.
 
 			The Keftamail program
 
-<davidlowie@mail1.keftamail.com>: permission denied. Command output: Mail quota
+<userx@mail1.example.com>: permission denied. Command output: Mail quota
     exceeded.
 
 
@@ -78,162 +78,7 @@ delete your own text from the message returned below.
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from postal-worker2.kefta.com (postal-worker2.kefta.com [10.0.2.4])
-	by mail1.kefta.com (Keftamail) with ESMTP id 1EDF14081
-	for <davidlowie@mail1.keftamail.com>; Tue,  6 Mar 2001 09:29:58 -0800 (PST)
-Received: by postal-worker2.kefta.com (Keftamail)
-	id F089940C9; Tue,  6 Mar 2001 09:29:37 -0800 (PST)
-Delivered-To: davidlowie@keftamail.com
-Received: from lists.securityfocus.com (lists.securityfocus.com [66.38.151.7])
-	by postal-worker2.kefta.com (Keftamail) with ESMTP id BA59D40C0
-	for <davidlowie@KEFTAMAIL.COM>; Tue,  6 Mar 2001 09:29:37 -0800 (PST)
-Received: from lists.securityfocus.com (lists.securityfocus.com [66.38.151.7])
-	by lists.securityfocus.com (Postfix) with ESMTP
-	id 3A1C024CF8C; Tue,  6 Mar 2001 10:04:43 -0700 (MST)
-Received: from LISTS.SECURITYFOCUS.COM by LISTS.SECURITYFOCUS.COM
-          (LISTSERV-TCP/IP release 1.8d) with spool id 27825191 for
-          BUGTRAQ@LISTS.SECURITYFOCUS.COM; Tue, 6 Mar 2001 10:03:25 -0700
-Approved-By: aleph1@SECURITYFOCUS.COM
-Delivered-To: bugtraq@lists.securityfocus.com
-Received: from firewall.osb.hu (unknown [193.224.234.1]) by
-          lists.securityfocus.com (Postfix) with ESMTP id 48CD624C646 for
-          <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue,  6 Mar 2001 00:49:55 -0700
-          (MST)
-Received: from pimpa.intranet.osb.hu (IDENT:root@pimpa.intranet.osb.hu
-          [192.168.0.8]) by firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21) with
-          ESMTP id IAA11531 for <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue, 6 Mar
-          2001 08:53:08 +0100
-Received: from localhost (sp@localhost) by pimpa.intranet.osb.hu (8.9.3/8.9.3)
-          with ESMTP id IAA05518 for <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue, 6
-          Mar 2001 08:53:08 +0100
-X-Authentication-Warning: pimpa.intranet.osb.hu: sp owned process doing -bs
-X-Received: from firewall.osb.hu (fw.intranet.osb.hu [192.168.0.1]) by
-            pimpa.intranet.osb.hu (8.9.3/8.9.3) with ESMTP id JAA18698 for
-            <sp@pimpa.intranet.osb.hu>; Sat, 3 Mar 2001 09:41:17 +0100
-X-Received: from pax.intranet.osb.hu (IDENT:root@pax.intranet.osb.hu
-            [192.168.0.2]) by firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21)
-            with ESMTP id JAA24373 for <sp@pimpa.intranet.osb.hu>; Sat, 3 Mar
-            2001 09:41:17 +0100
-X-Received: from firewall.osb.hu (fw.intranet.osb.hu [192.168.0.1]) by
-            pax.intranet.osb.hu (8.9.3/8.9.3) with ESMTP id JAA09389 for
-            <sp@osb.hu>; Sat, 3 Mar 2001 09:41:16 +0100
-X-Received: from mail.python.org (mail.python.org [63.102.49.29]) by
-            firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id
-            JAA24367 for <sp@osb.hu>; Sat, 3 Mar 2001 09:41:07 +0100
-X-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org) by
-            mail.python.org with esmtp (Exim 3.21 #1) id 14Z7OV-0000vs-00; Sat,
-            03 Mar 2001 03:28:03 -0500
-X-Received: from [216.27.134.141] (helo=mail.wooz.org) by mail.python.org with
-            esmtp (Exim 3.21 #1) id 14Z7Nq-0000tq-00; Sat, 03 Mar 2001 03:27:22
-            -0500
-X-Received: by mail.wooz.org (Postfix, from userid 889) id BE7B0D37AC; Sat,  3
-            Mar 2001 03:26:35 -0500 (EST)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-X-Mailer: VM 6.84 under 21.1 (patch 12) "Channel Islands" XEmacs Lucid
-X-Attribution: BAW
-X-Oblique-Strategy: Subvert your original idea
-X-Url: http://www.wooz.org/barry
-Errors-To: mailman-announce-admin@python.org
-X-BeenThere: mailman-announce@python.org
-X-Mailman-Version: 2.0.2 (101270)
-Precedence: bulk
-List-Help: <mailto:mailman-announce-request@python.org?subject=help>
-List-Post: <mailto:mailman-announce@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-announce>,
-                <mailto:mailman-announce-request@python.org?subject=subscribe>
-List-Id: Announce-only list for Mailman releases and news
-         <mailman-announce.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-announce>,
-                  <mailto:mailman-announce-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/mailman-announce/>
-X-AntiVirus: scanned for viruses by AMaViS 0.2.1 (http://amavis.org/)
-ReSent-Subject: [Mailman-Announce] ANNOUNCE Mailman 2.0.2 (important privacy
-                patch)
-Message-ID:  <Pine.LNX.4.30.0103060853010.5499@pimpa.intranet.osb.hu>
-Date:         Tue, 6 Mar 2001 08:53:01 +0100
-Reply-To: mailman-developers@python.org
-Sender: Bugtraq List <BUGTRAQ@SECURITYFOCUS.COM>
-Comments:     RFC822 error: <W> CC field duplicated. Last occurrence was
-              retained.
-Comments:     Resent-From: Soos Peter <sp@osb.hu>
-Comments:     Originally-From: barry@digicool.com (Barry A. Warsaw)
-From: Soos Peter <sp@OSB.HU>
-Subject:      [Mailman-Announce] ANNOUNCE Mailman 2.0.2 (important privacy
-              patch)
-X-cc:         mailman-developers@python.org
-To: BUGTRAQ@SECURITYFOCUS.COM
-
-I've just uploaded the Mailman 2.0.2 release to SourceForge.  This is
-a bug fix release that also fixes a potential privacy hole, which
-could allow a list administrator to get access to user passwords.
-Even with those passwords, I believe there's little additional harm
-that a list admin could do, but still they probably shouldn't have
-access to those passwords.
-
-There are a few other important fixes in this release, so I recommend
-that all sites running Mailman 2.0 or 2.0.1 should upgrade.
-
-As usual I'm releasing this as both a complete tarball and as a patch
-against Mailman 2.0.1.  If you grab the patchfile, you'll want to cd
-into your 2.0 source, and apply it like so:
-
-    % patch -p1 < mailman-2.0.1-2.0.2.diff
-
-Currently only http://mailman.sourceforge.net is updated, but the
-list.org and gnu.org sites should be updated soon.  The release
-information on SF is at
-
-    http://sourceforge.net/project/shownotes.php?release_id=25955
-
-My thanks to Thomas Wouters for his help!
-
-Enjoy,
--Barry
-
-P.S. I'm not sure if I'll have time to release a 2.1 alpha of the I18N
-stuff before I leave for the Python9 conference.  If we get the
-expected foot of snow between Sunday and Monday, it's a
-possibility. ;)
-
-
-[From the NEWS file]
-
-2.0.2 (03-Mar-2001)
-
-    Security fix:
-
-    - A fix for a potential privacy exploit where a clever list
-      administrator could gain access to user passwords.  This doesn't
-      allow them to do much more harm to the user then they normally
-      could, but they still shouldn't have access to the passwords.
-
-    Bug fixes:
-
-    - In the admindb page, don't complain when approving a
-      subscription of someone who's already on the list (SF bug
-      #222409 - Thomas Wouters).
-
-      Also, quote for HTML the Subject: text printed for held
-      messages, otherwise messages with e.g. "Subject: </table>" could
-      royally screw page formatting.
-
-    - In Netscape.py bounce processor, don't bomb out on ill-formed
-      messages (no semi-colon separating parameters), otherwise mail
-      delivery could grind to a halt.  Bug reported by Kambiz
-      Aghaiepour.
-
-    - Docstring fix bin/newlist to remove mention of "immediate"
-      argument (Thomas Wouters).
-
-    - Fix for bin/update when PREFIX != VAR_PREFIX (SF bug #229794 --
-      Thomas Wouters).
-
-_______________________________________________
-Mailman-announce mailing list
-Mailman-announce@python.org
-http://mail.python.org/mailman/listinfo/mailman-announce
+Message removed
 
 --1EDF14081.983899798/mail1.kefta.com--
 
diff --git a/tests/bounces/postfix_05.txt b/tests/bounces/postfix_05.txt
index 4bd56d60..74ffc615 100644
--- a/tests/bounces/postfix_05.txt
+++ b/tests/bounces/postfix_05.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Tuesday" "6" "March" "2001" "19:02:13" "+0000" "Mail Delivery System" "MAILER-DAEMON@bucks.net" nil "179" "Undelivered Mail Returned to Sender" "^From:" nil nil "3" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-announce-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id 590BFD37AC
-	for <barry@wooz.org>; Tue,  6 Mar 2001 14:02:37 -0500 (EST)
+Delivered-To: user@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id 590BFD37AC
+	for <usery@example.org>; Tue,  6 Mar 2001 14:02:37 -0500 (EST)
 Received: from <mailman-announce-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1651377; Tue, 06 Mar 2001 14:05:47 -0500
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1651376 for barry@mail.digicool.com; Tue, 06 Mar 2001 14:05:46 -0500
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1651376 for usery@mail.example.com; Tue, 06 Mar 2001 14:05:46 -0500
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id OAA13908
-	for <barry@digicool.com>; Tue, 6 Mar 2001 14:03:04 -0500
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id OAA13908
+	for <usery@example.com>; Tue, 6 Mar 2001 14:03:04 -0500
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14aMje-0005oS-00
-	for barry@digicool.com; Tue, 06 Mar 2001 14:03:02 -0500
+	for usery@example.com; Tue, 06 Mar 2001 14:03:02 -0500
 Received: from [195.112.37.162] (helo=babylon.bucks.net ident=postfix)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14aMix-0005nQ-00
@@ -67,7 +67,7 @@ delete your own text from the message returned below.
 
 			The BNS Postfix program
 
-<bjelf@detectit.net>: host mail.btconnect.com[193.113.154.2] said: 554 No
+<userx@example.net>: host mail.btconnect.com[193.113.154.2] said: 554 No
     Resent-From field given
 
 
@@ -75,156 +75,7 @@ delete your own text from the message returned below.
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from lists.securityfocus.com (lists.securityfocus.com [66.38.151.7])
-	by babylon.bucks.net (BNS Postfix) with ESMTP id 41A6B47B9D
-	for <bjelf@SAFESTONE.COM>; Tue,  6 Mar 2001 19:02:11 +0000 (GMT)
-Received: from lists.securityfocus.com (lists.securityfocus.com [66.38.151.7])
-	by lists.securityfocus.com (Postfix) with ESMTP
-	id C8A0024C93F; Tue,  6 Mar 2001 10:05:17 -0700 (MST)
-Received: from LISTS.SECURITYFOCUS.COM by LISTS.SECURITYFOCUS.COM
-          (LISTSERV-TCP/IP release 1.8d) with spool id 27825191 for
-          BUGTRAQ@LISTS.SECURITYFOCUS.COM; Tue, 6 Mar 2001 10:03:25 -0700
-Approved-By: aleph1@SECURITYFOCUS.COM
-Delivered-To: bugtraq@lists.securityfocus.com
-Received: from firewall.osb.hu (unknown [193.224.234.1]) by
-          lists.securityfocus.com (Postfix) with ESMTP id 48CD624C646 for
-          <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue,  6 Mar 2001 00:49:55 -0700
-          (MST)
-Received: from pimpa.intranet.osb.hu (IDENT:root@pimpa.intranet.osb.hu
-          [192.168.0.8]) by firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21) with
-          ESMTP id IAA11531 for <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue, 6 Mar
-          2001 08:53:08 +0100
-Received: from localhost (sp@localhost) by pimpa.intranet.osb.hu (8.9.3/8.9.3)
-          with ESMTP id IAA05518 for <BUGTRAQ@LISTS.SECURITYFOCUS.COM>; Tue, 6
-          Mar 2001 08:53:08 +0100
-X-Authentication-Warning: pimpa.intranet.osb.hu: sp owned process doing -bs
-X-Received: from firewall.osb.hu (fw.intranet.osb.hu [192.168.0.1]) by
-            pimpa.intranet.osb.hu (8.9.3/8.9.3) with ESMTP id JAA18698 for
-            <sp@pimpa.intranet.osb.hu>; Sat, 3 Mar 2001 09:41:17 +0100
-X-Received: from pax.intranet.osb.hu (IDENT:root@pax.intranet.osb.hu
-            [192.168.0.2]) by firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21)
-            with ESMTP id JAA24373 for <sp@pimpa.intranet.osb.hu>; Sat, 3 Mar
-            2001 09:41:17 +0100
-X-Received: from firewall.osb.hu (fw.intranet.osb.hu [192.168.0.1]) by
-            pax.intranet.osb.hu (8.9.3/8.9.3) with ESMTP id JAA09389 for
-            <sp@osb.hu>; Sat, 3 Mar 2001 09:41:16 +0100
-X-Received: from mail.python.org (mail.python.org [63.102.49.29]) by
-            firewall.osb.hu (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id
-            JAA24367 for <sp@osb.hu>; Sat, 3 Mar 2001 09:41:07 +0100
-X-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org) by
-            mail.python.org with esmtp (Exim 3.21 #1) id 14Z7OV-0000vs-00; Sat,
-            03 Mar 2001 03:28:03 -0500
-X-Received: from [216.27.134.141] (helo=mail.wooz.org) by mail.python.org with
-            esmtp (Exim 3.21 #1) id 14Z7Nq-0000tq-00; Sat, 03 Mar 2001 03:27:22
-            -0500
-X-Received: by mail.wooz.org (Postfix, from userid 889) id BE7B0D37AC; Sat,  3
-            Mar 2001 03:26:35 -0500 (EST)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-X-Mailer: VM 6.84 under 21.1 (patch 12) "Channel Islands" XEmacs Lucid
-X-Attribution: BAW
-X-Oblique-Strategy: Subvert your original idea
-X-Url: http://www.wooz.org/barry
-Errors-To: mailman-announce-admin@python.org
-X-BeenThere: mailman-announce@python.org
-X-Mailman-Version: 2.0.2 (101270)
-Precedence: bulk
-List-Help: <mailto:mailman-announce-request@python.org?subject=help>
-List-Post: <mailto:mailman-announce@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-announce>,
-                <mailto:mailman-announce-request@python.org?subject=subscribe>
-List-Id: Announce-only list for Mailman releases and news
-         <mailman-announce.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-announce>,
-                  <mailto:mailman-announce-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/mailman-announce/>
-X-AntiVirus: scanned for viruses by AMaViS 0.2.1 (http://amavis.org/)
-ReSent-Subject: [Mailman-Announce] ANNOUNCE Mailman 2.0.2 (important privacy
-                patch)
-Message-ID:  <Pine.LNX.4.30.0103060853010.5499@pimpa.intranet.osb.hu>
-Date:         Tue, 6 Mar 2001 08:53:01 +0100
-Reply-To: mailman-developers@python.org
-Sender: Bugtraq List <BUGTRAQ@SECURITYFOCUS.COM>
-Comments:     RFC822 error: <W> CC field duplicated. Last occurrence was
-              retained.
-Comments:     Resent-From: Soos Peter <sp@osb.hu>
-Comments:     Originally-From: barry@digicool.com (Barry A. Warsaw)
-From: Soos Peter <sp@OSB.HU>
-Subject:      [Mailman-Announce] ANNOUNCE Mailman 2.0.2 (important privacy
-              patch)
-X-cc:         mailman-developers@python.org
-To: BUGTRAQ@SECURITYFOCUS.COM
-
-I've just uploaded the Mailman 2.0.2 release to SourceForge.  This is
-a bug fix release that also fixes a potential privacy hole, which
-could allow a list administrator to get access to user passwords.
-Even with those passwords, I believe there's little additional harm
-that a list admin could do, but still they probably shouldn't have
-access to those passwords.
-
-There are a few other important fixes in this release, so I recommend
-that all sites running Mailman 2.0 or 2.0.1 should upgrade.
-
-As usual I'm releasing this as both a complete tarball and as a patch
-against Mailman 2.0.1.  If you grab the patchfile, you'll want to cd
-into your 2.0 source, and apply it like so:
-
-    % patch -p1 < mailman-2.0.1-2.0.2.diff
-
-Currently only http://mailman.sourceforge.net is updated, but the
-list.org and gnu.org sites should be updated soon.  The release
-information on SF is at
-
-    http://sourceforge.net/project/shownotes.php?release_id=25955
-
-My thanks to Thomas Wouters for his help!
-
-Enjoy,
--Barry
-
-P.S. I'm not sure if I'll have time to release a 2.1 alpha of the I18N
-stuff before I leave for the Python9 conference.  If we get the
-expected foot of snow between Sunday and Monday, it's a
-possibility. ;)
-
-
-[From the NEWS file]
-
-2.0.2 (03-Mar-2001)
-
-    Security fix:
-
-    - A fix for a potential privacy exploit where a clever list
-      administrator could gain access to user passwords.  This doesn't
-      allow them to do much more harm to the user then they normally
-      could, but they still shouldn't have access to the passwords.
-
-    Bug fixes:
-
-    - In the admindb page, don't complain when approving a
-      subscription of someone who's already on the list (SF bug
-      #222409 - Thomas Wouters).
-
-      Also, quote for HTML the Subject: text printed for held
-      messages, otherwise messages with e.g. "Subject: </table>" could
-      royally screw page formatting.
-
-    - In Netscape.py bounce processor, don't bomb out on ill-formed
-      messages (no semi-colon separating parameters), otherwise mail
-      delivery could grind to a halt.  Bug reported by Kambiz
-      Aghaiepour.
-
-    - Docstring fix bin/newlist to remove mention of "immediate"
-      argument (Thomas Wouters).
-
-    - Fix for bin/update when PREFIX != VAR_PREFIX (SF bug #229794 --
-      Thomas Wouters).
-
-_______________________________________________
-Mailman-announce mailing list
-Mailman-announce@python.org
-http://mail.python.org/mailman/listinfo/mailman-announce
+Message removed
 
 --41A6B47B9D.983905333/babylon.bucks.net--
 
diff --git a/tests/bounces/qmail_01.txt b/tests/bounces/qmail_01.txt
index dbe6f435..acd7b50f 100644
--- a/tests/bounces/qmail_01.txt
+++ b/tests/bounces/qmail_01.txt
@@ -15,89 +15,9 @@ Hi. This is the qmail-send program at gate0.n-h.net.
 I'm afraid I wasn't able to deliver your message to the following addresses.
 This is a permanent error; I've given up. Sorry it didn't work out.
 
-<psadisc@wwwmail.n-h.de>:
+<userx@example.de>:
 
 --- Below this line is a copy of the message.
 
-Return-Path: <psa-members-admin@python.org>
-Received: (qmail 23042 invoked from network); 4 Nov 1999 21:42:35 -0000
-Received: from one.n-h.net (HELO n-h.net) (root@195.254.4.1)
-  by wwwmail.n-h.de with SMTP; 4 Nov 1999 21:42:35 -0000
-Received: from python.org (parrot.python.org [132.151.1.90])
-	by n-h.net (8.8.5/8.8.5) with ESMTP id WAA00074
-	for <psadisc@n-h.net>; Thu, 4 Nov 1999 22:45:15 +0100
-Received: from python.org (localhost [127.0.0.1])
-	by python.org (8.9.1a/8.9.1) with ESMTP id QAA20872;
-	Thu, 4 Nov 1999 16:10:19 -0500 (EST)
-Received: from origin.ea.com (hidden-user@gnat6.owo.com [208.12.170.6])
-	by python.org (8.9.1a/8.9.1) with ESMTP id QAA20823
-	for <psa-members@python.org>; Thu, 4 Nov 1999 16:09:48 -0500 (EST)
-Received: from forest.origin.ea.com (molach.origin.ea.com [159.153.98.2])
-	by origin.ea.com (8.8.8/8.8.8PJ) with ESMTP id PAA19774;
-	Thu, 4 Nov 1999 15:26:35 -0600 (CST)
-Received: by molach.origin.ea.com with Internet Mail Service (5.5.2448.0)
-	id <VWGD5VQP>; Thu, 4 Nov 1999 15:00:30 -0600
-Message-ID: <11A17AA2B9EAD111BCEA00A0C9B4179303385B62@molach.origin.ea.com>
-From: "Asbahr, Jason" <Jasbahr@origin.EA.com>
-To: "'beazley@cs.uchicago.edu'" <beazley@cs.uchicago.edu>, chriss@dnastar.com
-Cc: psa-members@python.org
-Subject: RE: [PSA MEMBERS] ObjC.py ?
-Date: Thu, 4 Nov 1999 15:00:29 -0600 
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2448.0)
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Sender: psa-members-admin@python.org
-Errors-To: psa-members-admin@python.org
-X-Mailman-Version: 1.0.2
-Precedence: bulk
-List-Id: Python Software Activity members discussion list <psa-members.python.org>
-X-BeenThere: psa-members@python.org
-
-I had the impression that SWIG supported the relatively recent
-versions of GNU ObjC, but not earlier versions, such as NeXT's
-original ObjC extensions to GCC.  True?
-
-Cheers,
-
-Jason Asbahr
-Origin Systems, Inc.
-jasbahr@origin.ea.com
-
------Original Message-----
-From: David Beazley [mailto:beazley@cs.uchicago.edu]
-Sent: Wednesday, November 03, 1999 11:13 PM
-To: chriss@dnastar.com
-Cc: psa-members@python.org
-Subject: Re: [PSA MEMBERS] ObjC.py ?
-
-
-chriss@dnastar.com writes:
-> Does anyone know what is left of the effort to interface
-Python/ObjectiveC?
-> E.g. is there a module, bits of code ... ?
-> 
-
-Well, it's not widely known, but SWIG has some support for ObjectiveC.
-I haven't used this feature of SWIG in quite awhile, but I did use it
-to build some Python interfaces to some simple ObjectiveC programs I
-wrote about 3 years ago.  I can't think of any reason why it wouldn't
-work (unless there has been some sort of bit-rot that I'm not aware
-of).
-
-Cheers,
-
-Dave
-
-
-_______________________________________________
-PSA-members mailing list
-PSA-members@python.org
-http://www.python.org/mailman/listinfo/psa-members
-
-_______________________________________________
-PSA-members mailing list
-PSA-members@python.org
-http://www.python.org/mailman/listinfo/psa-members
-
+Message removed
 
diff --git a/tests/bounces/qmail_02.txt b/tests/bounces/qmail_02.txt
index ad3a232f..afd2d0e3 100644
--- a/tests/bounces/qmail_02.txt
+++ b/tests/bounces/qmail_02.txt
@@ -17,57 +17,10 @@ We're sorry. There's a problem with the e-mail address(es) you're trying
 to send to. Please verify the address(es) and try again. If you continue
 to have problems, please contact Customer Support at (480) 624-2500.
 
-<rauschlo@frontfin.com>:
+<userx@example.com>:
 The e-mail message could not be delivered because the user's mailfolder is full.
 
 --- Below this line is a copy of the message.
 
-Return-Path: <gpc-talk-bounces@grizz.org>
-Received: (qmail 22370 invoked from network); 12 Feb 2006 12:02:26 -0000
-Received: from unknown (HELO pre-smtp05-01.prod.mesa1.secureserver.net) ([64.202.166.14])
-          (envelope-sender <gpc-talk-bounces@grizz.org>)
-          by smtp06-01.prod.mesa1.secureserver.net (qmail-ldap-1.03) with SMTP
-          for <rauschlo@frontfin.com>; 12 Feb 2006 12:02:26 -0000
-Received: (qmail 28068 invoked from network); 12 Feb 2006 12:02:26 -0000
-Received: from unknown (HELO sb7.songbird.com) ([208.184.79.137])
-          (envelope-sender <gpc-talk-bounces@grizz.org>)
-          by pre-smtp05-01.prod.mesa1.secureserver.net (qmail-ldap-1.03) with SMTP
-          for <rauschlo@frontfin.com>; 12 Feb 2006 12:02:26 -0000
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k1CC2oMf013501
-	for <rauschlo@frontfin.com>; Sun, 12 Feb 2006 04:02:50 -0800
-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: rauschlo@frontfin.com
-Message-ID: <mailman.6305.1139745768.1568.gpc-talk@grizz.org>
-Date: Sun, 12 Feb 2006 04:02:48 -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: Found to be clean
-X-Songbird-From: gpc-talk-bounces@grizz.org
-
-Your mail to 'GPC-talk' with the subject
-
-    Re: gargoyle nitrite
-
-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/d1a43f77baa30fb2317c51033c45d6541bc23533
+Message removed
 
diff --git a/tests/bounces/qmail_03.txt b/tests/bounces/qmail_03.txt
index 04e35280..9a68f0b3 100644
--- a/tests/bounces/qmail_03.txt
+++ b/tests/bounces/qmail_03.txt
@@ -18,228 +18,10 @@ X-Songbird-From:
 He/Her is not HBC e-mail users.
 Check your send e-mail address.
 
-<crown@hbc.co.jp>:
+<userx@example.jp>:
 Sorry, no mailbox here by that name. vpopmail (#5.1.1)
 
 --- Below this line is a copy of the message.
 
-Return-Path: <gpc-talk-bounces@grizz.org>
-Received: (qmail 29686 invoked from network); 27 Mar 2006 17:04:37 +0900
-Received: from unknown (HELO PUMPKIN) (172.16.16.22)
-  by pop.hbc.co.jp with SMTP; 27 Mar 2006 17:04:37 +0900
-Received: from ns1.hbc.co.jp ([192.168.0.22]) by PUMPKIN with InterScan Messaging Security Suite; Mon, 27 Mar 2006 17:24:52 +0900
-Received: (qmail 25911 invoked from network); 27 Mar 2006 17:04:36 +0900
-Received: from unknown (HELO sb7.songbird.com) (208.184.79.137)
-  by ns1.hbc.co.jp with SMTP; 27 Mar 2006 17:04:36 +0900
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2R853Ol014177
-	for <crown@hbc.co.jp>; Mon, 27 Mar 2006 00:05:03 -0800
-Subject: The results of your email commands
-From: gpc-talk-bounces@grizz.org
-To: crown@hbc.co.jp
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============0630961367=="
-Message-ID: <mailman.2720.1143446702.1567.gpc-talk@grizz.org>
-Date: Mon, 27 Mar 2006 00:05:02 -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
-
---===============0630961367==
-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
-    Do you want to b O f V e E u R w P l A f Y for your c M l e b d d i b c
-    i a l t w i x o o n x s?
-    =20
-    I don't think you need it, c S y A o V d E p 5 w 0 h % with
-    http://soki65.kapermet.com
-
-- Done.
-
-
---===============0630961367==
-Content-Type: message/rfc822
-MIME-Version: 1.0
-
-Return-Path: <crown@hbc.co.jp>
-Received: from hbc.co.jp (200-202-221-208.caboja.speeduol.com.br
-	[200.202.221.208])
-	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2R84qts014129
-	for <gpc-talk-request@grizz.org>; Mon, 27 Mar 2006 00:04:55 -0800
-Message-ID: <000001c65174$f9cbb150$e45ea8c0@xxe54>
-Reply-To: "Radomila Crown" <crown@hbc.co.jp>
-From: "Radomila Crown" <crown@hbc.co.jp>
-To: gpc-talk-request@grizz.org
-Subject: Re: new
-Date: Mon, 27 Mar 2006 03:03:47 -0500
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
-	boundary="----=_NextPart_000_0001_01C6514B.10F5A950"
-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: crown@hbc.co.jp
-
-This is a multi-part message in MIME format.
-
-------=_NextPart_000_0001_01C6514B.10F5A950
-Content-Type: text/plain;
-	charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-Hi,
-=20
-Do you want to b O f V e E u R w P l A f Y for your c M l e b d d i b c
-i a l t w i x o o n x s?
-=20
-I don't think you need it, c S y A o V d E p 5 w 0 h % with
-http://soki65.kapermet.com
-
-------=_NextPart_000_0001_01C6514B.10F5A950
-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,</DIV>
-<DIV>&nbsp;</DIV>
-<DIV>Do you want to <span style=3D"
-float
-:
-right
-"> b </span>O<span style=3D"
-float
-:
-right
-"> f </span>V<span style=3D"
-float
-:
-right
-"> e </span>E<span style=3D"
-float
-:
-right
-"> u </span>R<span style=3D"
-float
-:
-right
-"> w </span>P<span style=3D"
-float
-:
-right
-"> l </span>A<span style=3D"
-float
-:
-right
-"> f </span>Y for your <span style=3D"
-float
-:
-right
-"> c </span>M<span style=3D"
-float
-:
-right
-"> l </span>e<span style=3D"
-float
-:
-right
-"> b </span>d<span style=3D"
-float
-:
-right
-"> d </span>i<span style=3D"
-float
-:
-right
-"> b </span>c<span style=3D"
-float
-:
-right
-"> i </span>a<span style=3D"
-float
-:
-right
-"> l </span>t<span style=3D"
-float
-:
-right
-"> w </span>i<span style=3D"
-float
-:
-right
-"> x </span>o<span style=3D"
-float
-:
-right
-"> o </span>n<span style=3D"
-float
-:
-right
-"> x </span>s?</DIV>
-<DIV>&nbsp;</DIV>
-<DIV>I don't think you need it, <span style=3D"
-float
-:
-right
-"> c </span>S<span style=3D"
-float
-:
-right
-"> y </span>A<span style=3D"
-float
-:
-right
-"> o </span>V<span style=3D"
-float
-:
-right
-"> d </span>E <span style=3D"
-float
-:
-right
-"> p </span>5<span style=3D"
-float
-:
-right
-"> w </span>0<span style=3D"
-float
-:
-right
-"> h </span>% with <A =
-href=3D"http://soki65.kapermet.com">http://soki65.kapermet.com</A></DIV><=
-/BODY></HTML>
-------=_NextPart_000_0001_01C6514B.10F5A950--
-
-
-
-
---===============0630961367==--
-
+Message removed
 
diff --git a/tests/bounces/qmail_04.txt b/tests/bounces/qmail_04.txt
index 035d74d6..bc12a3e1 100644
--- a/tests/bounces/qmail_04.txt
+++ b/tests/bounces/qmail_04.txt
@@ -18,64 +18,12 @@ 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>:
+<userx@example.au>:
 59.154.33.7 does not like recipient.
-Remote host said: 550 merotiia@tennisnsw.com.au... No such user
+Remote host said: 550 userx@example.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 
-______________________________________________________________________
+Message removed
 
diff --git a/tests/bounces/qmail_05.txt b/tests/bounces/qmail_05.txt
index 84362025..416b76b4 100644
--- a/tests/bounces/qmail_05.txt
+++ b/tests/bounces/qmail_05.txt
@@ -16,106 +16,12 @@ X-Songbird-From:
 
 Unfortunately, your mail was not delivered to the following address:
 
-<ivokggrrdvc@caixaforte.freeservers.com>:
+<userx@example.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
+Remote host said: 550 <userx@example.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==--
+Message removed
 
diff --git a/tests/bounces/sendmail_01.txt b/tests/bounces/sendmail_01.txt
index cfea95a2..7b6db357 100644
--- a/tests/bounces/sendmail_01.txt
+++ b/tests/bounces/sendmail_01.txt
@@ -1,16 +1,16 @@
 From VM Sat Oct 14 00:29:43 2000
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: bxxxxx@mail.wooz.org
-Received: from ns1.beopen.com (unknown [208.185.174.104])
-	by mail.wooz.org (Postfix) with ESMTP id DF2B1D38CD
-	for <yyyyy@wooz.org>; Sat, 14 Oct 2000 00:16:04 -0400 (EDT)
+Delivered-To: bxxxxx@mail.example.org
+Received: from ns1.example.com (unknown [208.185.174.104])
+	by mail.example.org (Postfix) with ESMTP id DF2B1D38CD
+	for <yyyyy@example.org>; Sat, 14 Oct 2000 00:16:04 -0400 (EDT)
 Received: from dinsdale.python.org (dinsdale.cnri.reston.va.us [132.151.1.21])
-	by ns1.beopen.com (8.9.3/8.9.3) with ESMTP id VAA04124
-	for <bxxxxx@beopen.com>; Fri, 13 Oct 2000 21:17:08 -0700 (PDT)
+	by ns1.example.com (8.9.3/8.9.3) with ESMTP id VAA04124
+	for <bxxxxx@example.com>; Fri, 13 Oct 2000 21:17:08 -0700 (PDT)
 	(envelope-from mailman-users-admin@python.org)
 Received: from dinsdale.python.org (localhost [127.0.0.1])
 	by dinsdale.python.org (Postfix) with ESMTP id 46F711D08C
-	for <bxxxxx@beopen.com>; Sat, 14 Oct 2000 00:15:15 -0400 (EDT)
+	for <bxxxxx@example.com>; Sat, 14 Oct 2000 00:15:15 -0400 (EDT)
 Delivered-To: mailman-users-admin@python.org
 Received: from banzai.nfg.nl (banzai.nfg.nl [194.109.206.156])
 	by dinsdale.python.org (Postfix) with ESMTP id 201661D08C
@@ -51,94 +51,8 @@ zzzzz@shaft.coal.nl
 
    ----- Message header follows -----
 
-Return-Path: <mailman-users-admin@python.org>
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id GAA17388
-	for zzzzz@nfg.nl; Sat, 14 Oct 2000 06:14:45 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id A9BAE1B30B; Sat, 14 Oct 2000 06:06:08 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id XAA25085
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 23:55:54 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 62E251B307; Fri, 13 Oct 2000 23:46:43 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id XAA20156
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 23:35:01 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 247881B308; Fri, 13 Oct 2000 23:26:09 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id XAA15152
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 23:15:47 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id E91F81B308; Fri, 13 Oct 2000 23:06:29 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id WAA09896
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 22:54:42 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 51CA11B308; Fri, 13 Oct 2000 22:45:24 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id WAA04651
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 22:34:41 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 6C48F1B308; Fri, 13 Oct 2000 22:25:19 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id WAA31892
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 22:14:14 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 8ABF91B308; Fri, 13 Oct 2000 22:04:33 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id VAA26727
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 21:54:10 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id A44BC1B308; Fri, 13 Oct 2000 21:44:57 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id VAA21600
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 21:33:40 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 56B311B308; Fri, 13 Oct 2000 21:24:00 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id VAA16279
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 21:13:21 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 409701B308; Fri, 13 Oct 2000 21:04:32 +0200 (CEST)
-Received: (from uucp@localhost)
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with UUCP id UAA11084
-	for zzzzz@nfg.nl; Fri, 13 Oct 2000 20:53:53 +0200
-Received: by shaft.coal.nl (Postfix, from userid 10)
-	id 05A9E1B307; Fri, 13 Oct 2000 20:44:14 +0200 (CEST)
-Received: from dinsdale.python.org (dinsdale.cnri.reston.va.us [132.151.1.21])
-	by banzai.nfg.nl (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id UAA08474
-	for <zzzzz@nfg.nl>; Fri, 13 Oct 2000 20:41:13 +0200
-X-Authentication-Warning: banzai.nfg.nl: Host dinsdale.cnri.reston.va.us [132.151.1.21] claimed to be dinsdale.python.org
-Received: from dinsdale.python.org (localhost [127.0.0.1])
-	by dinsdale.python.org (Postfix) with ESMTP
-	id A1F631CFCC; Fri, 13 Oct 2000 14:38:00 -0400 (EDT)
-Delivered-To: mailman-users@python.org
-Received: from raptor.ebuilt.net (unknown [216.237.34.38])
-	by dinsdale.python.org (Postfix) with ESMTP id 7D3B21CDB9
-	for <mailman-users@python.org>; Fri, 13 Oct 2000 14:35:02 -0400 (EDT)
-Received: by raptor.ebuilt.net with Internet Mail Service (5.5.2650.21)
-	id <4V699WRN>; Fri, 13 Oct 2000 11:35:00 -0700
-Message-ID: <AA1E32BC8A58D411A2CB0050DACEDA43750916@raptor.ebuilt.net>
-From: "Young, Roger" <RYoung@eBuilt.com>
-To: mailman-users@python.org
-X-Mailer: Internet Mail Service (5.5.2650.21)
-Subject: [Mailman-Users] auto responder
-Sender: mailman-users-admin@python.org
-Errors-To: mailman-users-admin@python.org
-X-BeenThere: mailman-users@python.org
-X-Mailman-Version: 2.0beta6
-Precedence: bulk
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Post: <mailto:mailman-users@python.org>
-List-Subscribe: <http://www.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list management users <mailman-users.python.org>
-List-Unsubscribe: <http://www.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=unsubscribe>
-List-Archive: <http://www.python.org/pipermail/mailman-users/>
-Date: Fri, 13 Oct 2000 11:34:51 -0700
+Message header removed
+
 
    ----- Message body suppressed -----
 
diff --git a/tests/bounces/simple_01.txt b/tests/bounces/simple_01.txt
index f2d2669f..ab8b1db5 100644
--- a/tests/bounces/simple_01.txt
+++ b/tests/bounces/simple_01.txt
@@ -17,14 +17,14 @@ Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14UPAP-0001ei-00
 	for yyyyy@digicool.com; Sun, 18 Feb 2001 03:26:01 -0500
-Received: from [63.118.43.131] (helo=receive.turbosport.com)
+Received: from [63.118.43.131] (helo=receive.example.com)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14UP9j-0001c7-00
 	for jpython-interest-admin@python.org; Sun, 18 Feb 2001 03:25:19 -0500
-Received: from receive.turbosport.com [63.118.43.131] by receive.turbosport.com [63.118.43.131]
+Received: from receive.example.com [63.118.43.131] by receive.turbosport.com [63.118.43.131]
 	with RAW (MDaemon.v3.5.2.R)
 	for <jpython-interest-admin@python.org>; Sun, 18 Feb 2001 02:26:12 -0600
-Message-ID: <MDAEMON2560256200102180226.AA2612019@receive.turbosport.com>
+Message-ID: <MDAEMON2560256200102180226.AA2612019@receive.example.com>
 Mime-Version: 1.0
 Content-Type: multipart/mixed; boundary="0218-0226-12-PART-BREAK"
 Precedence: bulk
@@ -36,7 +36,7 @@ List-Id: Python for the Java<SUP><FONT SIZE=-2>TM</FONT></SUP> Platform <jpython
 List-Unsubscribe: <http://mail.python.org/mailman/listinfo/jpython-interest>,
 	<mailto:jpython-interest-request@python.org?subject=unsubscribe>
 List-Archive: <http://mail.python.org/pipermail/jpython-interest/>
-From: MDaemon@receive.turbosport.com
+From: MDaemon@receive.example.com
 Sender: jpython-interest-owner@python.org
 To: jpython-interest-admin@python.org
 Subject: Permanent Delivery Failure
@@ -45,10 +45,10 @@ X-Autogenerated: Mirror
 X-Mirrored-by: <jpython-interest-admin@python.org>
 X-MDSend-Notifications-To: [trash]
 X-MDaemon-Deliver-To: jpython-interest-admin@python.org
-X-Actual-From: MDaemon@receive.turbosport.com
+X-Actual-From: MDaemon@receive.example.com
 X-BeenThere: jpython-interest@python.org
 X-Mailman-Version: 2.0.1 (101270)
-Reply-To: BadMsgQ@receive.turbosport.com
+Reply-To: BadMsgQ@receive.example.com
 
    The following data may contain sections which represent BASE64 encoded
    file attachments.  These sections will be unreadable without MIME aware
@@ -69,16 +69,16 @@ YOUR MESSAGE WAS NOT DELIVERED!
 
 The following addresses did NOT receive a copy of your message: 
 
-> bbbsss@turbosport.com
+> bbbsss@example.com
 
 --- Session Transcript ---
  Attempting SMTP connection to [63.118.43.130 : 25]
  Waiting for socket connection...
  Socket connection established
  Waiting for protocol initiation...
- 220 turbosport.com ESMTP MDaemon 3.5.2 ready
- EHLO receive.turbosport.com
- 250-turbosport.com Hello receive.turbosport.com, ESMTP hello!
+ 220 example.com ESMTP MDaemon 3.5.2 ready
+ EHLO receive.example.com
+ 250-example.com Hello receive.turbosport.com, ESMTP hello!
  250-VRFY
  250-EXPN
  250-ETRN
@@ -87,8 +87,8 @@ The following addresses did NOT receive a copy of your message:
  250 SIZE 40000000
  MAIL From:<jpython-interest-admin@python.org> SIZE=1861
  250 <jpython-interest-admin@python.org>, Sender ok
- RCPT To:<bbbsss@turbosport.com>
- 552 Message for <bbbsss@turbosport.com> would exceed mailbox quota
+ RCPT To:<bbbsss@example.com>
+ 552 Message for <bbbsss@example.com> would exceed mailbox quota
  QUIT
 --- End Transcript ---
 
@@ -97,55 +97,11 @@ The following addresses did NOT receive a copy of your message:
 --0218-0226-12-PART-BREAK
 Content-Type: message/rfc822; charset=US-ASCII; name="md50002271709.md"
 Content-Transfer-Encoding: 7bit
-Content-ID: <MDAEMON2560256200102180226.AA2612019@receive.turbosport.com>
+Content-ID: <MDAEMON2560256200102180226.AA2612019@receive.example.com>
 Content-Description: 
 
-Return-path: <jpython-interest-admin@python.org>
-Received: from mta540.mail.yahoo.com [216.136.131.22] by receive.turbosport.com [63.118.43.131]
-	with SMTP (MDaemon.v3.5.2.R)
-	for <bbbsss@turbosport.com>; Sun, 18 Feb 2001 02:25:20 -0600
-Message-ID: <20010218082300.42071.qmail@mta540.mail.yahoo.com>
-Received: from mta540.mail.yahoo.com for bbbsss@turbosport.com; Feb 18 00:23:00 2001 -0800
-Received: from smtp015.mail.yahoo.com (216.136.173.59)
-X-Yahoo-Forwarded: from aaaaa_20@yahoo.com to bbbsss@turbosport.com
-  by mta540.mail.yahoo.com with SMTP; 18 Feb 2001 00:23:00 -0800 (PST)
-Date: 18 Feb 2001 08:22:57 -0000
-From: MAILER-DAEMON@yahoo.com
-To: aaaaa@yahoo.com
-Subject: failure delivery
-X-MDRcpt-To: bbbsss@turbosport.com
-X-MDRemoteIP: 216.136.131.22
-X-Return-Path: jpython-interest-admin@python.org
-X-MDaemon-Deliver-To: bbbsss@turbosport.com
-
-Message from  yahoo.com.
-Unable to deliver message to the following address(es).
-
-<subscribe.motorcycles@listsociety.com>:
-Sorry, I wasn't able to establish an SMTP connection. (#4.4.1)
-I'm not going to try again; this message has been in the queue too long.
-
---- Original message follows.
-
-Return-Path: <aaaaa@yahoo.com>
-Received: from c58148.upc-c.chello.nl (HELO localhost) (212.187.58.148)
-  by smtp.mail.vip.sc5.yahoo.com with SMTP; 11 Feb 2001 01:15:27 -0000
-X-Apparently-From: <aaaaa?20@yahoo.com>
-X-Sender: aaaaa@yahoo.com
-From: Albert Ttttt <aaaaa@yahoo.com>
-To: subscribe.motorcycles@listsociety.com
-Date: Sun, 11 Feb 2001 02:14:40 +0100
-Subject: Subscribe
-Reply-To: aaaaa@yahoo.com
-MIME-Version: 1.0
-Content-Type: text/plain; charset=iso-8859-1
-Content-Transfer-Encoding: 7bit
-
-
+Message removed
 
-_________________________________________________________
-Do You Yahoo!?
-Get your free @yahoo.com address at http://mail.yahoo.com
 
 --0218-0226-12-PART-BREAK--
 
diff --git a/tests/bounces/simple_02.txt b/tests/bounces/simple_02.txt
index f017fa25..97747267 100644
--- a/tests/bounces/simple_02.txt
+++ b/tests/bounces/simple_02.txt
@@ -42,7 +42,7 @@ X-Mirrored-by: <python-list-admin@python.org>
 X-BeenThere: python-list@python.org
 X-Mailman-Version: 2.0.1 (101270)
 
-Intended recipient: chris.ggggmmmm@usa.net
+Intended recipient: userx@example.net
 
 The following mail has been returned because it encountered an error
 while being processed.  Please try to resend this message.
@@ -51,68 +51,9 @@ A notice of this error has been reported to the POSTMASTER at USA.NET
 which will attempt to contact the intended recipient.
 
 --------RETURNED MAIL FOLLOWS--------
-Received: from mail.python.org [63.102.49.29] by nm195 via mtad (34FM.0700.12.01) 
-	with ESMTP id 167FBVJzI0889M19; Thu, 22 Feb 2001 09:51:43 GMT
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14Vs49-0000n4-00; Thu, 22 Feb 2001 04:29:37 -0500
-Path: news.baymountain.net!uunet!ash.uu.net!npeer.kpnqwest.net!news.tele.dk!130.133.1.3!fu-berlin.de!uni-berlin.de!adsl-138-89-39-3.nnj.adsl.bellatlantic.NET!not-for-mail
-From: ccccc@meezon.com (Ccccc Mmmmm)
-Newsgroups: comp.lang.python
-Subject: Re: import statement is case sensitive
-Lines: 28
-Message-ID: <3a947ac4.802440@News.CIS.DFN.DE>
-References: <3a943bea.525315589@News.CIS.DFN.DE> <t98i9hsgjkov26@corp.supernews.com>
-NNTP-Posting-Host: adsl-138-89-39-3.nnj.adsl.bellatlantic.net (138.89.39.3)
-X-Trace: fu-berlin.de 982810722 24108160 138.89.39.3 (16 [57226])
-X-Newsreader: Forte Free Agent 1.1/32.230
-Xref: news.baymountain.net comp.lang.python:89820
-To: python-list@python.org
-Sender: python-list-admin@python.org
-Errors-To: python-list-admin@python.org
-X-BeenThere: python-list@python.org
-X-Mailman-Version: 2.0.1 (101270)
-Precedence: bulk
-List-Help: <mailto:python-list-request@python.org?subject=help>
-List-Post: <mailto:python-list@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=subscribe>
-List-Id: General discussion list for the Python programming language <python-list.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/python-list/>
-Date: Thu, 22 Feb 2001 02:58:29 GMT
-
-"Lyle" <lllll@rrrrgggg.com> wrote:
-
->> Also what is the purpose of even having it case sensitive. I've yet to
->> see a file system that has case sensitive filenames....
->
->There is an operating system called "Unix" that has case-sensitive file
->names. There is a slight chance that others on this newsgroup have also
->heard of this obscure operating system.
->
-
-Well given the fact that Linux and Windows is beating it to death I
-can see why Unix is becoming obscure :)
-
-Actually I would consider this a shortcoming of Unix. Shipping a
-product that depends on the directory names and files being in the
-right case must cause all sorts of headaches.
-
-I am trying to run an an application under Windows and now I have to
-worry if my directory name is in the correct case. I use PythonWin (a
-fantastic product) to run and test it. There is no option for telling
-it to ignore the case of the import filenames that I could see.
-
-And renaming directories and files is not an easy option.. But anyway,
-this is should automatically be handled in Python depending on the OS.
 
+Message removed
 
-Why would asnyone make the same filenames with different cases? Is
-there a good use?
--- 
-http://mail.python.org/mailman/listinfo/python-list
 ---------END OF RETURNED MAIL--------
 
 
diff --git a/tests/bounces/simple_03.txt b/tests/bounces/simple_03.txt
index 16fc04d6..c710c937 100644
--- a/tests/bounces/simple_03.txt
+++ b/tests/bounces/simple_03.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil t nil nil]
 	[nil "Monday" "2" "April" "2001" "08:27:16" "+0200" "Mail Delivery System" "Mailer-Daemon@pop3.pta.lia.net" nil "18" "Warning: message 14jRTi-0007jE-00 delayed 24 hours" "^From:" "python-list-admin@python.org" "python-list-admin@python.org" "4" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id 458FAD3757
-	for <barry@wooz.org>; Mon,  2 Apr 2001 02:25:41 -0400 (EDT)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id 458FAD3757
+	for <usery@example.org>; Mon,  2 Apr 2001 02:25:41 -0400 (EDT)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1746501; Mon, 02 Apr 2001 02:27:54 -0400
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1746500 for barry@mail.digicool.com; Mon, 02 Apr 2001 02:27:54 -0400
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1746500 for usery@mail.example.com; Mon, 02 Apr 2001 02:27:54 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id CAA09080
-	for <barry@digicool.com>; Mon, 2 Apr 2001 02:28:02 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id CAA09080
+	for <usery@example.com>; Mon, 2 Apr 2001 02:28:02 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14jxoo-0003mt-00
-	for barry@digicool.com; Mon, 02 Apr 2001 02:28:02 -0400
+	for usery@example.com; Mon, 02 Apr 2001 02:28:02 -0400
 Received: from [196.22.216.11] (helo=pop3.pta.lia.net ident=root)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14jxo8-0003hg-00
@@ -58,7 +58,7 @@ The date of the message is:    Sat, 31 Mar 2001 14:33:06 -0500
 
 The address to which the message has not yet been delivered is:
 
-  jacobus@geo.co.za
+  userx@example.za
 
 No action is required on your part. Delivery attempts will continue for
 some time, and this warning may be repeated at intervals if the message
diff --git a/tests/bounces/simple_04.txt b/tests/bounces/simple_04.txt
index 022a3198..58c0288a 100644
--- a/tests/bounces/simple_04.txt
+++ b/tests/bounces/simple_04.txt
@@ -3,19 +3,19 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Friday" "3" "August" "2001" "23:59:56" "-0500" "MAILER-DAEMON@airmail.net" "MAILER-DAEMON@airmail.net" nil "51" "mail failed, returning to sender" "^From:" nil nil "8" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: barry@wooz.org
+Delivered-To: usery@example.org
 Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id D0258D3738
-	for <barry@wooz.org>; Sat,  4 Aug 2001 01:00:57 -0400 (EDT)
+	by mail.example.org (Postfix) with ESMTP id D0258D3738
+	for <usery@example.org>; Sat,  4 Aug 2001 01:00:57 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
   by digicool.com (CommuniGate Pro RULES 3.4)
   with RULES id 2491440; Sat, 04 Aug 2001 01:01:04 -0400
-Received: from smtp.zope.com ([63.100.190.10] verified)
+Received: from smtp.example.com ([63.100.190.10] verified)
   by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2491439 for barry@mail.zope.com; Sat, 04 Aug 2001 01:01:04 -0400
+  with ESMTP id 2491439 for usery@mail.example.com; Sat, 04 Aug 2001 01:01:04 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by smtp.zope.com (8.11.2/8.11.2) with ESMTP id f74511X29279
-	for <barry@zope.com>; Sat, 4 Aug 2001 01:01:01 -0400
+	by smtp.example.com (8.11.2/8.11.2) with ESMTP id f74511X29279
+	for <usery@example.com>; Sat, 4 Aug 2001 01:01:01 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15StYa-0005er-00; Sat, 04 Aug 2001 01:01:00 -0400
@@ -54,52 +54,7 @@ X-Mailman-Version: 2.0.6 (101270)
 |------------------------- Message log follows: -------------------------|
  no valid recipients were found for this message
 |------------------------- Failed addresses follow: ---------------------|
- claird@starbase.neosoft.com ... unknown host
+ userx@example.com ... unknown host
 |------------------------- Message text follows: ------------------------|
-Received: from mx1.airmail.net from [209.196.77.98] by mail3.iadfw.net 
-	(/\##/\ Smail3.1.30.16 #30.25) with esmtp  sender: <mailman-users-admin@python.org>
-	id <mm/15StXR-003859m@mail3.iadfw.net>; Fri, 3 Aug 2001 23:59:49 -0500 (CDT)
-Received: from mail.python.org ([63.102.49.29])
-	by mx1.airmail.net with esmtp (Exim 3.16 #10)
-	id 15StVY-000P3g-00
-	for claird@neosoft.com; Fri, 03 Aug 2001 23:57:52 -0500
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 15StSp-0005bx-00; Sat, 04 Aug 2001 00:55:03 -0400
-Received: from [206.81.192.3] (helo=sttlpop3.sttl.uswest.net)
-	by mail.python.org with smtp (Exim 3.21 #1)
-	id 15StRq-0005bS-00
-	for mailman-users@python.org; Sat, 04 Aug 2001 00:54:02 -0400
-Received: (qmail 14391 invoked by alias); 4 Aug 2001 04:53:49 -0000
-Delivered-To: fixup-mailman-users@python.org@fixme
-Received: (qmail 14361 invoked by uid 0); 4 Aug 2001 04:53:48 -0000
-Received: from sttldslgw14poola186.sttl.uswest.net (HELO first-last.ocentrix.com) (63.229.16.186)
-  by sttlpop3.sttl.uswest.net with SMTP; 4 Aug 2001 04:53:48 -0000
-Message-Id: <5.0.2.1.0.20010803211707.04770ce0@mail.ocentrix.com>
-X-Sender: benwa@mail.ocentrix.com
-X-Mailer: QUALCOMM Windows Eudora Version 5.0.2
-To: runaway@rahul.net (Colin Andrews)
-From: Ben Burnett <benwa@ocentrix.com>
-Subject: Re: [Mailman-Users] Excessive headers and Eudora
-Cc: mailman-users@python.org
-In-Reply-To: <20010803190718.3389699D03@waltz.rahul.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"; format=flowed
-Sender: mailman-users-admin@python.org
-Errors-To: mailman-users-admin@python.org
-X-BeenThere: mailman-users@python.org
-X-Mailman-Version: 2.0.6 (101270)
-Precedence: bulk
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Post: <mailto:mailman-users@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list management users <mailman-users.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/mailman-users/>
-Date: Fri, 03 Aug 2001 21:54:02 -0700
-
-[low-priority message, body not included]
-
+Message removed
 
diff --git a/tests/bounces/simple_05.txt b/tests/bounces/simple_05.txt
index c67113b4..873b77f5 100644
--- a/tests/bounces/simple_05.txt
+++ b/tests/bounces/simple_05.txt
@@ -15,67 +15,11 @@ X-Songbird-From:
 Message from sbcglobal.net.
 Unable to deliver message to the following address(es).
 
-<rlosardo@sbcglobal.net>:
-This user doesn't have a sbcglobal.net account (rlosardo@sbcglobal.net) [-9]
+<userx@example.net>:
+This user doesn't have a sbcglobal.net account (userx@example.net) [-9]
 
 --- Original message follows.
 
-X-Originating-IP: [209.182.169.133]
-Return-Path: <century-announce-bounces@grizz.org>
-Authentication-Results: mta113.sbc.mail.mud.yahoo.com
-  from=grizz.org; domainkeys=neutral (no sig)
-Received: from 207.115.57.79  (EHLO ylpvm48.prodigy.net) (207.115.57.79)
-  by mta113.sbc.mail.mud.yahoo.com with SMTP; Wed, 01 Feb 2006 09:28:27 -0800
-X-Originating-IP: [209.182.169.133]
-Received: from localhost (adsl-209-182-169-133.value.net [209.182.169.133])
-	by ylpvm48.prodigy.net (8.12.10 083104/8.12.10) with ESMTP id k11HSQvf007306;
-	Wed, 1 Feb 2006 12:28:26 -0500
-Received: from localhost ([127.0.0.1] helo=[192.168.0.2])
-	by localhost with esmtp (Exim 4.52)
-	id IU0R6I-0002Y8-HQ; Wed, 01 Feb 2006 09:27:54 -0800
-To: century-announce@grizz.org
-Date: Wed, 1 Feb 2006 09:27:00 -0800
-Message-ID: <PC1740200602010819360171d6899f4f@grizz.org>
-From: Grizzly Peak Century Announcements <century-announce@grizz.org>
-Subject: [GPC Century] GPC Century is May 7, 2006
-X-BeenThere: century-announce@grizz.org
-X-Mailman-Version: 2.1.7
-Precedence: list
-Reply-To: century@grizz.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: century-announce-bounces@grizz.org
-Errors-To: century-announce-bounces@grizz.org
-
-Thank you for registering for the Grizzly Peak Century in 2005 - we'd
-like to see you again! Once again our favorite rolling feast takes
-place on the first Sunday in May - the 7th. We've tweaked the route a
-little bit, we're including a great GPC Water Bottle for each rider,
-and more. But we've still got the fantastic food, the beautiful Bay
-Area vistas, and a wonderful time. More information is available on
-our website at <http://www.GrizzlyPeakCyclists.org/century>.
-
-Registration opens on February 5, 2006. You can fill-out and print an
-application from our website, or you can register "instantly" for
-about 3 bucks through Active.com at
-<http://www.active.com/event_detail.cfm?event_id=1283704>. And if you
-really want a paper flyer, reply to this email with your address, and
-we'll mail you one.
-
-We hope to see you again!
-
-- Jeff Kurtock
-
-Century Chair
-
-_______________________________________________
-Century-Announce mailing list
-Grizzly Peak Century Announcements
-
-*** MESSAGE TRUNCATED ***
-
-
-.
 
+Message removed
 
diff --git a/tests/bounces/simple_06.txt b/tests/bounces/simple_06.txt
index bbb2b757..29b0d7fd 100644
--- a/tests/bounces/simple_06.txt
+++ b/tests/bounces/simple_06.txt
@@ -15,63 +15,10 @@ X-Songbird-From:
 Message from hamiltonpacific.com.
 Unable to deliver message to the following address(es).
 
-<dlyle@hamiltonpacific.com>:
-This user doesn't have a hamiltonpacific.com account (dlyle@hamiltonpacific.com) [0]
+<userx@example.com>:
+This user doesn't have a hamiltonpacific.com account (userx@example.com) [0]
 
 --- Original message follows.
 
-X-Originating-IP: [209.182.169.133]
-Return-Path: <century-announce-bounces@grizz.org>
-Authentication-Results: mta107.biz.mail.re2.yahoo.com
-  from=grizz.org; domainkeys=neutral (no sig)
-Received: from 209.182.169.133  (EHLO localhost) (209.182.169.133)
-  by mta107.biz.mail.re2.yahoo.com with SMTP; Wed, 01 Feb 2006 09:31:44 -0800
-Received: from localhost ([127.0.0.1] helo=[192.168.0.2])
-	by localhost with esmtp (Exim 4.52)
-	id IU0R6J-0002Y8-9G; Wed, 01 Feb 2006 09:27:55 -0800
-To: century-announce@grizz.org
-Date: Wed, 1 Feb 2006 09:27:00 -0800
-Message-ID: <PC1740200602010819360171d6899f4f@grizz.org>
-From: Grizzly Peak Century Announcements <century-announce@grizz.org>
-Subject: [GPC Century] GPC Century is May 7, 2006
-X-BeenThere: century-announce@grizz.org
-X-Mailman-Version: 2.1.7
-Precedence: list
-Reply-To: century@grizz.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: century-announce-bounces@grizz.org
-Errors-To: century-announce-bounces@grizz.org
-
-Thank you for registering for the Grizzly Peak Century in 2005 - we'd
-like to see you again! Once again our favorite rolling feast takes
-place on the first Sunday in May - the 7th. We've tweaked the route a
-little bit, we're including a great GPC Water Bottle for each rider,
-and more. But we've still got the fantastic food, the beautiful Bay
-Area vistas, and a wonderful time. More information is available on
-our website at <http://www.GrizzlyPeakCyclists.org/century>.
-
-Registration opens on February 5, 2006. You can fill-out and print an
-application from our website, or you can register "instantly" for
-about 3 bucks through Active.com at
-<http://www.active.com/event_detail.cfm?event_id=1283704>. And if you
-really want a paper flyer, reply to this email with your address, and
-we'll mail you one.
-
-We hope to see you again!
-
-- Jeff Kurtock
-
-Century Chair
-
-_______________________________________________
-Century-Announce mailing list
-Grizzly Peak Century Announcements
-
-*** MESSAGE TRUNCATED ***
-
-
-.
-
+Message removed
 
diff --git a/tests/bounces/simple_07.txt b/tests/bounces/simple_07.txt
index 46930ec4..45ad0a7d 100644
--- a/tests/bounces/simple_07.txt
+++ b/tests/bounces/simple_07.txt
@@ -15,7 +15,7 @@ X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Found to be clean
 X-Songbird-From: mailer-daemon@prodigy.net
 
-User's mailbox is full: <william.xxxx@sbcglobal.net>
+User's mailbox is full: <userx@example.net>
 Unable to deliver mail.
 
 
diff --git a/tests/bounces/simple_08.txt b/tests/bounces/simple_08.txt
index c2067ce5..7e552c84 100644
--- a/tests/bounces/simple_08.txt
+++ b/tests/bounces/simple_08.txt
@@ -39,7 +39,7 @@ This message was created automatically by mail delivery software.
 A message that you sent could not be delivered to one or more of
 its recipients. The following addresses failed:
 
-  <severin.XXX@t-online.de>
+  <userx@example.de>
 
 SMTP error from remote server after RCPT command:
 host mailin02.sul.t-online.de[194.25.134.9]:
@@ -48,34 +48,5 @@ host mailin02.sul.t-online.de[194.25.134.9]:
 
 --- The header of the original message is following. ---
 
-Received: from [84.154.27.78] (helo=mailsrv.mycompanysname.lan)
-	by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis),
-	id 0ML25U-1FE8V12M9j-0006lD; Tue, 28 Feb 2006 18:18:59 +0100
-Received: from localhost (localhost [127.0.0.1])
-	by mailsrv.mycompanysname.lan (mycompanysname mail service) with ESMTP id EA2CD100A954
-	for <severin.XXX@t-online.de>; Tue, 28 Feb 2006 18:18:58 +0100 (CET)
-Received: from mailsrv.mycompanysname.lan ([127.0.0.1])
- by localhost (mydomain.de [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 31861-10 for <severin.XXX@t-online.de>;
- Tue, 28 Feb 2006 18:18:58 +0100 (CET)
-Received: from mailsrv.mycompanysname.lan (localhost [127.0.0.1])
-	by mailsrv.mycompanysname.lan (mycompanysname mail service) with ESMTP id BB6BD100A308
-	for <severin.XXX@t-online.de>; Tue, 28 Feb 2006 18:18:58 +0100 (CET)
-MIME-Version: 1.0
-Content-Type: text/plain; charset="iso-8859-1"
-Content-Transfer-Encoding: quoted-printable
-Subject: =?iso-8859-1?q?Sie_haben_die_Mailingliste_=22newsletter=22_ab?=
- =?iso-8859-1?q?bestellt?=
-From: newsletter-bounces@mydomain.de
-Message-ID: <mailman.0.1141147137.31940.newsletter@mydomain.de>
-Date: Tue, 28 Feb 2006 18:18:57 +0100
-Precedence: bulk
-X-BeenThere: newsletter@mydomain.de
-X-Mailman-Version: 2.1.6
-List-Id: newsletter <newsletter.mydomain.de>
-X-List-Administrivia: yes
-To: severin.XXX@t-online.de
-Sender: newsletter-bounces@mydomain.de
-Errors-To: newsletter-bounces@mydomain.de
-X-Virus-Scanned: amavisd-new at mydomain.de
-X-Provags-ID: kundenserver.de abuse@kundenserver.de login:50f36a15497f230366e1019f5ac05f49
+Message removed
+
diff --git a/tests/bounces/simple_09.txt b/tests/bounces/simple_09.txt
index 340c410b..615d9169 100644
--- a/tests/bounces/simple_09.txt
+++ b/tests/bounces/simple_09.txt
@@ -22,6 +22,6 @@ A message that you sent could not be delivered to one or more of
 its recipients. This is a permanent error. The following addresses
 failed:
 
-RobotMail@auto-walther.de:
+userx@example.de:
   quota exceeded
 
diff --git a/tests/bounces/simple_10.txt b/tests/bounces/simple_10.txt
index dfc9c3cf..7c2715a5 100644
--- a/tests/bounces/simple_10.txt
+++ b/tests/bounces/simple_10.txt
@@ -40,6 +40,6 @@ This is an automatically generated Delivery Status Notification.
 
 Delivery to the following recipients failed.
 
-       sais@thehartford.com
+       userx@example.com
 
 
diff --git a/tests/bounces/simple_11.txt b/tests/bounces/simple_11.txt
index 2d046db5..398e5f37 100644
--- a/tests/bounces/simple_11.txt
+++ b/tests/bounces/simple_11.txt
@@ -21,7 +21,7 @@ Received: from lifesmtp2.hartfordlife.com (AD2HFDLGT002) by
 	<T76d2e1782bac1e545baa4@ad2simmsw006.ad2.prod> for
 	<gpc-talk-bounces@grizz.org>; Sat, 4 Mar 2006 18:15:32 -0500
 MIME-Version: 1.0
-Subject: DELIVERY FAILURE: User carlosr73 (carlosr73@hartfordlife.com) not
+Subject: DELIVERY FAILURE: User carlosr73 (userx@example.com) not
 	listed in Domino Directory
 To: gpc-talk-bounces@grizz.org
 Date: Sat, 04 Mar 2006 15:15:47 -0800
@@ -58,11 +58,11 @@ Your message
 
 was not delivered to:
 
-  carlosr73@hartfordlife.com
+  userx@example.com
 
 because:
 
-  User carlosr73 (carlosr73@hartfordlife.com) not listed in Domino Directory
+  User carlosr73 (userx@example.com) not listed in Domino Directory
 
 
 
diff --git a/tests/bounces/simple_12.txt b/tests/bounces/simple_12.txt
index b2146d46..a65ba18d 100644
--- a/tests/bounces/simple_12.txt
+++ b/tests/bounces/simple_12.txt
@@ -15,67 +15,10 @@ X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Found to be clean
 X-Songbird-From: 
 
-Invalid final delivery userid: charrogar@rhine1.andrew.ac.jp
+Invalid final delivery userid: userx@example.ac.jp
 
 
 Original message follows.
 
-Received: from volga1.andrew.ac.jp [202.48.128.47] by rhine1.andrew.ac.jp
-  (SMTPD32-8.05) id AA4AAC21011A; Fri, 10 Mar 2006 09:37:30 +0900
-Received: from sb7.songbird.com ([208.184.79.137])
- by volga1.andrew.ac.jp (SMSSMTP 4.1.5.31) with SMTP id M2006031009410202680
- for <charrogar@andrew.ac.jp>; Fri, 10 Mar 2006 09:41:07 +0900
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2A0eFe2025952
-	for <charrogar@andrew.ac.jp>; Thu, 9 Mar 2006 16:40:40 -0800
-Subject: The results of your email commands
-From: gpc-talk-bounces@grizz.org
-To: charrogar@andrew.ac.jp
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============0810244235=="
-Message-ID: <mailman.2394.1141951199.1567.gpc-talk@grizz.org>
-Date: Thu, 09 Mar 2006 16:39:59 -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: Found to be clean
-X-Songbird-From: gpc-talk-bounces@grizz.org
-
---===============0810244235==
-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
-    charrogar@andrew.ac.jp is not a member of the GPC-talk mailing list
-
-- Unprocessed:
-    Re: ParamSvcy news
-    g V x a y I k i v u e m from $ t 155 (3 Og 0 tabIet Dy s)
-    v V s i l a b g x r c a from $ m 98 ( M6 15 tab 2X Iets)
-    s C q i w a y I c i u s from $9 a 6 ( 3l 10 ta AC bIets)
-    =20
-    And many oth Tn er http://gas93.minimumcountry.info
-
-- Done.
-
-
---===============0810244235==
-Content-Type: message/rfc822
-MIME-Version: 1.0
-
-Return-Path: <charrogar@andrew.ac.jp>
-Received: from likmi.ac.id (host-148-244-198-245.block.alestra.net.mx
-
-[message truncated]
-
+Message removed
 
diff --git a/tests/bounces/simple_13.txt b/tests/bounces/simple_13.txt
index 1cbe0f95..eddb9aff 100644
--- a/tests/bounces/simple_13.txt
+++ b/tests/bounces/simple_13.txt
@@ -18,7 +18,7 @@ Content-Type: text/plain; charset="UTF-8"
 Content-Transfer-Encoding: quoted-printable
 
 A message could not be delivered to:
-dycusibreix@ademe.fr
+userx@example.fr
 Subject: The results of your email commands
 L'adresse de messagerie r=C3=A9f=C3=A9renc=C3=A9e ci-dessus n'existe pas. V=
 euillez en v=C3=A9rifier l'orthographe.
@@ -28,33 +28,8 @@ euillez en v=C3=A9rifier l'orthographe.
 Content-Type: message/delivery-status
 Reporting-MTA: mimesweeper.ademe.fr
 
-Received: from sb7.songbird.com (unverified [208.184.79.137]) by
-	mimesweeper.ademe.fr
-	(Postfix) with ESMTP id <T77056c0a260a010202d24@mimesweeper.ademe.fr>
-	for <dycusibreix@ademe.fr>; Tue, 14 Mar 2006 13:47:54 +0100
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2ECm2kE007671
-	for <dycusibreix@ademe.fr>; Tue, 14 Mar 2006 04:48:02 -0800
-Subject: The results of your email commands
-From: gpc-talk-bounces@grizz.org
-To: dycusibreix@ademe.fr
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============0891094467=="
-Message-ID: <mailman.2481.1142340481.1567.gpc-talk@grizz.org>
-Date: Tue, 14 Mar 2006 04:48:01 -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 in
-
---===============0891094467==
-
-
---===============0891094467==--
+Message removed
+
 --2453809.54.1306--
 
 
diff --git a/tests/bounces/simple_14.txt b/tests/bounces/simple_14.txt
index caffd77b..614d102e 100644
--- a/tests/bounces/simple_14.txt
+++ b/tests/bounces/simple_14.txt
@@ -18,105 +18,12 @@ X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Clean
 X-Songbird-From: 
 
-Sorry, unable to deliver your message to iqxwmmfauudpo@dachamp.com for
+Sorry, unable to deliver your message to usery@example.com for
 the following reason:
 
- 552 Quota violation for dump@dachamp.com
+ 552 Quota violation for userx@example.com
 
 A copy of the original message below this line:
 
-Return-Path: <wed_ride-bounces@grizz.org>
-Received: from sb7.songbird.com ([208.184.79.137])
-	by antoninus.mspring.net (Earthlink Mail Service) with ESMTP id 1fklmU7zo3Nl5tA0
-	for <iqxwmmfauudpo@dachamp.com>; Fri, 17 Mar 2006 15:16:16 -0500 (EST)
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2HKGqd2021105
-	for <iqxwmmfauudpo@dachamp.com>; Fri, 17 Mar 2006 12:16:52 -0800
-Subject: Your Account is Past Due
-From: wed_ride-owner@grizz.org
-To: iqxwmmfauudpo@dachamp.com
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============1957169442=="
-Message-ID: <mailman.7908.1142626611.1568.wed_ride@grizz.org>
-Date: Fri, 17 Mar 2006 12:16:51 -0800
-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
-
---===============1957169442==
-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.
-
-
---===============1957169442==
-Content-Type: message/rfc822
-MIME-Version: 1.0
-
-Return-Path: <IQXWMMFAUUDPO@dachamp.com>
-Received: from 208.184.79.206 ([59.92.36.145])
-	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2HKGF8h021010
-	for <wed_ride@grizz.org>; Fri, 17 Mar 2006 12:16:18 -0800
-Received: from .webhost0.alterusa.com 
-	id CFB67334DE; Fri, 17 Mar 2006 18:11:39 -0200
-Received: by .webhost0.starnetusa.net (Postfix, from userid 918)
-	id CFB62684DE; Fri, 17 Mar 2006 19:14:39 -0100
-Date: Fri, 17 Mar 2006 21:12:39 +0100
-Message-Id: <22811130090241.CFB8923DE@.starnetusa.net>
-From: "Odessa Drake" <IQXWMMFAUUDPO@dachamp.com>
-To: wed_ride@grizz.org
-Subject: Your Account is Past Due
-X-SongbirdInformation: support@songbird.com for more information
-X-Songbird: Clean
-X-Songbird-From: iqxwmmfauudpo@dachamp.com
-
-"Ci-iallis Sof-tabs" is better than Pfizer V-iiag`grra
-and normal Ci-ialis because:
-
-- Guarantes 36 hours lasting
-- Safe to take, no side effectts at all
-- Boost and increase se-xual perfoormance
-- Haarder e-rectiiions and quick recharge
-- Proven and c-ertified by e-xperts and d-octors
-- only $1.98 per tabs
-- Special offeer! These prices 
-- are valid u-ntil 30th of March !
- 
-C-lick he`re: http://leamsingschool.info
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-         
-        
-          
-       
-       
-       
-
-
---===============1957169442==--
+Message removed
 
diff --git a/tests/bounces/simple_15.txt b/tests/bounces/simple_15.txt
index 522096a7..fd343c25 100644
--- a/tests/bounces/simple_15.txt
+++ b/tests/bounces/simple_15.txt
@@ -24,236 +24,17 @@ Content-type: text/plain
 ****** Message from InterScan Messaging Security Suite ******
 
 
-Sent <<< RCPT TO:<isam@kviv.be>
+Sent <<< RCPT TO:<userx@example.be>
 Received >>> 550 5.1.1 unknown user.
 
-Unable to deliver message to <isam@kviv.be> (and other recipients in the same domain).
+Unable to deliver message to <userx@example.be> (and other recipients in the same domain).
 
 ************************     End of message     **********************
 
 --------------InterScan_NT_MIME_Boundary
 Content-type: message/rfc822
 
-Received: from sb7.songbird.com ([208.184.79.137]) by mailserver.kviv.be
-	with InterScan Messaging Security Suite; Sun, 12 Mar 2006 05:36:16 +0100
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])by
-	sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2C4WSrZ020992for
-	<isam@kviv.be>; Sat, 11 Mar 2006 20:32:28 -0800
-Subject: The results of your email commands
-From: gpc-talk-bounces@grizz.org
-To: isam@kviv.be
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
-	boundary="===============0254048733=="
-Message-ID: <mailman.2432.1142137947.1567.gpc-talk@grizz.org>
-Date: Sat, 11 Mar 2006 20:32:27 -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: Found to be clean
-X-Songbird-From: gpc-talk-bounces@grizz.org
-X-imss-version: 2.5
-X-imss-result: Passed
-X-imss-scores: Clean:1.91248 C:22 M:1 S:5 R:5
-X-imss-settings: Baseline:3 C:1 M:4 S:4 R:4 (0.5000 0.5000)
-
---===============0254048733==
-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
-    isam@kviv.be is not a member of the GPC-talk mailing list
-
-- Unprocessed:
-    Re: PaGDramcy news
-    z C i i n a r I n i d s $9 w 9 (10 ip   a p y i g l u l t s g )
-    g V p a m I y i u u y m $10 x 5 ( BU 30  a p y i k l j l u s h )
-    v V p i x a r g e r i a $ g 69 (10 WO   d p c i o l d l g s l )
-    =20
-    And LG many other.
-    =20
-    Sav q8 e ove Ox r 5 5Z 0% wi sV th ou 7t r o 0O nline s nz tore
-    http://fovy93.withoadri.com
-
-- Done.
-
-
---===============0254048733==
-Content-Type: message/rfc822
-MIME-Version: 1.0
-
-Return-Path: <isam@kviv.be>
-Received: from bxa.doc.gov (70-88-76-26-ISP-IL.hfc.comcastbusiness.net
-	[70.88.76.26] (may be forged))
-	by sb7.songbird.com (8.12.11/8.12.11) with SMTP id k2C4W5h6020919
-	for <gpc-talk-unsubscribe@grizz.org>; Sat, 11 Mar 2006 20:32:11 -0800
-Message-ID: <000001c6458d$d20fbd70$afc1a8c0@kca33>
-Reply-To: "Isamu Shahan" <isam@kviv.be>
-From: "Isamu Shahan" <isam@kviv.be>
-To: gpc-talk-unsubscribe@grizz.org
-Subject: Re: PaGDramcy news
-Date: Sat, 11 Mar 2006 23:31:24 -0500
-MIME-Version: 1.0
-Content-Type: multipart/alternative;
-	boundary="----=_NextPart_000_0001_01C64563.E939B570"
-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: Found to be clean
-X-Songbird-From: isam@kviv.be
-
-This is a multi-part message in MIME format.
-
-------=_NextPart_000_0001_01C64563.E939B570
-Content-Type: text/plain;
-	charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-z C i i n a r I n i d s $9 w 9 (10 ip   a p y i g l u l t s g )
-g V p a m I y i u u y m $10 x 5 ( BU 30  a p y i k l j l u s h )
-v V p i x a r g e r i a $ g 69 (10 WO   d p c i o l d l g s l )
-=20
-And LG many other.
-=20
-Sav q8 e ove Ox r 5 5Z 0% wi sV th ou 7t r o 0O nline s nz tore
-http://fovy93.withoadri.com
-
-------=_NextPart_000_0001_01C64563.E939B570
-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=3D3><FONT color=3D#2438F1><span style=3D"
-float:
-right"> z </span>C<span style=3D"
-float:
-right"> i </span>i<span style=3D"
-float:
-right"> n </span>a<span style=3D"
-float:
-right"> r </span>I<span style=3D"
-float:
-right"> n </span>i<span style=3D"
-float:
-right"> d </span>s</FONT> <FONT color=3D#EB3815>$9<span style=3D"
-float:
-right"> w </span>9</FONT> (10<span style=3D"
-float:
-right"> ip </span>&nbsp;<span style=3D"
-float:
-right"> a </span>p<span style=3D"
-float:
-right"> y </span>i<span style=3D"
-float:
-right"> g </span>l<span style=3D"
-float:
-right"> u </span>l<span style=3D"
-float:
-right"> t </span>s<span style=3D"
-float:
-right"> g </span>)</FONT></DIV>
-<DIV><FONT face=3DArial size=3D3><FONT color=3D#2438F1><span style=3D"
-float:
-right"> g </span>V<span style=3D"
-float:
-right"> p </span>a<span style=3D"
-float:
-right"> m </span>I<span style=3D"
-float:
-right"> y </span>i<span style=3D"
-float:
-right"> u </span>u<span style=3D"
-float:
-right"> y </span>m</FONT> <FONT color=3D#EB3815>$10<span style=3D"
-float:
-right"> x </span>5</FONT> (<span style=3D"
-float:
-right"> BU </span>30&nbsp;<span style=3D"
-float:
-right"> a </span>p<span style=3D"
-float:
-right"> y </span>i<span style=3D"
-float:
-right"> k </span>l<span style=3D"
-float:
-right"> j </span>l<span style=3D"
-float:
-right"> u </span>s<span style=3D"
-float:
-right"> h </span>)</FONT></DIV>
-<DIV><FONT face=3DArial size=3D3><FONT color=3D#2438F1><span style=3D"
-float:
-right"> v </span>V<span style=3D"
-float:
-right"> p </span>i<span style=3D"
-float:
-right"> x </span>a<span style=3D"
-float:
-right"> r </span>g<span style=3D"
-float:
-right"> e </span>r<span style=3D"
-float:
-right"> i </span>a</FONT> <FONT color=3D#EB3815>$<span style=3D"
-float:
-right"> g </span>69</FONT> (10<span style=3D"
-float:
-right"> WO </span>&nbsp;<span style=3D"
-float:
-right"> d </span>p<span style=3D"
-float:
-right"> c </span>i<span style=3D"
-float:
-right"> o </span>l<span style=3D"
-float:
-right"> d </span>l<span style=3D"
-float:
-right"> g </span>s<span style=3D"
-float:
-right"> l </span>)</FONT></DIV>
-<DIV><FONT face=3DArial size=3D3></FONT>&nbsp;</DIV>
-<DIV><FONT face=3DArial size=3D3>And <span style=3D"
-float:
-right"> LG </span>many other.</FONT></DIV>
-<DIV><FONT face=3DArial size=3D3></FONT>&nbsp;</DIV>
-<DIV><FONT face=3DArial size=3D3>Sav<span style=3D"
-float:
-right"> q8 </span>e ove<span style=3D"
-float:
-right"> Ox </span>r 5<span style=3D"
-float:
-right"> 5Z </span>0% wi<span style=3D"
-float:
-right"> sV </span>th ou<span style=3D"
-float:
-right"> 7t </span>r o<span style=3D"
-float:
-right"> 0O </span>nline s<span style=3D"
-float:
-right"> nz </span>tore <A =
-href=3D"http://fovy93.withoadri.com">http://fovy93.withoadri.com</A></FON=
-T></DIV></BODY></HTML>
-------=_NextPart_000_0001_01C64563.E939B570--
---===============0254048733==--
+Message removed
 
 --------------InterScan_NT_MIME_Boundary--
 
diff --git a/tests/bounces/simple_16.txt b/tests/bounces/simple_16.txt
index 4ab1f1be..a1c96ce5 100644
--- a/tests/bounces/simple_16.txt
+++ b/tests/bounces/simple_16.txt
@@ -24,55 +24,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   an undisclosed address
-    (generated from xvlogtfsei@the-messenger.com)
+    (generated from userx@example.com)
 
 ------ This is a copy of the message, including all the headers. ------
 
-Return-path: <gpc-talk-bounces@grizz.org>
-Received: from sb7.songbird.com ([208.184.79.137])
-	by gaffer.cinergycom.net with esmtp (Exim 4.52)
-	id 1FPDg0-0007jU-1y
-	for xvlogtfsei@the-messenger.com; Fri, 31 Mar 2006 01:04:10 -0600
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k2V74GQL029495
-	for <xvlogtfsei@the-messenger.com>; Thu, 30 Mar 2006 23:04:16 -0800
-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: xvlogtfsei@the-messenger.com
-Message-ID: <mailman.9022.1143788655.1568.gpc-talk@grizz.org>
-Date: Thu, 30 Mar 2006 23:04:15 -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-CCC-Cleanmail-Spam-Version: 1.1
-X-CCC-Cleanmail-Spam-Extended-Info: SA score = 0.6/5.0 
-	*  0.6 NO_REAL_NAME From: does not include a real name
-X-CCC-Cleanmail-Spam: No spam detected
-
-Your mail to 'GPC-talk' with the subject
-
-    GAIN UP
-
-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/420aa8073840d743a30950f4a67869bf3a253dd3
-
+Message removed
 
diff --git a/tests/bounces/simple_17.txt b/tests/bounces/simple_17.txt
index 4d4cbfa8..2806cc8d 100644
--- a/tests/bounces/simple_17.txt
+++ b/tests/bounces/simple_17.txt
@@ -25,52 +25,9 @@ This is an automatically generated Delivery Status Notification
 
 Delivery to the following recipient failed permanently:
 
-     internetsailing@gmail.com
+     userx@example.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 -----
+Message removed
 
diff --git a/tests/bounces/simple_18.txt b/tests/bounces/simple_18.txt
index 6f642a46..4930df5e 100644
--- a/tests/bounces/simple_18.txt
+++ b/tests/bounces/simple_18.txt
@@ -20,7 +20,7 @@ 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-for:  userx@example.com
 Error-Code: 0
 Error-Text: Mailer mail.kesslersupply.com said:
             "554 Message looping (received 6 times)"
@@ -28,46 +28,6 @@ Error-Text: Mailer mail.kesslersupply.com said:
 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
+Message removed
 
diff --git a/tests/bounces/simple_19.txt b/tests/bounces/simple_19.txt
index 54ea96c9..3d6a8daf 100644
--- a/tests/bounces/simple_19.txt
+++ b/tests/bounces/simple_19.txt
@@ -21,7 +21,7 @@ X-Songbird-From:
 (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>:
+<userx@example.com.ar>:
 Sorry, no mailbox here by that name. (#5.1.1)
 
 --- Mensaje original adjunto.
@@ -29,49 +29,7 @@ Sorry, no mailbox here by that name. (#5.1.1)
 --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
-
+Message removed
 
 --1148288358cumeils.prima.com.ar967579--
 
diff --git a/tests/bounces/simple_20.txt b/tests/bounces/simple_20.txt
index 84991148..7e8fbad5 100644
--- a/tests/bounces/simple_20.txt
+++ b/tests/bounces/simple_20.txt
@@ -18,10 +18,10 @@ X-Songbird-From: dsicspiibs.spi-internet@socgen.com
 
 ***********************************************
 Votre message n'a pas pu etre delivre a
-duke@ald.socgen.com
+userx@example.com
 
 ***********************************************
 Your message could not be delivered to
-duke@ald.socgen.com
+userx@example.com
 
 ***********************************************
diff --git a/tests/bounces/simple_21.txt b/tests/bounces/simple_21.txt
index dde9c444..788575ca 100644
--- a/tests/bounces/simple_21.txt
+++ b/tests/bounces/simple_21.txt
@@ -37,7 +37,7 @@ X-MIME-Autoconverted: from quoted-printable to 8bit by sb7.songbird.com id
 This is an automated message created by mail delivery software.
 
 Your message to:
-	assumpeatman@dsgmfg.com
+	userx@example.com
 
 has not yet been delivered because the recipient server did not respond.
 
diff --git a/tests/bounces/simple_22.txt b/tests/bounces/simple_22.txt
index 99b0cc5b..df6bbfb5 100644
--- a/tests/bounces/simple_22.txt
+++ b/tests/bounces/simple_22.txt
@@ -16,7 +16,7 @@ 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
+User@example.org
 
 Please do not resend your original message.
 
diff --git a/tests/bounces/simple_23.txt b/tests/bounces/simple_23.txt
index 7399315a..44201f32 100644
--- a/tests/bounces/simple_23.txt
+++ b/tests/bounces/simple_23.txt
@@ -13,140 +13,12 @@ X-Songbird: Clean
 X-Songbird-From: 
 
 Your message has encountered delivery problems
-to local user ketchuy.
-(Originally addressed to ketchuy@dadoservice.it)
+to local user userx.
+(Originally addressed to userx@example.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==--
+Message removed
 
diff --git a/tests/bounces/simple_24.txt b/tests/bounces/simple_24.txt
index 447a2201..de5eb934 100644
--- a/tests/bounces/simple_24.txt
+++ b/tests/bounces/simple_24.txt
@@ -8,7 +8,7 @@ Received: from mail pickup service by sl.gomaps.com with Microsoft SMTPSVC;
 Message-ID: <SLND200605030009223890@gomaps.com>
 From: Postmaster <>
 To: gpc-talk-bounces@grizz.org
-Subject: Undeliverable: liberty@gomaps.com
+Subject: Undeliverable: userx@example.com
 Date: Wed, 3 May 2006 00:09:22
 MIME-Version: 1.0
 X-Mailer: SpamLion (E 1.60.205)
@@ -23,11 +23,11 @@ X-Songbird-From:
 --------------------------------------------------------------------------------
 Your Message
 
-To:      <liberty@gomaps.com>
+To:      <userx@example.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
+Did not reach the following recipient: userx@example.com
 
diff --git a/tests/bounces/simple_25.txt b/tests/bounces/simple_25.txt
index 1973ca3a..6bf9e9df 100644
--- a/tests/bounces/simple_25.txt
+++ b/tests/bounces/simple_25.txt
@@ -27,7 +27,7 @@ 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>
+userx@example.com<br>
 
 No such user<br>
 
@@ -36,7 +36,7 @@ No such user<br>
 [���Ƿ����� vipmail-g1.xinnetdns.com ��Ͷ�ݳ��򷵻ص���ʾ��Ϣ]<br><br>
 
 <font color=red>�����е�ַ���ż�Ͷ��ʧ�ܣ��Է��������޷��������ܻ��߾ܾ���������ʼ���<br>����һ�������ԵĴ��󣬷������Ѿ���������Ͷ�ݡ�</font><br>
-mahau@cnbearing.com<br><br>
+userx@example.com<br><br>
 
 �Է����������ش�����ʾ:<br>
 <font color=red>No such user</font><br>
@@ -48,332 +48,7 @@ Content-Type: message/rfc822;
 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--
-
-
-
+Message removed
 
---===============0182096736==--
 --------=_1147682154_8417--
 
diff --git a/tests/bounces/simple_26.txt b/tests/bounces/simple_26.txt
index 4c868946..dc66ed44 100644
--- a/tests/bounces/simple_26.txt
+++ b/tests/bounces/simple_26.txt
@@ -14,7 +14,7 @@ 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.
+Subject: Your message to userx@example.it could not be delivered.
 X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Clean
 X-Songbird-From: 
@@ -23,8 +23,8 @@ 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 to userx@example.it has reached our local address 
+userx@example.it, but this email address is wrong or no longer valid.
 
 Your message has NOT been delivered.
 
@@ -35,40 +35,5 @@ 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]
+Message removed
 
diff --git a/tests/bounces/simple_27.txt b/tests/bounces/simple_27.txt
index ad1abf2c..cbab7ea6 100644
--- a/tests/bounces/simple_27.txt
+++ b/tests/bounces/simple_27.txt
@@ -11,7 +11,7 @@ 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!
+Subject: Warning: userx@example.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>
@@ -31,7 +31,7 @@ X-Songbird-From: mdaemon@webmail.pla.net.py
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
-kulp@webmail.pla.net.py - no such user here.
+userx@example.net.py - no such user here.
 
 There is no user by that name at this server.
 
@@ -43,237 +43,7 @@ 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==--
+Message removed
 
 --0411-0630-59-PART-BREAK--
 
diff --git a/tests/bounces/simple_28.txt b/tests/bounces/simple_28.txt
index 9af9f5f3..6fe52870 100644
--- a/tests/bounces/simple_28.txt
+++ b/tests/bounces/simple_28.txt
@@ -36,44 +36,11 @@ YOU DO NOT NEED TO RESEND YOUR MESSAGE.
 
 Delivery to the following recipient has been delayed:
 
-     luis.hiam@gmail.com
+     userx@example.com
 
 Message will be retried for 2 more day(s)
 
    ----- Message header follows -----
 
-Received: by 10.86.26.1 with SMTP id 1mr4665798fgz.49.1213394647106;
-        Fri, 13 Jun 2008 15:04:07 -0700 (PDT)
-Return-Path: <spip-commit-bounces@rezo.net>
-Received: from alan.rezo.net (alan.rezo.net [217.24.84.2])
-        by mx.google.com with ESMTP id 4si6055077fgg.9.2008.06.13.15.03.59;
-        Fri, 13 Jun 2008 15:04:07 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of spip-commit-bounces@rezo.net designates 217.24.84.2 as permitted sender) client-ip=217.24.84.2;
-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of spip-commit-bounces@rezo.net designates 217.24.84.2 as permitted sender) smtp.mail=spip-commit-bounces@rezo.net
-Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1])
-	by alan.rezo.net (Postfix) with ESMTP id 6A8E131CC54;
-	Sat, 14 Jun 2008 00:00:49 +0200 (CEST)
-Received: by alan.rezo.net (Postfix, from userid 1001)
-	id 17BCA31C00A; Sat, 14 Jun 2008 00:00:04 +0200 (CEST)
-To: spip-commit@rezo.net
-From: webdiff tracspip <spip-commit@rezo.net>
-Message-Id: <20080613220004.17BCA31C00A@alan.rezo.net>
-Date: Sat, 14 Jun 2008 00:00:04 +0200 (CEST)
-Subject: [spip-commit] webdiff tracspip 14.06.2008
-X-BeenThere: spip-commit@rezo.net
-X-Mailman-Version: 2.1.6b2
-Precedence: list
-List-Id: "SPIP : toutes les modifs du code" <spip-commit.rezo.net>
-List-Unsubscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>,
-	<mailto:spip-commit-request@rezo.net?subject=unsubscribe>
-List-Archive: <http://listes.rezo.net/archives/spip-commit>
-List-Post: <mailto:spip-commit@rezo.net>
-List-Help: <mailto:spip-commit-request@rezo.net?subject=help>
-List-Subscribe: <http://listes.rezo.net/mailman/listinfo/spip-commit>,
-	<mailto:spip-commit-request@rezo.net?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============0262606712=="
-Sender: spip-commit-bounces@rezo.net
-Errors-To: spip-commit-bounces@rezo.net
-
-   ----- Message body suppressed -----
+Message removed
 
diff --git a/tests/bounces/simple_29.txt b/tests/bounces/simple_29.txt
index 33dcb3c0..6c5be5c5 100644
--- a/tests/bounces/simple_29.txt
+++ b/tests/bounces/simple_29.txt
@@ -1,6 +1,6 @@
 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
 	by strategicnetwork.org (Postfix) with ESMTP id 635A27347E5
-	for <thilakayi_bing@landshire.com>; Tue, 13 May 2008 12:51:46 -0600 (MDT)
+	for <userx@example.com>; Tue, 13 May 2008 12:51:46 -0600 (MDT)
 From: "Mail Delivery System" <MAILER-DAEMON@p02c11m063.mxlogic.net>
 To: <network-news-bounces@strategicnetwork.org>
 Subject: Mail delivery failed
@@ -18,38 +18,12 @@ This message was created automatically by mail delivery software.
 A message that you have sent could not be delivered to one or more
 recipients.  This is a permanent error.  The following address failed:
 
-  <thilakayi_bing@landshire.com>: 550 unknown user
-<thilakayi_bing@landshire.com>
+  <userx@example.com>: 550 unknown user
+<userx@example.com>
 
 
 
 Included is a copy of the message header:
 -----------------------------------------
-Received: from unknown [66.35.39.241] (EHLO strategicnetwork.org)
-	by p02c11m063.mxlogic.net (mxl_mta-5.5.0-3)
-	with ESMTP id
-243e9284.3570539440.159512.00-095.p02c11m063.mxlogic.net (envelope-from
-<network-news-bounces@strategicnetwork.org>);
-	Tue, 13 May 2008 12:51:46 -0600 (MDT)
-Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
-	by strategicnetwork.org (Postfix) with ESMTP id 635A27347E5
-	for <thilakayi_bing@landshire.com>; Tue, 13 May 2008 12:51:46 -0600
-(MDT)
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-From: network-news-request@strategicnetwork.org
-To: thilakayi_bing@landshire.com
-Subject: confirm 729791e8feb106a11648f358c538d4073e9eb7b1
-Reply-To: network-news-request@strategicnetwork.org
-Message-ID: <mailman.2838.1210704705.3367.network-news@strategicnetwork.org>
-Date: Tue, 13 May 2008 12:51:45 -0600
-Precedence: bulk
-X-BeenThere: network-news@strategicnetwork.org
-X-Mailman-Version: 2.1.5
-List-Id: network-news.strategicnetwork.org
-X-List-Administrivia: yes
-Sender: network-news-bounces@strategicnetwork.org
-Errors-To: network-news-bounces@strategicnetwork.org
-
+Message removed
 
diff --git a/tests/bounces/simple_30.txt b/tests/bounces/simple_30.txt
index 3f4293d7..865847d2 100644
--- a/tests/bounces/simple_30.txt
+++ b/tests/bounces/simple_30.txt
@@ -29,13 +29,13 @@ Content-Transfer-Encoding: 8bit
 
 Delivery to the following recipients failed permanently:
 
-   * wmnqicorpat@nqicorp.com
+   * userx@example.com
 
 
 ============================================================================
                              Technical details:                             
 
-SMTP:RCPT host 62.193.203.102: 553 5.3.0 <wmnqicorpat@nqicorp.com>... No such user here
+SMTP:RCPT host 62.193.203.102: 553 5.3.0 <userx@example.com>... No such user here
 
 
 ============================================================================
@@ -47,26 +47,7 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment
 
 
-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 k9H62Ktt011069
-	for <wmnqicorpat@nqicorp.com>; Mon, 16 Oct 2006 23:02:20 -0700
-Subject: The results of your email commands
-From: gpc-talk-bounces@grizz.org
-To: wmnqicorpat@nqicorp.com
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============0123257981=="
-Message-ID: <mailman.10165.1161064939.1567.gpc-talk@grizz.org>
-Date: Mon, 16 Oct 2006 23:02:19 -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
+Message removed
 
 --------------I305M09060309060P_013011610664690--
 
diff --git a/tests/bounces/simple_31.txt b/tests/bounces/simple_31.txt
index 94b229da..737dbc2b 100644
--- a/tests/bounces/simple_31.txt
+++ b/tests/bounces/simple_31.txt
@@ -26,7 +26,7 @@ Content-Transfer-Encoding: 8bit
 
 Delivery to the following recipients failed permanently:
 
-   * nmorel@actisce.fr
+   * userx@example.fr
 
 
 
@@ -43,64 +43,7 @@ Content-Type: message/rfc822; charset=UFT-8;
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment
 
-Received: from alan.rezo.net (localhost.rezo.net [127.0.0.1])
-	by alan.rezo.net (Postfix) with ESMTP id 5BC1D3B02BC;
-	Fri, 20 Jun 2008 20:23:58 +0200 (CEST)
-Received: from localhost (localhost.rezo.net [127.0.0.1])
-	by alan.rezo.net (Postfix) with ESMTP id AB2183B02BE
-	for <immigration.jetable@rezo.net>;
-	Fri, 20 Jun 2008 20:23:54 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at rezo.net
-X-Spam-Score: 0.66
-X-Spam-Level: 
-X-Spam-Status: No, score=0.66 tagged_above=-100 required=5 tests=[AWL=-0.507, 
-	BAYES_00=-2.599, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_POST=1.708,
-	HTML_50_60=0.134, HTML_MESSAGE=0.001, SUBJECT_ENCODED_TWICE=1.723]
-Received: from alan.rezo.net ([127.0.0.1])
-	by localhost (alan.rezo.net [127.0.0.1]) (amavisd-new, port 10024)
-	with LMTP id jkfSPXMXefwG for <immigration.jetable@rezo.net>;
-	Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
-Received: from neuf-infra-smtp-out-sp604006av.neufgp.fr
-	(neuf-infra-smtp-out-sp604006av.neufgp.fr [84.96.92.121])
-	by alan.rezo.net (Postfix) with ESMTP id 6FD2D3B02A3
-	for <immigration.jetable@rezo.net>;
-	Fri, 20 Jun 2008 20:23:47 +0200 (CEST)
-Received: from neuf-infra-smtp-out-sp604001av.neufgp.fr ([10.110.56.120])
-	by neuf-infra-smtp-out-sp604006av.neufgp.fr with neuf telecom
-	id g8W91Z0022bdnoS06JPk5X; Fri, 20 Jun 2008 20:23:45 +0200
-Received: from [192.168.1.2] ([84.101.242.132])
-	by neuf-infra-smtp-out-sp604001av.neufgp.fr with neuf telecom
-	id gJPk1Z00R2s6HG401JPk5j; Fri, 20 Jun 2008 20:23:45 +0200
-Mime-Version: 1.0 (Apple Message framework v753.1)
-To: "Liste de travail du collectif Uni(e)s contre une immigration jetable"
-	<immigration.jetable@rezo.net>
-Message-Id: <8EB18665-4233-4916-9E9C-29D6039167BA@wanadoo.fr>
-References: <559327.5591.qm@web25704.mail.ukl.yahoo.com>
-From: Stephen Suffern <suffern.avocat@wanadoo.fr>
-Date: Fri, 20 Jun 2008 20:23:43 +0200
-X-Mailer: Apple Mail (2.753.1)
-Subject: [Immigration.jetable] =?iso-8859-1?q?Fwd=3A_=5BGisti-membres=5D_P?=
-	=?iso-8859-1?q?lainte_du_Minist=E8re_de_l=27Int=E9rieur_contre_le_collect?=
-	=?iso-8859-1?q?if_de_soutien_aux_sans_papiers_de_RENNES?=
-X-BeenThere: immigration.jetable@rezo.net
-X-Mailman-Version: 2.1.11rc1
-Precedence: list
-Reply-To: "Liste de travail du collectif Uni\(e\)s contre une immigration
-	jetable" <immigration.jetable@rezo.net>
-List-Id: "Liste de travail du collectif Uni\(e\)s contre une immigration
-	jetable" <immigration.jetable.rezo.net>
-List-Unsubscribe: <http://listes.rezo.net/mailman/options/immigration.jetable>, 
-	<mailto:immigration.jetable-request@rezo.net?subject=unsubscribe>
-List-Archive: <http://listes.rezo.net/mailman/private/immigration.jetable>
-List-Post: <mailto:immigration.jetable@rezo.net>
-List-Help: <mailto:immigration.jetable-request@rezo.net?subject=help>
-List-Subscribe: <http://listes.rezo.net/mailman/listinfo/immigration.jetable>, 
-	<mailto:immigration.jetable-request@rezo.net?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============1384174044=="
-Sender: immigration.jetable-bounces@rezo.net
-Errors-To: immigration.jetable-bounces@rezo.net
-
-
+Message removed
 
 --------------I305M09060309060P_788012139862340--
 
diff --git a/tests/bounces/simple_32.txt b/tests/bounces/simple_32.txt
index be040178..1e70bd3d 100644
--- a/tests/bounces/simple_32.txt
+++ b/tests/bounces/simple_32.txt
@@ -29,13 +29,13 @@ Content-Transfer-Encoding: 8bit
 
 Delevery to the following recipients was aborted after 5.0 hour(s):
 
-  * teteyn@agence-forbin.com
+  * userx@example.com
 
 
 ============================================================================
                              Technical details:                             
 
-Routing: Could not find a gateway for teteyn@agence-forbin.com
+Routing: Could not find a gateway for userx@example.com
 
 
 ============================================================================
@@ -47,31 +47,7 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment
 
 
-Received: from sb7.songbird.com ([208.184.79.137])
-	by av2.amenworld.com with AMEN
-	id c6tn1V00i2xlHa80000000
-	for teteyn@agence-forbin.com; Thu, 19 Oct 2006 08:53:57 +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 k9J6rxFD032578
-	for <teteyn@agence-forbin.com>; Wed, 18 Oct 2006 23:53:59 -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: teteyn@agence-forbin.com
-Message-ID: <mailman.27302.1161240838.1568.gpc-talk@grizz.org>
-Date: Wed, 18 Oct 2006 23:53: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
+Message removed
 
 --------------I305M09060309060P_160911612849850--
 
diff --git a/tests/bounces/simple_33.txt b/tests/bounces/simple_33.txt
index 291cbe61..aeab62aa 100644
--- a/tests/bounces/simple_33.txt
+++ b/tests/bounces/simple_33.txt
@@ -29,13 +29,13 @@ Content-Transfer-Encoding: 8bit
 
 Delevery to the following recipients failed permanently:
 
-   * hmu@extralumin.com
+   * userx@example.com
 
 
 ============================================================================
                              Technical details:                             
 
-SMTP:RCPT host 62.193.203.20: 553 5.3.0 <hmu@extralumin.com>... No such user here
+SMTP:RCPT host 62.193.203.20: 553 5.3.0 <userx@example.com>... No such user here
 
 
 ============================================================================
@@ -47,26 +47,7 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment
 
 
-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 kBH8rlWO013350
-	for <hmu@extralumin.com>; Sun, 17 Dec 2006 00:53:47 -0800
-Subject: reconstitute
-From: wed_ride-owner@grizz.org
-To: hmu@extralumin.com
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="===============1426064790=="
-Message-ID: <mailman.39762.1166345626.1568.wed_ride@grizz.org>
-Date: Sun, 17 Dec 2006 00:53:46 -0800
-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
+Message removed
 
 --------------I305M09060309060P_699011663456300--
 
diff --git a/tests/bounces/simple_34.txt b/tests/bounces/simple_34.txt
index 0c0b10c6..3b204ec6 100644
--- a/tests/bounces/simple_34.txt
+++ b/tests/bounces/simple_34.txt
@@ -10,7 +10,7 @@ Message-ID: <A6B3019F-262A-4C49-9ACF-E05543110CA6@mailcluster.fastdnsservers.com
 X-MS-Has-Attach: 
 X-MS-TNEF-Correlator: 
 From: <mailer-daemon@mailcluster.fastdnsservers.com>
-To: <news-bounces@lists.xxx.com>
+To: <news-bounces@lists.example.com>
 
 Your message did not reach some or all of the intended recipients.
 
@@ -19,11 +19,11 @@ Your message did not reach some or all of the intended recipients.
 
 The following recipient(s) could not be reached:
 
-roland@xxx.com
+roland@example.com
    Error Type: SMTP
    Remote server (216.122.20.147) issued an error.
-   hMailServer sent: RCPT TO:<roland@xxx.com>
-   Remote server replied: 550 5.1.1 <roland@xxx.com>... User unknown
+   hMailServer sent: RCPT TO:<roland@example.com>
+   Remote server replied: 550 5.1.1 <roland@example.com>... User unknown
 
 
 
diff --git a/tests/bounces/simple_35.txt b/tests/bounces/simple_35.txt
index ee43aa3e..42ced35b 100644
--- a/tests/bounces/simple_35.txt
+++ b/tests/bounces/simple_35.txt
@@ -6,83 +6,22 @@ Content-Type: text/plain;
 Content-Transfer-Encoding: quoted-printable
 Subject: Mail Delivery Warning
 Date: Thu, 19 Feb 2009 16:12:07 -0800
-Message-ID: <200902200012.n1K0C71m032486@xxx.com>
+Message-ID: <200902200012.n1K0C71m032486@example.com>
 X-MS-Has-Attach: 
 X-MS-TNEF-Correlator: 
-From: <Postmaster\@xxx.com@xxx.com>
-To: <huntads-bounces@xxx.com>
+From: <Postmaster\@example.com@xxx.com>
+To: <huntads-bounces@example.com>
 
 This is an advisory-only email.  Please do not reply to it.
 		=09
 Delivery of email to this address
 		=09
-"calvin@xxx.com"
+"calvin@example.com"
 		=09
 has been postponed due to a full mailbox.
 		=09
 We will continue to try to deliver your message over the next few days.
 		=09
-The first 50 lines of your original message follow:> Received: from =
-mx105.stngva01.us.mxservers.net (198.173.112.42)
-> 	by mail35b.att-webhosting.com (RS ver 1.0.95vs) with SMTP id =
-1-084358326
-> 	for <calvin@xxx.com>; Thu, 19 Feb 2009 19:05:26 -0500 (EST)
-> Received: from unknown [72.166.138.3] (EHLO xxx)
-> 	by va1-mx105.stngva01.us.mxservers.net (mxl_mta-3.1.0-05)
-> 	with ESMTP id =
-f93fd994.2809027488.147598.00-011.va1-mx105.stngva01.us.mxservers.net =
-(envelope-from <huntads-bounces@xxx.com>);
-> 	Thu, 19 Feb 2009 19:04:47 -0500 (EST)
-> Received: from localhost.xxx.com (unknown [127.0.0.1])
-> 	by xxx.com (Postfix) with ESMTP id 623F823FDE4;
-> 	Thu, 19 Feb 2009 15:56:58 -0800 (PST)
-> X-Original-To: huntads@xxx.com
-> Delivered-To: huntads@xxx.com
-> Received: from exchange.xxx.com (unknown [192.168.168.8])
-> 	by xxx.com (Postfix) with ESMTP id 4542723FDC5
-> 	for <huntads@xxx.com>; Thu, 19 Feb 2009 15:56:23 -0800 =
-(PST)
-> Received: from [192.168.168.219] ([192.168.168.219]) by =
-xxx.com
-> 	with Microsoft SMTPSVC(6.0.3790.1830);=20
-> 	Thu, 19 Feb 2009 15:57:06 -0800
-> User-Agent: Microsoft-Entourage/10.1.4.030702.0
-> Date: Thu, 19 Feb 2009 15:56:21 -0800
-> To: "Hunt Ads (New)" <huntads@xxx.com>
-> Message-ID: <C5C331A6.8C81%karlw@xxx.com>
-> Mime-version: 1.0
-> X-OriginalArrivalTime: 19 Feb 2009 23:57:07.0051 (UTC)
-> 	FILETIME=3D[C538D3B0:01C992ED]
-> From: Turners Huntads <huntads@xxx.com>
-> Subject: [Huntads] February 20 - February 26
-> X-BeenThere: huntads@xxx.com
-> X-Mailman-Version: 2.1.12rc2
-> Precedence: list
-> Reply-To: newsletter@xxx.com
-> List-Id: Turners Huntads <huntads.xxx.com>
-> List-Unsubscribe: =
-<mailto:huntads-request@xxx.com?subject=3Dunsubscribe>
-> List-Help: <mailto:huntads-request@xxx.com?subject=3Dhelp>
-> List-Subscribe: =
-<mailto:huntads-request@xxx.com?subject=3Dsubscribe>
-> Content-Type: multipart/mixed; =
-boundary=3D"=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D=
-"
-> Sender: huntads-bounces@xxx.com
-> Errors-To: huntads-bounces@xxx.com
-> X-Spam: [F=3D0.3170731707; B=3D0.500(0); S=3D0.200(2009020301); =
-MH=3D0.650(2009021931)]
-> X-MAIL-FROM: <huntads-bounces@xxx.com>
-> X-SOURCE-IP: [72.166.138.3]
-> X-SF-Loop: 1
->=20
-> > This message is in MIME format. Since your mail reader does not =
-understand
-> this format, some or all of this message may not be legible.
->=20
-> --=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0154225035=3D=3D
-> Content-type: multipart/related; boundary=3D"B_3317903782_1289380"
->=20
-> > This message is in MIME format. Since your mail reader does not =
-understand
+The first 50 lines of your original message follow:
+Message removed
 
diff --git a/tests/bounces/simple_36.txt b/tests/bounces/simple_36.txt
index 68d47cba..0974cd23 100644
--- a/tests/bounces/simple_36.txt
+++ b/tests/bounces/simple_36.txt
@@ -9,53 +9,16 @@ Date: Thu, 19 Feb 2009 16:19:28 -0800
 Message-ID: <633706571685360000@mx10.lttf.com>
 X-MS-Has-Attach: 
 X-MS-TNEF-Correlator: 
-From: <"System Administrator"@xxx.com>
-To: <huntads-bounces@xxx.com>
+From: <"System Administrator"@example.com>
+To: <huntads-bounces@example.com>
 
 
 Could not deliver message to the following recipient(s):
 
-Failed Recipient: garyt@xxx.com
-Reason: Remote host said: 550 unknown user <garyt@xxx.com>
+Failed Recipient: userx@example.com
+Reason: Remote host said: 550 unknown user <userx@example.com>
 
    -- The header and top 20 lines of the message follows --
 
-Received: from xxx.com [72.166.138.3] by mx10.lttf.com with =
-SMTP;
-   Thu, 19 Feb 2009 16:19:20 -0800
-Received: from localhost.xxx.com (unknown [127.0.0.1])
-	by xxx.com (Postfix) with ESMTP id A2E78240229
-	for <garyt@xxx.com>; Thu, 19 Feb 2009 16:19:22 -0800 =
-(PST)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=3D"us-ascii"
-Content-Transfer-Encoding: 7bit
-From: huntads-request@xxx.com
-To: garyt@xxx.com
-Subject: confirm 05a7bc89604da1745a562d4bed327490f5022bb2
-Message-ID: <mailman.45.1235089120.2581.huntads@xxx.com>
-Date: Thu, 19 Feb 2009 16:18:40 -0800
-Precedence: bulk
-X-BeenThere: huntads@xxx.com
-X-Mailman-Version: 2.1.12rc2
-List-Id: Turners Huntads <huntads.xxx.com>
-X-List-Administrivia: yes
-Sender: huntads-bounces@xxx.com
-Errors-To: huntads-bounces@xxx.com
-
-Your membership in the mailing list Huntads has been disabled due to
-excessive bounces The last bounce received from you was dated
-19-Feb-2009.  You will not get any more messages from this list until
-you re-enable your membership.  You will receive 2 more reminders like
-this before your membership in the list is deleted.
-
-To re-enable your membership, you can simply respond to this message
-(leaving the Subject: line intact).
-
-If you have any questions or problems, you can contact the list owner
-at
-
-    huntads-owner@xxx.com
-
-
+Message removed
 
diff --git a/tests/bounces/simple_37.txt b/tests/bounces/simple_37.txt
index 50cb0b28..22ec6d94 100644
--- a/tests/bounces/simple_37.txt
+++ b/tests/bounces/simple_37.txt
@@ -6,31 +6,28 @@ Content-Type: text/plain;
 Content-Transfer-Encoding: quoted-printable
 Subject: Returned mail - nameserver error report
 Date: Fri, 17 Jul 2009 16:05:22 -0700
-Message-ID: <200907172305.n6HN5Mn23080@mta1.service.uci.edu>
+Message-ID: <200907172305.n6HN5Mn23080@mta1.service.example.edu>
 X-MS-Has-Attach: 
 X-MS-TNEF-Correlator: 
-From: <MAILER-DAEMON@mta1.service.uci.edu>
+From: <MAILER-DAEMON@mta1.service.example.edu>
 To: <xxx-bounces@lists.xxx.com>
 
  --------Message not delivered to the following addresses:
 
-            user@uci.edu=20
+            user@example.edu=20
 
  --------Error Detail (phquery V3.0):
 
----- user@uci.edu=20
+---- user@example.edu=20
      Does not have a final email delivery point,
      please contact this person by alternate means.
 =20
        name: User Name
        alias: USER
 
-Please contact Postmaster@uci.edu if you have any questions.
+Please contact Postmaster@example.edu if you have any questions.
 
  --------Unsent Message below:
 
-Received: from mx2.service.uci.edu (mx2.service.uci.edu =
-[128.200.59.180])
-	by mta1.service.uci.edu (8.11.4-20030923/8.11.2) with ESMTP id =
-n6HN5Mi23070;
-	Fri, 17 Jul 2009 16:05:22 -0700 (PDT)
+Message removed
+
diff --git a/tests/bounces/simple_38.txt b/tests/bounces/simple_38.txt
index 224a55e2..dceac13a 100644
--- a/tests/bounces/simple_38.txt
+++ b/tests/bounces/simple_38.txt
@@ -28,43 +28,19 @@ Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 
-Your message to <prueba@domain.com> was automatically rejected:
+Your message to <userx@example.com> was automatically rejected:
 Quota exceeded
 --15778/mail
 Content-Type: message/disposition-notification
 
 Reporting-UA: mail; Dovecot Mail Delivery Agent
-Final-Recipient: rfc822; prueba@domain.com
+Final-Recipient: rfc822; userx@example.com
 Original-Message-ID: <2ee7df1322121930966bcc2318379726@localhost>
 Disposition: automatic-action/MDN-sent-automatically; deleted
 
 --15778/mail
 Content-Type: message/rfc822
 
-Return-Path: <user@domain.com>
-Delivered-To: prueba@domain.com
-Received: from localhost (localhost [127.0.0.1])
-	by mail.domain.com (Postfix) with ESMTP id 2DC8B586389;
-	Tue, 21 Dec 2010 14:05:58 -0600 (CST)
-X-Virus-Scanned: Debian amavisd-new at domain.com
-Received: from mail.domain.com ([127.0.0.1])
-	by localhost (mail.domain.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id XCn4+RhZPLzi; Tue, 21 Dec 2010 14:05:57 -0600 (CST)
-Received: from mail.domain.com (localhost [127.0.0.1])
-	(Authenticated sender: user@domain.com)
-	by mail.domain.com (Postfix) with ESMTPA id 25E7E58636E;
-	Tue, 21 Dec 2010 14:05:57 -0600 (CST)
-Received: from static5.domain.com ([5.5.5.5])
- by mail.domain.com
- with HTTP (HTTP/1.1 POST); Tue, 21 Dec 2010 14:05:57 -0600
-MIME-Version: 1.0
-Date: Tue, 21 Dec 2010 14:05:57 -0600
-From: <user@domain.com>
-To: <prueba@domain.com>
-Subject: Testing
-Message-ID: <2ee7df1322121930966bcc2318379726@localhost>
-X-Sender: user@domain.com
-
-
+Message removed
 
 --15778/mail--
diff --git a/tests/bounces/simple_39.txt b/tests/bounces/simple_39.txt
index 1b46ff92..b58ab681 100644
--- a/tests/bounces/simple_39.txt
+++ b/tests/bounces/simple_39.txt
@@ -14,7 +14,7 @@ Content-Transfer-Encoding: 8bit
 К сожалению, Ваше письмо не может быть доставлено одному или нескольким получателям, потому что:
 
   Message was not accepted -- invalid mailbox.
- Local mailbox foo@mail.ru is unavailable: user not found
+ Local mailbox userx@example.ru is unavailable: user not found
 
 **********************
 
@@ -22,11 +22,10 @@ A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
 
   Message was not accepted -- invalid mailbox.
- Local mailbox foo@mail.ru is unavailable: user not found
+ Local mailbox userx@example.ru is unavailable: user not found
 
 ------ This is a copy of your message, including all the headers.
 ------ No more than 1K characters of the body are included.
 
-Received: from mail by mx183.mail.ru with local (envelope-from <noreply@example.com>)
-	id 1TVzQE-0003tT-Co
-	for foo@mail.ru; Wed, 07 Nov 2012 10:47:34 +0400
+Message removed
+
diff --git a/tests/bounces/simple_41.txt b/tests/bounces/simple_41.txt
index 60cbe46c..abe4e43f 100644
--- a/tests/bounces/simple_41.txt
+++ b/tests/bounces/simple_41.txt
@@ -17,31 +17,11 @@ X-MailFrom: <>
 MailEnable: Message could not be delivered to some recipients.
 The following recipient(s) could not be reached:
 
-	Recipient: [SMTP:jeff.chan@intercitytime.com]
+	Recipient: [SMTP:userx@example.com]
 	Reason: Remote SMTP Server Returned: 550 Requested action not taken: mailbox unavailable or not local.
 
 
 Message headers follow:
 
-Received: with MailEnable Postoffice Connector; Tue, 14 Feb 2017 17:29:09 +0800
-Received: from mail.mailman3.org ([104.239.228.201]) by intercitytime.com with MailEnable ESMTP; Tue, 14 Feb 2017 17:29:08 +0800
-Received: from mailman.iad1.psf.io (ip6-localhost [127.0.0.1])
-	by mail.mailman3.org (Postfix) with ESMTP id 468CC80267
-	for <free-trial@intercitytime.com>; Tue, 14 Feb 2017 09:29:08 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailman3.org;
-	s=default; t=1487064548;
-	bh=aulHL7gMEucDw5WDL8d6/+CPIEzXORHWiObo1NS4HuE=;
-	h=Subject:From:To:Date;
-	b=uGQifVlhvVfe2PWe+A8qsiVzSXpFho30W6YE8OEIX5ql3vSxPQURW9rpD/GjVI0sR
-	 nt09YhHzwh0Df7NvwNMa6uHIZaGGOMSpWd2irIj+onwOi8di4yoFK4r/JQjBr4PZ7n
-	 v/X846uBX3c8rKnAg8h6qTSb6dI5xziORKlgh1B4=
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Subject: Your message to mailman-users@mailman3.org awaits moderator approval
-From: mailman-users-bounces@mailman3.org
-To: free-trial@intercitytime.com
-Message-ID: <20170214092907.10185.42474@mailman.iad1.psf.io>
-Date: Tue, 14 Feb 2017 09:29:07 +0000
-Precedence: bulk
-X-Mailman-Version: 3.1.0b4
+Message removed
+
diff --git a/tests/bounces/sina_01.txt b/tests/bounces/sina_01.txt
index 366500a9..2ffd4693 100644
--- a/tests/bounces/sina_01.txt
+++ b/tests/bounces/sina_01.txt
@@ -6,7 +6,7 @@ Received: from mx04.mrf.mail.rcn.net ([207.172.4.53] [207.172.4.53])
 Received: from milliways.osl.iu.edu ([129.79.245.239])
 	by mx04.mrf.mail.rcn.net with esmtp (Exim 3.35 #5)
 	id 16snGx-0005F0-00
-	for david.abrahams@rcn.com; Wed, 03 Apr 2002 11:06:07 -0500
+	for user@example.com; Wed, 03 Apr 2002 11:06:07 -0500
 Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
 	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33G61A24861;
 	Wed, 3 Apr 2002 11:06:01 -0500
@@ -49,9 +49,9 @@ sina.com.
 �ʼ��޷����͵���ָ���ĵ�ַ�С�
 ���ʼ���������������ⲿ���޷�����Ĵ������ʼ��޷��ʹ
 
-<boboman76@sina.com>:
+<userx@sina.com>:
 
-<alan_t18@sina.com>:
+<usery@sina.com>:
 
 --- �����е�������ԭ�ż���һ�ݿ���
 
@@ -62,67 +62,6 @@ Content-Transfer-Encoding: binary
 Content-Disposition: attachment;
  filename="original message.eml"
 
-Return-Path: <boost-admin@lists.boost.org>
-Received: (qmail 31910 invoked from network); 3 Apr 2002 15:42:31 -0000
-Received: from unknown (HELO milliways.osl.iu.edu) (129.79.245.239)
-  by 202.106.187.178 with SMTP; 3 Apr 2002 15:42:31 -0000
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33FaGA24120;
-	Wed, 3 Apr 2002 10:36:16 -0500
-Received: from hotmail.com (f128.law10.hotmail.com [64.4.15.128])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33FYUA24076
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 10:34:31 -0500
-Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
-	 Wed, 3 Apr 2002 07:34:23 -0800
-Received: from 194.100.118.234 by lw10fd.law10.hotmail.msn.com with HTTP;
-	Wed, 03 Apr 2002 15:34:23 GMT
-X-Originating-IP: [194.100.118.234]
-From: "Vesa Karvonen" <vesa_karvonen@hotmail.com>
-To: boost@lists.boost.org
-Subject: Re: [boost] [Type Traits] Patch for type_with_alignment 
-Mime-Version: 1.0
-Content-Type: text/plain; format=flowed
-Message-ID: <F128rzvsTDWWcuZcGwM00012d40@hotmail.com>
-X-OriginalArrivalTime: 03 Apr 2002 15:34:23.0543 (UTC) FILETIME=[07DF4470:01C1DB25]
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 03 Apr 2002 18:34:23 +0300
-
-Douglas Gregor:
->type_with_alignment<> is available in CVS.
-
-hmm... You are right, but it is in the compiler_supported_error_messages 
-branch. Is this intentional?
-
->I'm guessing we should also add aligned_storage somewhere, because I'm
->sure quite a few of us will use it:
-
-Good idea.
-
->Maybe this belongs in utility/aligned_storage.hpp?
-
-I have a feeling that something like this should probably go somewhere 
-closer to <memory> rather than <utility>.
-
-
-_________________________________________________________________
-Send and receive Hotmail on your mobile device: http://mobile.msn.com
-
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-
-
+Message removed
 
-------------101784934443375SINAEMAIL-----
\ No newline at end of file
+------------101784934443375SINAEMAIL-----
diff --git a/tests/bounces/smtp32_01.txt b/tests/bounces/smtp32_01.txt
index decf0ddc..17b81c42 100644
--- a/tests/bounces/smtp32_01.txt
+++ b/tests/bounces/smtp32_01.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Monday" "2" "April" "101" "04:20:10" "CST" "Postmaster" "postmaster@208.24.118.205" nil "48" "Undeliverable Mail" "^From:" nil nil "4" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: bwarsaw@wooz.org
-Received: from digicool.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
-	by mail.wooz.org (Postfix) with ESMTP id B42DFD3757
-	for <barry@wooz.org>; Mon,  2 Apr 2001 06:21:39 -0400 (EDT)
+Delivered-To: userw@example.org
+Received: from example.com (host15.digitalcreations.d.subnet.rcn.com [208.59.6.15])
+	by mail.example.org (Postfix) with ESMTP id B42DFD3757
+	for <usery@example.org>; Mon,  2 Apr 2001 06:21:39 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1746977; Mon, 02 Apr 2001 06:23:54 -0400
-Received: from ns2.digicool.com ([216.164.72.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1746976 for barry@mail.digicool.com; Mon, 02 Apr 2001 06:23:54 -0400
+Received: from ns2.example.com ([216.164.72.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1746976 for usery@mail.example.com; Mon, 02 Apr 2001 06:23:54 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id GAA19223
-	for <barry@digicool.com>; Mon, 2 Apr 2001 06:24:01 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id GAA19223
+	for <usery@example.com>; Mon, 2 Apr 2001 06:24:01 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 14k1VB-0006KC-00
-	for barry@digicool.com; Mon, 02 Apr 2001 06:24:01 -0400
+	for usery@example.com; Mon, 02 Apr 2001 06:24:01 -0400
 Received: from [207.51.255.218] (helo=208.24.118.205)
 	by mail.python.org with smtp (Exim 3.21 #1)
 	id 14k1UG-0006Ia-00
@@ -46,52 +46,10 @@ X-BeenThere: mailman-users@python.org
 X-Mailman-Version: 2.0.3 (101270)
 Reply-To: <postmaster@208.24.118.205>
 
-Delivery failed 20 attempts: oliver@pcworld.com.ph
+Delivery failed 20 attempts: userx@example.ph
 
 
 Original message follows.
 
-Received: from SMTP32-FWD by the-pentagon.com
-  (SMTP32) id A00000199; Sun,  1 Apr 101 09:53:32 CST
-Received: from mail.python.org [63.102.49.29] by 208.24.118.205 with ESMTP
-  (SMTPD32-6.00) id AEF8223011C; Sun, 01 Apr 2001 10:53:31 -0500
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14jk6B-0005u4-00; Sun, 01 Apr 2001 11:49:03 -0400
-Received: from [195.3.3.14] (helo=ibis.worldnet.net)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 14jk5s-0005t5-00
-	for mailman-users@python.org; Sun, 01 Apr 2001 11:48:45 -0400
-Received: from m3.worldnet.net (m2.worldnet.net [195.3.3.6])
-	by ibis.worldnet.net (8.11.3/8.11.1) with ESMTP id f31Fmgv23795
-	for <mailman-users@python.org>; Sun, 1 Apr 2001 17:48:42 +0200 (CEST)
-	(envelope-from bootc@worldnet.fr)
-Received: from [195.3.46.106] (i46-106.province.worldnet.fr [195.3.46.106])
-	by m3.worldnet.net (8.11.2/8.11.1) with ESMTP id f31FnIY00581
-	for <mailman-users@python.org>; Sun, 1 Apr 2001 17:49:18 +0200 (CEST)
-	(envelope-from bootc@worldnet.fr)
-User-Agent: Microsoft-Outlook-Express-Macintosh-Edition/5.02.2022
-Subject: Re: [Mailman-Users] List Info page showing wrong e-mail address
-From: Chris Boot <bootc@worldnet.fr>
-To: Mailman Users <mailman-users@python.org>
-Message-ID: <B6ED1A51.CD1E%bootc@worldnet.fr>
-In-Reply-To: <B6EC3825.CCB5%bootc@worldnet.fr>
-Mime-version: 1.0
-Content-type: text/plain; charset="US-ASCII"
-Content-transfer-encoding: 7bit
-Sender: mailman-users-admin@python.org
-Errors-To: mailman-users-admin@python.org
-X-BeenThere: mailman-users@python.org
-X-Mailman-Version: 2.0.3 (101270)
-Precedence: bulk
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Post: <mailto:mailman-users@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list management users <mailman-users.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=unsubscribe>
-
-[message truncated]
-
+Message removed
 
diff --git a/tests/bounces/smtp32_02.txt b/tests/bounces/smtp32_02.txt
index 3336a28d..5c7659a9 100644
--- a/tests/bounces/smtp32_02.txt
+++ b/tests/bounces/smtp32_02.txt
@@ -3,23 +3,23 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Tuesday" "29" "May" "2001" "20:19:37" "-0700" "Postmaster" "postmaster@launchpoint.net" nil "48" "Undeliverable Mail" "^From:" nil nil "5" nil nil nil nil nil]
 	nil)
 Return-Path: <python-list-admin@python.org>
-Delivered-To: barry@wooz.org
-Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id 5BA95D35D7
-	for <barry@wooz.org>; Tue, 29 May 2001 23:48:06 -0400 (EDT)
+Delivered-To: usery@example.org
+Received: from example.com (unknown [63.100.190.15])
+	by mail.example.org (Postfix) with ESMTP id 5BA95D35D7
+	for <usery@example.org>; Tue, 29 May 2001 23:48:06 -0400 (EDT)
 Received: from <python-list-admin@python.org>
-  by digicool.com (CommuniGate Pro RULES 3.4)
+  by example.com (CommuniGate Pro RULES 3.4)
   with RULES id 1993021; Tue, 29 May 2001 23:48:38 -0400
-Received: from ns2.digicool.com ([63.100.190.2] verified)
-  by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 1993014 for barry@mail.digicool.com; Tue, 29 May 2001 23:47:17 -0400
+Received: from ns2.example.com ([63.100.190.2] verified)
+  by example.com (CommuniGate Pro SMTP 3.4)
+  with ESMTP id 1993014 for usery@mail.example.com; Tue, 29 May 2001 23:47:17 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by ns2.digicool.com (8.9.3/8.9.3) with ESMTP id XAA05200
-	for <barry@digicool.com>; Tue, 29 May 2001 23:46:46 -0400
+	by ns2.example.com (8.9.3/8.9.3) with ESMTP id XAA05200
+	for <usery@example.com>; Tue, 29 May 2001 23:46:46 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 154wwZ-0007Jf-00
-	for barry@digicool.com; Tue, 29 May 2001 23:46:47 -0400
+	for usery@example.com; Tue, 29 May 2001 23:46:47 -0400
 Received: from [65.200.12.28] (helo=launchpoint.net)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 154wv7-0007H3-00
@@ -45,52 +45,11 @@ X-Mailer: <SMTP32 v20010131>
 X-BeenThere: python-list@python.org
 X-Mailman-Version: 2.0.5 (101270)
 
-Delivery failed 20 attempts: lists@mail.spicynoodles.com
+Delivery failed 20 attempts: userx@example.com
 
 
 Original message follows.
 
-Received: from mail.python.org [63.102.49.29] by launchpoint.net with ESMTP
-  (SMTPD32-6.06) id ACB127960212; Tue, 29 May 2001 09:22:09 -0700
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 154mEf-0002VG-00; Tue, 29 May 2001 12:20:45 -0400
-Received: from [194.109.0.100] (helo=centurion.xs4all.nl)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 154mDK-0002Te-00
-	for python-list@python.org; Tue, 29 May 2001 12:19:22 -0400
-Received: by centurion.xs4all.nl (Postfix, from userid 1000)
-	id 14716147; Tue, 29 May 2001 18:18:49 +0200 (CEST)
-From: Thomas Wouters <thomas@xs4all.net>
-To: Jim Abrams <jim@publishingresources.com>
-Cc: python-list@python.org
-Subject: Re: Active State and the PSF
-Message-ID: <20010529181849.U690@xs4all.nl>
-References: <mailman.991021781.12258.python-list@python.org> <Xns90B07596E1F35jimpublishingresourc@64.152.100.91>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.3.17i
-In-Reply-To: <Xns90B07596E1F35jimpublishingresourc@64.152.100.91>; from jim@publishingresources.com on Tue, May 29, 2001 at 03:43:08PM +0000
-Sender: python-list-admin@python.org
-Errors-To: python-list-admin@python.org
-X-BeenThere: python-list@python.org
-X-Mailman-Version: 2.0.5 (101270)
-Precedence: bulk
-List-Help: <mailto:python-list-request@python.org?subject=help>
-List-Post: <mailto:python-list@python.org>
-List-Subscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=subscribe>
-List-Id: General discussion list for the Python programming language <python-list.python.org>
-List-Unsubscribe: <http://mail.python.org/mailman/listinfo/python-list>,
-	<mailto:python-list-request@python.org?subject=unsubscribe>
-List-Archive: <http://mail.python.org/pipermail/python-list/>
-Date: Tue, 29 May 2001 18:18:49 +0200
-
-On Tue, May 29, 2001 at 03:43:08PM +0000, Jim Abrams wrote:
-
-> Forgive my lazyiness in not deciphering the GPL, but does the GPL put some 
-
-[message truncated]
+Message removed
 
 
diff --git a/tests/bounces/smtp32_03.txt b/tests/bounces/smtp32_03.txt
index 0c284afc..cb676472 100644
--- a/tests/bounces/smtp32_03.txt
+++ b/tests/bounces/smtp32_03.txt
@@ -3,19 +3,19 @@ X-VM-v5-Data: ([nil nil nil nil nil nil nil nil nil]
 	[nil "Wednesday" "1" "August" "2001" "12:02:47" "-0700" "Postmaster" "postmaster@mgw.xraymedia.com" nil "43" "Undeliverable Mail" "^From:" "mailman-users-admin@python.org" "mailman-users-admin@python.org" "8" nil nil nil nil nil]
 	nil)
 Return-Path: <mailman-users-admin@python.org>
-Delivered-To: barry@wooz.org
+Delivered-To: usery@example.org
 Received: from digicool.com (unknown [63.100.190.15])
-	by mail.wooz.org (Postfix) with ESMTP id 012AFD35F4
-	for <barry@wooz.org>; Wed,  1 Aug 2001 15:24:04 -0400 (EDT)
+	by mail.example.org (Postfix) with ESMTP id 012AFD35F4
+	for <usery@example.org>; Wed,  1 Aug 2001 15:24:04 -0400 (EDT)
 Received: from <mailman-users-admin@python.org>
   by digicool.com (CommuniGate Pro RULES 3.4)
   with RULES id 2461696; Wed, 01 Aug 2001 15:24:06 -0400
-Received: from smtp.zope.com ([63.100.190.10] verified)
+Received: from smtp.example.com ([63.100.190.10] verified)
   by digicool.com (CommuniGate Pro SMTP 3.4)
-  with ESMTP id 2461695 for barry@mail.zope.com; Wed, 01 Aug 2001 15:24:06 -0400
+  with ESMTP id 2461695 for usery@mail.example.com; Wed, 01 Aug 2001 15:24:06 -0400
 Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by smtp.zope.com (8.11.2/8.11.2) with ESMTP id f71JO6X18645
-	for <barry@zope.com>; Wed, 1 Aug 2001 15:24:06 -0400
+	by smtp.example.com (8.11.2/8.11.2) with ESMTP id f71JO6X18645
+	for <usery@example.com>; Wed, 1 Aug 2001 15:24:06 -0400
 Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
 	by mail.python.org with esmtp (Exim 3.21 #1)
 	id 15S1bB-0001XU-00; Wed, 01 Aug 2001 15:24:05 -0400
@@ -46,47 +46,11 @@ X-Mailer: <SMTP32 v20010525EVAL>
 X-BeenThere: mailman-users@python.org
 X-Mailman-Version: 2.0.6 (101270)
 
-undeliverable to borisk@gw.xraymedia.com
+undeliverable to userx@example.com
 
 
 Original message follows.
 
-Received: from mgw.xraymedia.com [209.17.153.132] by mgw.xraymedia.com with ESMTP
-  (SMTPD32-7.00 EVAL) id A2541501BA; Wed, 01 Aug 2001 12:02:47 -0700
-Received: from mgw.xraymedia.com [209.17.153.132] by mgw.xraymedia.com with ESMTP
-  (SMTPD32-7.00 EVAL) id A2534501B6; Wed, 01 Aug 2001 12:02:46 -0700
-Received: from mgw.xraymedia.com [209.17.153.132] by mgw.xraymedia.com with ESMTP
-  (SMTPD32-7.00 EVAL) id A24D3A01B6; Wed, 01 Aug 2001 12:02:46 -0700
-Received: from mgw.xraymedia.com [209.17.153.132] by mgw.xraymedia.com with ESMTP
-  (SMTPD32-7.00 EVAL) id A2533401B6; Wed, 01 Aug 2001 12:02:46 -0700
-Received: from hercules.xraymedia.com [64.69.69.18] by mgw.xraymedia.com with ESMTP
-  (SMTPD32-7.00 EVAL) id A2553201B6; Wed, 01 Aug 2001 12:02:45 -0700
-Received: from mail.python.org (mail.python.org [63.102.49.29])
-	by hercules.xraymedia.com (8.11.0/8.11.0) with ESMTP id f71IEQb00859
-	for <borisk@xraymedia.com>; Wed, 1 Aug 2001 11:14:26 -0700
-Received: from localhost.localdomain ([127.0.0.1] helo=mail.python.org)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 15S13G-0008Mi-00; Wed, 01 Aug 2001 14:49:02 -0400
-Received: from [24.201.245.36] (helo=VL-MS-MR002.sc1.videotron.ca)
-	by mail.python.org with esmtp (Exim 3.21 #1)
-	id 15S12G-0008IE-00
-	for mailman-users@python.org; Wed, 01 Aug 2001 14:48:00 -0400
-Received: from cthulhu.gerg.ca ([24.203.122.44]) by
-          VL-MS-MR002.sc1.videotron.ca (Netscape Messaging Server 4.15)
-          with ESMTP id GHEK7K02.QG7 for <mailman-users@python.org>; Wed,
-          1 Aug 2001 14:47:44 -0400 
-Received: from gward by cthulhu.gerg.ca with local (Exim 3.22 #1 (Debian))
-	id 15S11y-0000ip-00
-	for <mailman-users@python.org>; Wed, 01 Aug 2001 14:47:42 -0400
-To: mailman-users@python.org
-Subject: Re: [Mailman-Users] pls HELP!!!
-Message-ID: <20010801144742.B2759@mems-exchange.org>
-Mail-Followup-To: mailman-users@python.org
-References: <DPEEILMMKFNDFMKLPIMFEEFLCMAA.rimas@beritrans.com>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-[message truncated]
+Message removed
 
 
diff --git a/tests/bounces/smtp32_04.txt b/tests/bounces/smtp32_04.txt
index 813d956a..562e3912 100644
--- a/tests/bounces/smtp32_04.txt
+++ b/tests/bounces/smtp32_04.txt
@@ -1,47 +1,29 @@
 Date:     Tue, 24 Jan 2006 22:17:41 -0700
-Message-Id: <10601242217.AA12075059@mail.value.net>
+Message-Id: <10601242217.AA12075059@mail.example.net>
 Mime-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
-From:     "Postmaster" <postmaster@mail.value.net>
-Sender:   <postmaster@mail.value.net>
-To:       <msapiro@value.net>
+From:     "Postmaster" <postmaster@mail.example.net>
+Sender:   <postmaster@mail.example.net>
+To:       <msapiro@example.net>
 Subject:  Undeliverable Mail
 X-Mailer: <SMTP32 v8.15>
-X-RCPT-TO: <msapiro@value.net>
+X-RCPT-TO: <msapiro@example.net>
 Status: U
 X-UIDL: 430587558
 
-Unknown user: after_another@pacbell.net
+Unknown user: after_another@example.net
 
 RCPT TO generated following response:
-553 5.3.0 <after_another@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+553 5.3.0 <after_another@example.net>... Addressee unknown, relay=[205.208.202.10]
 
-Unknown user: one_bad_address@pacbell.net
+Unknown user: one_bad_address@example.net
 
 RCPT TO generated following response:
-553 5.3.0 <one_bad_address@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+553 5.3.0 <one_bad_address@example.net>... Addressee unknown, relay=[205.208.202.10]
 
 
 
 Original message follows.
 
-Received: from msapiro [209.182.169.133] by mail.value.net with ESMTP
-  (SMTPD32-8.15) id A9F448A600B8; Tue, 24 Jan 2006 22:17:40 -0700
-Message-ID: <PC174020060124211738020333d20271@msapiro>
-X-Mailer: Ultrafunk Popcorn 1.74 (11-May-2005)
-X-Priority: 3
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset=iso-8859-1
-Date: Tue, 24 Jan 2006 21:17:38 -0800
-From: Mark Sapiro <msapiro@value.net>
-To: one_bad_address@pacbell.net,
-	after_another@pacbell.net
-Subject: test
-Organization: Not Very Much
-
-
--- 
-Mark Sapiro <msapiro@value.net>       The highway is for gamblers,
-San Francisco Bay Area, California    better use your sense - B. Dylan
+Message removed
 
diff --git a/tests/bounces/smtp32_05.txt b/tests/bounces/smtp32_05.txt
index 92997ace..e14da3c5 100644
--- a/tests/bounces/smtp32_05.txt
+++ b/tests/bounces/smtp32_05.txt
@@ -15,49 +15,10 @@ X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Found to be clean
 X-Songbird-From: 
 
-undeliverable  to jmrpowersports@jmrpowersports.com
+undeliverable  to userx@example.com
 
 
 Original message follows.
 
-Received: from sb7.songbird.com [208.184.79.137] by jmrpowersports.com with ESMTP
-  (SMTPD32-8.05) id A6C88FC02BA; Sun, 05 Feb 2006 11:49:28 -0800
-Received: from sb7.songbird.com (sb7.songbird.com [127.0.0.1])
-	by sb7.songbird.com (8.12.11/8.12.11) with ESMTP id k15JHHfQ013340
-	for <fox@jmrpowersports.com>; Sun, 5 Feb 2006 11:17:17 -0800
-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: fox@jmrpowersports.com
-Message-ID: <mailman.6113.1139167036.1568.gpc-talk@grizz.org>
-Date: Sun, 05 Feb 2006 11:17:16 -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: Found to be clean
-X-Songbird-From: gpc-talk-bounces@grizz.org
-
-Your mail to 'GPC-talk' with the subject
-
-    Pre-approved Application #ZKQNJDJ328846
-
-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/4f1e0e8d37f7013e71ed860bd26ba7e39ba6df91
-
+Message removed
 
diff --git a/tests/bounces/smtp32_06.txt b/tests/bounces/smtp32_06.txt
index ec7cc952..242da4f6 100644
--- a/tests/bounces/smtp32_06.txt
+++ b/tests/bounces/smtp32_06.txt
@@ -11,31 +11,14 @@ X-RCPT-TO: <msapiro@value.net>
 Status: U
 X-UIDL: 430582473
 
-Unknown user: Absolute_garbage_addr@pacbell.net
+Unknown user: Absolute_garbage_addr@example.net
 
 RCPT TO generated following response:
-553 5.3.0 <Absolute_garbage_addr@pacbell.net>... Addressee unknown, relay=[205.208.202.10]
+553 5.3.0 <Absolute_garbage_addr@example.net>... Addressee unknown, relay=[205.208.202.10]
 
 
 
 Original message follows.
 
-Received: from msapiro [209.182.169.133] by mail.value.net with ESMTP
-  (SMTPD32-8.15) id A86C394C00A6; Fri, 18 Nov 2005 21:22:04 -0700
-Message-ID: <PC1740200511182022000562294774d2@msapiro>
-X-Mailer: Ultrafunk Popcorn 1.74 (11-May-2005)
-X-Priority: 3
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset=iso-8859-1
-Date: Fri, 18 Nov 2005 20:22:00 -0800
-From: Mark Sapiro <msapiro@value.net>
-To: Absolute_garbage_addr@pacbell.net
-Subject: Bounce test
-Organization: Not Very Much
-
-
--- 
-Mark Sapiro <msapiro@value.net>       The highway is for gamblers,
-San Francisco Bay Area, California    better use your sense - B. Dylan
+Message removed
 
diff --git a/tests/bounces/smtp32_07.txt b/tests/bounces/smtp32_07.txt
index 08167373..7ad1ee9b 100644
--- a/tests/bounces/smtp32_07.txt
+++ b/tests/bounces/smtp32_07.txt
@@ -20,62 +20,10 @@ X-SongbirdInformation: support@songbird.com for more information
 X-Songbird: Clean
 X-Songbird-From: 
 
-Invalid final delivery userid: info@husbyran.com
+Invalid final delivery userid: userx@example.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]
-
+Message removed
 
diff --git a/tests/bounces/yahoo_01.txt b/tests/bounces/yahoo_01.txt
index 0758957f..64551672 100644
--- a/tests/bounces/yahoo_01.txt
+++ b/tests/bounces/yahoo_01.txt
@@ -19,29 +19,11 @@ X-MDaemon-Deliver-To: bbbsss@turbosport.com
 Message from  yahoo.com.
 Unable to deliver message to the following address(es).
 
-<subscribe.motorcycles@listsociety.com>:
+<userx@example.com>:
 Sorry, I wasn't able to establish an SMTP connection. (#4.4.1)
 I'm not going to try again; this message has been in the queue too long.
 
 --- Original message follows.
 
-Return-Path: <aaaaa@yahoo.com>
-Received: from c58148.upc-c.chello.nl (HELO localhost) (212.187.58.148)
-  by smtp.mail.vip.sc5.yahoo.com with SMTP; 11 Feb 2001 01:15:27 -0000
-X-Apparently-From: <aaaaa?20@yahoo.com>
-X-Sender: aaaaa@yahoo.com
-From: Albert Ttttt <aaaaa@yahoo.com>
-To: subscribe.motorcycles@listsociety.com
-Date: Sun, 11 Feb 2001 02:14:40 +0100
-Subject: Subscribe
-Reply-To: aaaaa@yahoo.com
-MIME-Version: 1.0
-Content-Type: text/plain; charset=iso-8859-1
-Content-Transfer-Encoding: 7bit
-
-
-
-_________________________________________________________
-Do You Yahoo!?
-Get your free @yahoo.com address at http://mail.yahoo.com
+Message removed
 
diff --git a/tests/bounces/yahoo_02.txt b/tests/bounces/yahoo_02.txt
index 90d835dc..a43e2cf1 100644
--- a/tests/bounces/yahoo_02.txt
+++ b/tests/bounces/yahoo_02.txt
diff --git a/tests/bounces/yahoo_03.txt b/tests/bounces/yahoo_03.txt
index 9de32a43..80739a05 100644
--- a/tests/bounces/yahoo_03.txt
+++ b/tests/bounces/yahoo_03.txt
@@ -36,63 +36,10 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<cresus22@yahoo.com>:
-Sorry your message to cresus22@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userx@example.com>:
+Sorry your message to userx@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-X-Rocket-Spam: 129.79.245.239
-X-YahooFilteredBulk: 129.79.245.239
-X-Track: 111: 20
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta545.mail.yahoo.com with SMTP; 03 Apr 2002 06:09:04 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33D6PA21151;
-	Wed, 3 Apr 2002 08:06:25 -0500
-Received: from exchsrv.uttc-utc.com ([63.80.119.4])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33D42A21076
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 08:04:03 -0500
-Received: by EXCHSRV with Internet Mail Service (5.5.2653.19)
-	id <G9MVAA8Z>; Wed, 3 Apr 2002 08:03:59 -0500
-Message-ID: <2FE8C75C7A06D4118BB50008C7F7E83103D5DF@EXCHSRV>
-From: "Moore, Dave" <dmoore@ashtontechgroup.com>
-To: "'boost@lists.boost.org'" <boost@lists.boost.org>
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Subject: [boost] OT(?) Top Posting, Discussion Threads, and Outlook/Exchange
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 08:03:58 -0500
-
-Since the recent discussion-discussion, I just tried to reply the "right"
-way in "RE: [boost] Thread locals", only to see my efforts cheerfully
-ignored by the Mailing List archive.
-(http://lists.boost.org/MailArchives/boost/)
-
-I am stuck with Outlook 2000 + Exchange 5.5 here at work, but have some
-considerable pull with the Exchange Admin.  
-
-I notice that my replies have the "References:" field stripped off.  Any
-Boosters successfully using this email combination, preserving the
-references field?
+Message removed
 
-Thanks, and sorry for the noise.
-Dave
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
diff --git a/tests/bounces/yahoo_04.txt b/tests/bounces/yahoo_04.txt
index cf603636..2a0c32ae 100644
--- a/tests/bounces/yahoo_04.txt
+++ b/tests/bounces/yahoo_04.txt
@@ -36,115 +36,13 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<agarciamartiartu@yahoo.es>:
-Sorry, your message to agarciamartiartu@yahoo.es cannot be delivered.  This account is over quota.
+<userx@example.es>:
+Sorry, your message to userx@example.es cannot be delivered.  This account is over quota.
 
-<open00now@yahoo.co.uk>:
-Sorry, your message to open00now@yahoo.co.uk cannot be delivered.  This account is over quota.
+<usery@example.uk>:
+Sorry, your message to usery@example.uk cannot be delivered.  This account is over quota.
 
 --- Original message follows.
 
-X-Track: 0: 100
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta468.mail.yahoo.com with SMTP; 03 Apr 2002 06:44:13 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33EgcA22988;
-	Wed, 3 Apr 2002 09:42:38 -0500
-Received: from mail2.commerzbank.com (mail2.commerzbank.com [212.149.48.101])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33EciA22890
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 09:38:44 -0500
-Received: from sv016317.exchange.commerzbank.com (sendmail.commerzbank.com [172.16.71.150])
-	by mail2.commerzbank.com (Commerzbank Mail-System) with ESMTP id 38105116C
-	for <boost@lists.boost.org>; Wed,  3 Apr 2002 16:35:15 +0200 (CEST)
-Received: by sv016317.exchange.commerzbank.com with Internet Mail Service (5.5.2653.19)
-	id <2GBLGLD2>; Wed, 3 Apr 2002 16:37:33 +0200
-Message-ID: <CD3F0650BD65D31191BF0008C75D8DBD0300F66F@SV018443>
-From: "Hoeffner, Detlef" <Detlef.Hoeffner@partner.commerzbank.com>
-To: "'boost@lists.boost.org'" <boost@lists.boost.org>
-Subject: RE: [boost] Thread locals
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 16:37:41 +0200
-
-
-> As a substitute, try using the comparison operator for the boost::thread
-> class.  This can fill the gap in many (but not all) cases where you are
-> managing the set of threads yourself.
-
-I need this mainly for tracing purposes in spots where I have no knowledge 
-of the current instance of thread. This does not seem to help me in that
-case.
-
-> On some platforms (i.e. pthreads), the "thread_id" is actually an opaque
-> type (pthread_t) rather than a numeric value, and I think that is why no
-> such operation is exposed in the current version of the library.
-
-It is however possible to provide a class threadid, that has dependent on
-the
-platform different members but provides operations as ==, !=, 
-operator<<(ostream&, ), ... That would be fine to solve the problem.
-
-Regards
-
-Detlef
-
------Original Message-----
-From: Moore, Dave [mailto:dmoore@ashtontechgroup.com]
-Sent: Mittwoch, 3. April 2002 14:33
-To: 'boost@lists.boost.org'
-Subject: RE: [boost] Thread locals
-
-
-> -----Original Message-----
-> From: Hoeffner, Detlef 
-> [mailto:Detlef.Hoeffner@partner.commerzbank.com]
-> Sent: Wednesday, April 03, 2002 6:59 AM
-> To: 'boost@lists.boost.org'
-> Subject: [boost] Thread locals
-> 
-> 
-> Hello all,
-> 
-> I am replacing my thread abstraction with the thread package 
-> from boost. It
-> is very nice but I am missing two things. 
-> 
-> The first is the possibility to get an identifier for the 
-> current thread, a
-> thread id.
-
-As a substitute, try using the comparison operator for the boost::thread
-class.  This can fill the gap in many (but not all) cases where you are
-managing the set of threads yourself.
-
-On some platforms (i.e. pthreads), the "thread_id" is actually an opaque
-type (pthread_t) rather than a numeric value, and I think that is why no
-such operation is exposed in the current version of the library.
-
-Regards,
-Dave
-
+Message removed
 
-_______________________________________________
-Unsubscribe & other changes:
-http://lists.boost.org/mailman/listinfo.cgi/boost
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
diff --git a/tests/bounces/yahoo_05.txt b/tests/bounces/yahoo_05.txt
index 56d1a301..7e5a4326 100644
--- a/tests/bounces/yahoo_05.txt
+++ b/tests/bounces/yahoo_05.txt
@@ -36,115 +36,13 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<cresus22@yahoo.com>:
-Sorry your message to cresus22@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userx@example.com>:
+Sorry your message to userx@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<jjb700@yahoo.com>:
-Sorry your message to jjb700@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usery@example.com>:
+Sorry your message to usery@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-X-Track: 1: 40
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta414.mail.yahoo.com with SMTP; 03 Apr 2002 07:59:49 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33EduA22960;
-	Wed, 3 Apr 2002 09:39:56 -0500
-Received: from mail2.commerzbank.com (mail2.commerzbank.com [212.149.48.101])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33EciA22890
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 09:38:44 -0500
-Received: from sv016317.exchange.commerzbank.com (sendmail.commerzbank.com [172.16.71.150])
-	by mail2.commerzbank.com (Commerzbank Mail-System) with ESMTP id 38105116C
-	for <boost@lists.boost.org>; Wed,  3 Apr 2002 16:35:15 +0200 (CEST)
-Received: by sv016317.exchange.commerzbank.com with Internet Mail Service (5.5.2653.19)
-	id <2GBLGLD2>; Wed, 3 Apr 2002 16:37:33 +0200
-Message-ID: <CD3F0650BD65D31191BF0008C75D8DBD0300F66F@SV018443>
-From: "Hoeffner, Detlef" <Detlef.Hoeffner@partner.commerzbank.com>
-To: "'boost@lists.boost.org'" <boost@lists.boost.org>
-Subject: RE: [boost] Thread locals
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 16:37:41 +0200
-
-
-> As a substitute, try using the comparison operator for the boost::thread
-> class.  This can fill the gap in many (but not all) cases where you are
-> managing the set of threads yourself.
-
-I need this mainly for tracing purposes in spots where I have no knowledge 
-of the current instance of thread. This does not seem to help me in that
-case.
-
-> On some platforms (i.e. pthreads), the "thread_id" is actually an opaque
-> type (pthread_t) rather than a numeric value, and I think that is why no
-> such operation is exposed in the current version of the library.
-
-It is however possible to provide a class threadid, that has dependent on
-the
-platform different members but provides operations as ==, !=, 
-operator<<(ostream&, ), ... That would be fine to solve the problem.
-
-Regards
-
-Detlef
-
------Original Message-----
-From: Moore, Dave [mailto:dmoore@ashtontechgroup.com]
-Sent: Mittwoch, 3. April 2002 14:33
-To: 'boost@lists.boost.org'
-Subject: RE: [boost] Thread locals
-
-
-> -----Original Message-----
-> From: Hoeffner, Detlef 
-> [mailto:Detlef.Hoeffner@partner.commerzbank.com]
-> Sent: Wednesday, April 03, 2002 6:59 AM
-> To: 'boost@lists.boost.org'
-> Subject: [boost] Thread locals
-> 
-> 
-> Hello all,
-> 
-> I am replacing my thread abstraction with the thread package 
-> from boost. It
-> is very nice but I am missing two things. 
-> 
-> The first is the possibility to get an identifier for the 
-> current thread, a
-> thread id.
-
-As a substitute, try using the comparison operator for the boost::thread
-class.  This can fill the gap in many (but not all) cases where you are
-managing the set of threads yourself.
-
-On some platforms (i.e. pthreads), the "thread_id" is actually an opaque
-type (pthread_t) rather than a numeric value, and I think that is why no
-such operation is exposed in the current version of the library.
-
-Regards,
-Dave
-
+Message removed
 
-_______________________________________________
-Unsubscribe & other changes:
-http://lists.boost.org/mailman/listinfo.cgi/boost
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
diff --git a/tests/bounces/yahoo_06.txt b/tests/bounces/yahoo_06.txt
index 16c04fd6..19e9d996 100644
--- a/tests/bounces/yahoo_06.txt
+++ b/tests/bounces/yahoo_06.txt
@@ -36,70 +36,19 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<andrew_polevoy@yahoo.com>:
-Sorry your message to andrew_polevoy@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userx@example.com>:
+Sorry your message to userx@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<baruch_sterin@yahoo.com>:
-Sorry your message to baruch_sterin@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usery@example.com>:
+Sorry your message to usery@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<rjhoeks@yahoo.com>:
-Sorry your message to rjhoeks@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userz@example.com>:
+Sorry your message to userz@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<tritonrugger91@yahoo.com>:
-Sorry your message to tritonrugger91@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usera@example.com>:
+Sorry your message to usera@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-X-Track: 1: 40
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta593.mail.yahoo.com with SMTP; 03 Apr 2002 08:03:49 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33D6PA21151;
-	Wed, 3 Apr 2002 08:06:25 -0500
-Received: from exchsrv.uttc-utc.com ([63.80.119.4])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33D42A21076
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 08:04:03 -0500
-Received: by EXCHSRV with Internet Mail Service (5.5.2653.19)
-	id <G9MVAA8Z>; Wed, 3 Apr 2002 08:03:59 -0500
-Message-ID: <2FE8C75C7A06D4118BB50008C7F7E83103D5DF@EXCHSRV>
-From: "Moore, Dave" <dmoore@ashtontechgroup.com>
-To: "'boost@lists.boost.org'" <boost@lists.boost.org>
-MIME-Version: 1.0
-X-Mailer: Internet Mail Service (5.5.2653.19)
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Subject: [boost] OT(?) Top Posting, Discussion Threads, and Outlook/Exchange
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 08:03:58 -0500
-
-Since the recent discussion-discussion, I just tried to reply the "right"
-way in "RE: [boost] Thread locals", only to see my efforts cheerfully
-ignored by the Mailing List archive.
-(http://lists.boost.org/MailArchives/boost/)
-
-I am stuck with Outlook 2000 + Exchange 5.5 here at work, but have some
-considerable pull with the Exchange Admin.  
-
-I notice that my replies have the "References:" field stripped off.  Any
-Boosters successfully using this email combination, preserving the
-references field?
+Message removed
 
-Thanks, and sorry for the noise.
-Dave
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
diff --git a/tests/bounces/yahoo_07.txt b/tests/bounces/yahoo_07.txt
index 1f35e70f..94b3d9d3 100644
--- a/tests/bounces/yahoo_07.txt
+++ b/tests/bounces/yahoo_07.txt
@@ -36,77 +36,19 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<mark1960_1998@yahoo.com>:
-Sorry your message to mark1960_1998@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userw@example.com>:
+Sorry your message to userw@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<ovchenkov@yahoo.com>:
-Sorry your message to ovchenkov@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userx@example.com>:
+Sorry your message to userx@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<tsa412@yahoo.com>:
-Sorry your message to tsa412@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usery@example.com>:
+Sorry your message to usery@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<vaxheadroom@yahoo.com>:
-Sorry your message to vaxheadroom@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userz@example.com>:
+Sorry your message to userz@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-X-Track: 1: 40
-Return-Path: <boost-admin@lists.boost.org>
-Received: from 129.79.245.239  (EHLO milliways.osl.iu.edu) (129.79.245.239)
-  by mta532.mail.yahoo.com with SMTP; 03 Apr 2002 08:06:35 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33DItA21480;
-	Wed, 3 Apr 2002 08:18:55 -0500
-Received: from hotmail.com (f110.law10.hotmail.com [64.4.15.110])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33DH7A21450
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 08:17:07 -0500
-Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
-	 Wed, 3 Apr 2002 05:16:59 -0800
-Received: from 194.100.118.234 by lw10fd.law10.hotmail.msn.com with HTTP;
-	Wed, 03 Apr 2002 13:16:59 GMT
-X-Originating-IP: [194.100.118.234]
-From: "Vesa Karvonen" <vesa_karvonen@hotmail.com>
-To: boost@lists.boost.org
-Subject: Re: [boost] [Type Traits] Patch for type_with_alignment 
-Mime-Version: 1.0
-Content-Type: text/plain; format=flowed
-Message-ID: <F110iKiIcN3VknIDBoH00014513@hotmail.com>
-X-OriginalArrivalTime: 03 Apr 2002 13:16:59.0830 (UTC) FILETIME=[D63C7D60:01C1DB11]
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 03 Apr 2002 16:16:59 +0300
-
->On Fri, 29 Mar 2002, David Abrahams wrote:
->>Are you planning to apply this patch?
->>
->>-Dave
->
->Yes, but I can't right now. I'll apply it tomorrow if it hasn't already
->been done.
->
->	Doug
-
-How is the patch coming up (or did I miss some post on this subject)?
-
-I'm also working on something that could use type_with_alignment<>.
-
-
-_________________________________________________________________
-Join the world�s largest e-mail service with MSN Hotmail. 
-http://www.hotmail.com
+Message removed
 
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
diff --git a/tests/bounces/yahoo_08.txt b/tests/bounces/yahoo_08.txt
index c531cef9..e3dfc6e1 100644
--- a/tests/bounces/yahoo_08.txt
+++ b/tests/bounces/yahoo_08.txt
@@ -36,94 +36,25 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<chatrathis@yahoo.com>:
-Sorry your message to chatrathis@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usera@example.com>:
+Sorry your message to usera@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<crownjules01@yahoo.com>:
-Sorry your message to crownjules01@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userb@example.com>:
+Sorry your message to userb@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<cwl_999@yahoo.com>:
-Sorry your message to cwl_999@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userc@example.com>:
+Sorry your message to userc@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<eichaiwiu@yahoo.com>:
-Sorry your message to eichaiwiu@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userd@example.com>:
+Sorry your message to userd@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<rjhoeks@yahoo.com>:
-Sorry your message to rjhoeks@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usere@example.com>:
+Sorry your message to usere@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<yuli_kolesnikov@yahoo.com>:
-Sorry your message to yuli_kolesnikov@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userf@example.com>:
+Sorry your message to userf@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-X-Track: 1: 40
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta551.mail.yahoo.com with SMTP; 03 Apr 2002 08:22:08 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33GJwA25252;
-	Wed, 3 Apr 2002 11:19:58 -0500
-Received: from mailout6-0.nyroc.rr.com (mailout6-0.nyroc.rr.com [24.92.226.125])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33GInA25230
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 11:18:49 -0500
-Received: from there (alb-66-24-181-181.nycap.rr.com [66.24.181.181])
-	by mailout6-0.nyroc.rr.com (8.11.6/Road Runner 1.12) with SMTP id g33GIko18895
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 11:18:46 -0500 (EST)
-Message-Id: <200204031618.g33GIko18895@mailout6-0.nyroc.rr.com>
-Content-Type: text/plain;
-  charset="iso-8859-1"
-From: Douglas Gregor <gregod@cs.rpi.edu>
-Organization: Rensselaer Polytechnic Institute
-To: boost@lists.boost.org
-Subject: Re: [boost] [Type Traits] Patch for type_with_alignment
-X-Mailer: KMail [version 1.3.2]
-References: <F128rzvsTDWWcuZcGwM00012d40@hotmail.com>
-In-Reply-To: <F128rzvsTDWWcuZcGwM00012d40@hotmail.com>
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-X-Reply-To: gregod@cs.rpi.edu
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 11:21:18 -0500
-
-On Wednesday 03 April 2002 10:34 am, you wrote:
-> Douglas Gregor:
-> >type_with_alignment<> is available in CVS.
->
-> hmm... You are right, but it is in the compiler_supported_error_messages
-> branch. Is this intentional?
-
-It was a rogue sticky tag... type_with_alignment<> is now on the CVS main 
-trunk, where it was supposed to be in the first place.
-
-> >I'm guessing we should also add aligned_storage somewhere, because I'm
-> >sure quite a few of us will use it:
->
-> Good idea.
->
-> >Maybe this belongs in utility/aligned_storage.hpp?
->
-> I have a feeling that something like this should probably go somewhere
-> closer to <memory> rather than <utility>.
-
-<boost/memory.hpp>? I'd really like to have more than 6 lines in it, but we 
-can do that. That'd probably be a good place for the small-string 
-optimization allocator as well.
-
-	Doug
-_______________________________________________
-Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
-.
+Message removed
 
diff --git a/tests/bounces/yahoo_09.txt b/tests/bounces/yahoo_09.txt
index f8067a5b..b081e703 100644
--- a/tests/bounces/yahoo_09.txt
+++ b/tests/bounces/yahoo_09.txt
@@ -36,130 +36,13 @@ List-Archive: <http://lists.boost.org/MailArchives/boost/>
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<hankel_o_fung@yahoo.com>:
-Sorry your message to hankel_o_fung@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<userx@example.com>:
+Sorry your message to userx@example.com cannot be delivered. This account has been disabled or discontinued.
 
-<ultravirus2001@yahoo.com>:
-Sorry your message to ultravirus2001@yahoo.com cannot be delivered. This account has been disabled or discontinued.
+<usery@example.com>:
+Sorry your message to usery@example.com cannot be delivered. This account has been disabled or discontinued.
 
 --- Original message follows.
 
-The original message is over 5K. Message truncated.
+Message removed
 
-X-Track: 1: 100
-Return-Path: <boost-admin@lists.boost.org>
-Received: from milliways.osl.iu.edu (129.79.245.239)
-  by mta446.mail.yahoo.com with SMTP; 03 Apr 2002 10:59:57 -0800 (PST)
-Received: from milliways.osl.iu.edu (localhost [127.0.0.1])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with ESMTP id g33HexA27227;
-	Wed, 3 Apr 2002 12:40:59 -0500
-Received: from smtp016.mail.yahoo.com (smtp016.mail.yahoo.com [216.136.174.113])
-	by milliways.osl.iu.edu (8.11.6/8.11.6/IUCS_2.44) with SMTP id g33HcwA27186
-	for <boost@lists.boost.org>; Wed, 3 Apr 2002 12:38:58 -0500
-Received: from ppp-1-53.chel-5800-8.access.uk.tiscali.com (HELO albert) (RaoulGough@212.159.169.53 with login)
-  by smtp.mail.vip.sc5.yahoo.com with SMTP; 3 Apr 2002 17:38:54 -0000
-Message-ID: <001601c1db36$6da28950$0100a8c0@albert>
-From: "Raoul Gough" <RaoulGough@yahoo.co.uk>
-To: <boost@lists.boost.org>
-References: <200204011702.g31H2eA04494@milliways.osl.iu.edu>
-MIME-Version: 1.0
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Content-Transfer-Encoding: 7bit
-X-Priority: 3
-X-MSMail-Priority: Normal
-X-Mailer: Microsoft Outlook Express 6.00.2600.0000
-X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000
-Subject: [boost] Re: boost::weak_ptr suggestions
-Sender: boost-admin@lists.boost.org
-Errors-To: boost-admin@lists.boost.org
-X-BeenThere: boost@lists.boost.org
-X-Mailman-Version: 2.0.8
-Precedence: bulk
-Reply-To: boost@lists.boost.org
-List-Help: <mailto:boost-request@lists.boost.org?subject=help>
-List-Post: <mailto:boost@lists.boost.org>
-List-Subscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=subscribe>
-List-Id: Boost mailing list <boost.lists.boost.org>
-List-Unsubscribe: <http://lists.boost.org/mailman/listinfo.cgi/boost>,
-	<mailto:boost-request@lists.boost.org?subject=unsubscribe>
-List-Archive: <http://lists.boost.org/MailArchives/boost/>
-Date: Wed, 3 Apr 2002 18:37:55 +0100
-
-> From: "Peter Dimov" <pdimov@mmltd.net>
-> To: <boost@lists.boost.org>
-> Subject: Re: [boost] boost::weak_ptr suggestions
-> Date: Mon, 1 Apr 2002 17:31:05 +0300
-> Organization: Multi Media Ltd.
-> Reply-To: boost@lists.boost.org
->
-> From: "Raoul Gough" <RaoulGough@yahoo.co.uk>
-[snip]
-> > Secondly, I believe it would be better for the get() method to throw or
-> > assert when called on an invalidated pointer, instead of transparently
-> > returning 0. In my opinion, there is a fundamental difference between
-the
-> > two states (null and invalid) which is not observable with the current
-> > interface. The addition of a member function like "bool is_valid()
-const;"
-> > would also allow the user code to decide how to deal with an invalid
-> > pointer, instead of merging the two distinct states into the one (null)
-> > state.
->
-> Right again. However, the primary methods of accessing a weak_ptr are (1)
-> constructing a shared_ptr (which does throw) and (2) make_shared. get()
-has
-> been retained for efficiency but is not recommended (in multithreaded
-> programs.)
-
-So why the difference in error semantics between the single and
-multi-threaded idioms? For example, if I converted single-threaded code that
-uses get() to thread-safe code using make_shared, I also get changed
-semantics for the invalid pointer case.
-
-Incidentally, it looks like the use_count member function can determine
-indirectly whether the target still exists or not. It seems a bit obscure
-though, seeing as the reference count is really an implementation detail and
-distinct from the concept of null/valid/invalid.
-
->
-> > The big advantage of considering invalid.get() an error is that code
-which
-> > then works without error using weak_ptr would have *exactly* unchanged
-> > semantics using a plain pointer replacement. This allows (for example) a
-> > debug build/release build choice between weak_ptr<T> and T* for
-> performance
-> > reasons. If weak_ptr<T> silently returns null on invalid pointers, then
-> this
-> > guarantee cannot be made - what would be undefined use on a plain
-pointer
-> is
-> > not detected by the weak_ptr.
->
-> Interesting point. You can write your own get() that does what you want:
->
-> T * get(weak_ptr<T> const & p)
-> {
->     return shared_ptr<T>(p).get();
-> }
->
-> but it's not as efficient as a throwing get(). Most people seem to prefer
-> the current get() semantics, though, where 0 is returned.
-
-Well, I can understand that point of view as well - either the weak pointer
-has a valid target object or not (in which case null or deleted doesn't
-really matter). However, my use of a smart weak pointer is really as a
-debugging aid, so I would like the error to be detected as soon as possible
-(and distinguished from a null-pointer assertion or SEGV). Short of adding a
-policy class template parameter, it would be easy to add a new member
-function which does get() with severe checking - along the lines of
-vector.at versus vector.operator[]. Just an idea.
-
-BTW, am I right in thinking that sharede_ptr always maintains an extra weak
-reference counter? I mean, even if my code doesn't use weak_ptr, shared_ptr
-still has to maintain the extra counter, right? That, combined with the 
-*** MESSAGE TRUNCATED ***
-
-
-.
diff --git a/tests/bounces/yahoo_10.txt b/tests/bounces/yahoo_10.txt
index 958b9092..a2c97922 100644
--- a/tests/bounces/yahoo_10.txt
+++ b/tests/bounces/yahoo_10.txt
@@ -15,69 +15,16 @@ X-Songbird-From:
 Message from yahoo.com.
 Unable to deliver message to the following address(es).
 
-<jajcchoo@yahoo.com>:
-This user doesn't have a yahoo.com account (jajcchoo@yahoo.com) [0]
+<userx@example.com>:
+This user doesn't have a yahoo.com account (userx@example.com) [0]
 
-<lyons94706@yahoo.com>:
-Sorry your message to lyons94706@yahoo.com cannot be delivered. This account has been disabled or discontinued [#102].
+<usery@example.com>:
+Sorry your message to usery@example.com cannot be delivered. This account has been disabled or discontinued [#102].
 
-<turtle4jne@yahoo.com>:
-This user doesn't have a yahoo.com account (turtle4jne@yahoo.com) [0]
+<userz@example.com>:
+This user doesn't have a yahoo.com account (userz@example.com) [0]
 
 --- Original message follows.
 
-X-Originating-IP: [209.182.169.133]
-Return-Path: <century-announce-bounces@grizz.org>
-Authentication-Results: mta163.mail.re2.yahoo.com
-  from=grizz.org; domainkeys=neutral (no sig)
-Received: from 209.182.169.133  (EHLO localhost) (209.182.169.133)
-  by mta163.mail.re2.yahoo.com with SMTP; Wed, 01 Feb 2006 09:30:02 -0800
-Received: from localhost ([127.0.0.1] helo=[192.168.0.2])
-	by localhost with esmtp (Exim 4.52)
-	id IU0R6J-0002Y8-9G; Wed, 01 Feb 2006 09:27:55 -0800
-To: century-announce@grizz.org
-Date: Wed, 1 Feb 2006 09:27:00 -0800
-Message-ID: <PC1740200602010819360171d6899f4f@grizz.org>
-From: Grizzly Peak Century Announcements <century-announce@grizz.org>
-Subject: [GPC Century] GPC Century is May 7, 2006
-X-BeenThere: century-announce@grizz.org
-X-Mailman-Version: 2.1.7
-Precedence: list
-Reply-To: century@grizz.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Sender: century-announce-bounces@grizz.org
-Errors-To: century-announce-bounces@grizz.org
-
-Thank you for registering for the Grizzly Peak Century in 2005 - we'd
-like to see you again! Once again our favorite rolling feast takes
-place on the first Sunday in May - the 7th. We've tweaked the route a
-little bit, we're including a great GPC Water Bottle for each rider,
-and more. But we've still got the fantastic food, the beautiful Bay
-Area vistas, and a wonderful time. More information is available on
-our website at <http://www.GrizzlyPeakCyclists.org/century>.
-
-Registration opens on February 5, 2006. You can fill-out and print an
-application from our website, or you can register "instantly" for
-about 3 bucks through Active.com at
-<http://www.active.com/event_detail.cfm?event_id=1283704>. And if you
-really want a paper flyer, reply to this email with your address, and
-we'll mail you one.
-
-We hope to see you again!
-
-- Jeff Kurtock
-
-Century Chair
-
-_______________________________________________
-Century-Announce mailing list
-Grizzly Peak Century Announcements
-
-*** MESSAGE TRUNCATED ***
-
-
-.
-
+Message removed
 
diff --git a/tests/bounces/yale_01.txt b/tests/bounces/yale_01.txt
index 7be4754e..5669e2e5 100644
--- a/tests/bounces/yale_01.txt
+++ b/tests/bounces/yale_01.txt
@@ -37,7 +37,7 @@ X-Mailman-Version: 2.0
 
  --------Message not delivered to the following:
 
- thomas.dtankengine    No matches to nameserver query
+ userx    No matches to nameserver query
 
  --------Error Detail (phquery V4.1):
 
@@ -58,364 +58,7 @@ X-Mailman-Version: 2.0
 
  --------Unsent Message below:
 
-Received: from mail.python.org ([63.102.49.30])
-	by mr2.its.yale.edu (8.8.8/8.8.8) with ESMTP id NAA14654
-	for <thomas.dtankengine@yale.edu>; Tue, 26 Dec 2000 13:26:17 -0500 (EST)
-Received: from ns1.zope.org (localhost.localdomain [127.0.0.1])
-	by mail.python.org (Postfix) with ESMTP
-	id 3DFEDE904; Tue, 26 Dec 2000 12:01:13 -0500 (EST)
-From: mailman-users-request@python.org
-Subject: Mailman-Users digest, Vol 1 #948 - 11 msgs
-Reply-To: mailman-users@python.org
-X-Mailer: Mailman v2.0
-MIME-version: 1.0
-Content-type: text/plain
-To: mailman-users@python.org
-Sender: mailman-users-admin@python.org
-Errors-To: mailman-users-admin@python.org
-X-BeenThere: mailman-users@python.org
-X-Mailman-Version: 2.0
-Precedence: bulk
-List-Help: <mailto:mailman-users-request@python.org?subject=help>
-List-Post: <mailto:mailman-users@python.org>
-List-Subscribe: <http://www.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=subscribe>
-List-Id: Mailman mailing list management users <mailman-users.python.org>
-List-Unsubscribe: <http://www.python.org/mailman/listinfo/mailman-users>,
-	<mailto:mailman-users-request@python.org?subject=unsubscribe>
-List-Archive: <http://www.python.org/pipermail/mailman-users/>
-Message-Id: <20001226170113.3DFEDE904@mail.python.org>
-Date: Tue, 26 Dec 2000 12:01:13 -0500 (EST)
-
-Send Mailman-Users mailing list submissions to
-	mailman-users@python.org
-
-To subscribe or unsubscribe via the World Wide Web, visit
-	http://www.python.org/mailman/listinfo/mailman-users
-or, via email, send a message with subject or body 'help' to
-	mailman-users-request@python.org
-
-You can reach the person managing the list at
-	mailman-users-admin@python.org
-
-When replying, please edit your Subject line so it is more specific
-than "Re: Contents of Mailman-Users digest..."
-
-
-Today's Topics:
-
-   1. Re: GID error (Bradley Leonard)
-   2. Password bug in Mailman 2.0 (Juan Eliseo Carrasco Diaz)
-   3. Re: Password bug in Mailman 2.0 (Bek Oberin)
-   4. Re: Password bug in Mailman 2.0 (Juan Eliseo Carrasco Diaz)
-   5. Re: Password bug in Mailman 2.0 (Bek Oberin)
-   6. Re: Is this a bug, or just because I called it from an
-       unpriveledged account? (Dan Mick)
-   7. Re: Re: Password bug in Mailman 2.0 (Dan Mick)
-   8. Mailman 2.0 with Python 2.0 (Leonard Jacobs)
-   9. Recovering/resetting a list admin password (Jim Trigg)
-  10. (no subject) (Michael Albert)
-
---__--__--
-
-Message: 1
-Date: Mon, 25 Dec 2000 14:05:42 -0500 (EST)
-Subject: Re: [Mailman-Users] GID error
-From: "Bradley Leonard" <bradley@stygianresearch.com>
-To: jaym@opensourcedirectory.com
-Cc: mailman-users@python.org
-Reply-To: bradley@stygianresearch.com
-
-If the rpm was compiled for RH 7 then its probably set to apache.  If not, 
-you need to find the src rpm and rebuild it using the --rebuilddb option.
-You'll need to pass in new options or change the spec file.
-
-Brad
-
-
-0> How would I set the GID for the cgi to execute. If I installed mailman
-> via rpm(on a slackware system)?
-> 
-> 
-> ------------------------------------------------------
-> Mailman-Users maillist  -  Mailman-Users@python.org
-> http://www.python.org/mailman/listinfo/mailman-users
-
-
--- 
-Bradley Leonard     (bradley@stygianresearch.com)
-Stygian Research    (http://stygianresearch.com)
-
-Life is simple.  We make it complicated.
-
-
-
-
---__--__--
-
-Message: 2
-Date: Mon, 25 Dec 2000 22:48:07 -0500
-From: Juan Eliseo Carrasco Diaz <eliseocd@teleline.es>
-To: mailman-users@python.org
-Subject: [Mailman-Users] Password bug in Mailman 2.0
-
- The Administrator name can be used as password to go into and change
-administrative and users options in theirs respective html pages.
-
- It's this a bug?
-
-
-
---__--__--
-
-Message: 3
-Date: Tue, 26 Dec 2000 11:49:21 +1100
-From: Bek Oberin <gossamer@tertius.net.au>
-To: Juan Eliseo Carrasco Diaz <eliseocd@teleline.es>
-Cc: mailman-users@python.org
-Subject: [Mailman-Users] Re: Password bug in Mailman 2.0
-
-Juan Eliseo Carrasco Diaz wrote:
->  The Administrator name can be used as password to go into and change
-> administrative and users options in theirs respective html pages.
-
-It's a feature.
-
-
-bekj
-
--- 
-: --Hacker-Neophile-Eclectic-Geek-Grrl-Queer-Disabled-Boychick--
-: gossamer@tertius.net.au   http://www.tertius.net.au/~gossamer/
-: Artificial Intelligence: the art of making computers that behave
-: like the ones in movies.  -- Bill Bulko
-
-
---__--__--
-
-Message: 4
-Date: Tue, 26 Dec 2000 01:21:42 -0500
-From: Juan Eliseo Carrasco Diaz <eliseocd@teleline.es>
-To: Bek Oberin <gossamer@tertius.net.au>
-Cc: mailman-users@python.org
-Subject: [Mailman-Users] Re: Password bug in Mailman 2.0
-
-Bek Oberin wrote:
-
-> Juan Eliseo Carrasco Diaz wrote:
-> >  The Administrator name can be used as password to go into and change
-> > administrative and users options in theirs respective html pages.
->
-> It's a feature.
->
-> bekj
->
-> --
-> : --Hacker-Neophile-Eclectic-Geek-Grrl-Queer-Disabled-Boychick--
-> : gossamer@tertius.net.au   http://www.tertius.net.au/~gossamer/
-> : Artificial Intelligence: the art of making computers that behave
-> : like the ones in movies.  -- Bill Bulko
-
-Ok, but It can be used by anyone, so a list member can modify the
-administrative options.
-
- If it's a feature, I don't understand it.
-
-
-
---__--__--
-
-Message: 5
-Date: Tue, 26 Dec 2000 12:23:42 +1100
-From: Bek Oberin <gossamer@tertius.net.au>
-To: Juan Eliseo Carrasco Diaz <eliseocd@teleline.es>
-Cc: mailman-users@python.org
-Subject: [Mailman-Users] Re: Password bug in Mailman 2.0
-
-Juan Eliseo Carrasco Diaz wrote:
-> Bek Oberin wrote:
-> > Juan Eliseo Carrasco Diaz wrote:
-> > >  The Administrator name can be used as password to go into and change
-> > > administrative and users options in theirs respective html pages.
-> > It's a feature.
-> Ok, but It can be used by anyone, so a list member can modify the
-> administrative options.
-
-Hang on, I mis-read that as "The Administrator password ...".
-Their -name-?  You mean their email address?  There isn't
-anywhere in mailman that their name is used ....
-
-bekj
-
--- 
-: --Hacker-Neophile-Eclectic-Geek-Grrl-Queer-Disabled-Boychick--
-: gossamer@tertius.net.au   http://www.tertius.net.au/~gossamer/
-: Uptime DSW's are the highest form of geek competition.
-: -- Mike Whitaker
-
-
---__--__--
-
-Message: 6
-Date: Mon, 25 Dec 2000 21:00:25 -0800
-From: Dan Mick <Dan.Mick@west.sun.com>
-To: scott-brown@home.com
-Cc: mailman-users@python.org
-Subject: Re: [Mailman-Users] Is this a bug, or just because I called it from an 
- unpriveledged account?
-
-
-
-> If it's trying to delete a lock file, it's no doubt due to the fact that it
-> (thought that it) created a lock file. Since no lock file is present... why
-> did it get as far as it did without producing an error?
-
-I believe the underlying code is trying to clean up any possibly pre-existing lock file
-as part of the "taking care" section when creating a list.  There's no known live lock 
-file for the list because the list is being created now, and this code is just a 
-prophylactic measure to try to make newlist more bulletproof.  The fact
-that you didn't have permission would be a fatal error for either creating or
-removing a lock, so dying if it happens is not unreasonable.
-
-It is a bit confusing, but it's part of trying to make the filesystem persistence
-less of a problem.
-
-
---__--__--
-
-Message: 7
-Date: Mon, 25 Dec 2000 21:06:48 -0800
-From: Dan Mick <Dan.Mick@west.sun.com>
-To: Juan Eliseo Carrasco Diaz <eliseocd@teleline.es>,
-	mailman-users@python.org
-Subject: Re: [Mailman-Users] Re: Password bug in Mailman 2.0
-
-
-
-Juan Eliseo Carrasco Diaz wrote:
-> 
-> Bek Oberin wrote:
-> 
-> > Juan Eliseo Carrasco Diaz wrote:
-> > >  The Administrator name can be used as password to go into and change
-> > > administrative and users options in theirs respective html pages.
-> >
-> > It's a feature.
-> >
-> > bekj
-> >
-> > --
-> > : --Hacker-Neophile-Eclectic-Geek-Grrl-Queer-Disabled-Boychick--
-> > : gossamer@tertius.net.au   http://www.tertius.net.au/~gossamer/
-> > : Artificial Intelligence: the art of making computers that behave
-> > : like the ones in movies.  -- Bill Bulko
-> 
-> Ok, but It can be used by anyone, so a list member can modify the
-> administrative options.
-
-??  You said, correctly, the administrator password can be used as password to go
-change users' options.  That's not at all true in the reverse; user passwords don't
-get you admin privileges.
-
-Think of the admin password like the "root" user password; you can do more with it.
-And the site password works for even more things (for admin privs on any list, 
-for example).
-
-
---__--__--
-
-Message: 8
-From: "Leonard Jacobs" <lj@mandala-designs.com>
-To: mailman-users@python.org
-Date: Tue, 26 Dec 2000 01:31:17 -0500
-Reply-To: lj@mandala-designs.com
-Subject: [Mailman-Users] Mailman 2.0 with Python 2.0
-
-Mailman seems to be continually retrying sending mail to hosts 
-which can't be resolved via the DNS.  Is this correct?
-
-Also why is it that Mailman seems to invoke sendmail in such a 
-way that it causes sendmail to return a failure on hostnames that 
-can't be resolved (presumably a temporary condition) rather than 
-just passing the message to sendmail and letting sendmail do all 
-the retries itself (which is how most mailers invoke sendmail).  I 
-imagine this must relate to the program's needing more detailed 
-info about the state of each message to be sent, but when you tie 
-this in with the default frequency of its retries, it's very strange.
-
-------------------
-   
-  Leonard Jacobs
-  www.mandala-designs.com
-  (508) 359-5473
-
-
-
---__--__--
-
-Message: 9
-Date: Tue, 26 Dec 2000 09:08:39 -0500
-To: mailman-users@python.org
-From: Jim Trigg <blaise@scadian.net>
-Subject: [Mailman-Users] Recovering/resetting a list admin password
-
-I lost the email giving me my list admin password for one list.  The site 
-admin claims that there is no way to either recover or reset that password, 
-and that I have to recreate the list.  Is that true, or can he use the site 
-admin password to get access to the list administrative page and reset the 
-password that way?  It looks to me from the documentation that he should be 
-able to.
-
-Thanks,
-Jim Trigg
-
-
-
---__--__--
-
-Message: 10
-From: "Michael Albert" <sysop@zmag.org>
-To: <mailman-users@python.org>
-Date: Tue, 26 Dec 2000 10:03:03 -0800
-Subject: [Mailman-Users] (no subject)
-
-There is a list about ethiopia maintained or adminstered or otherwise
-related to your operations.
-
-People are being added to this list without having any knowledge of it. They
-are given passwords they don't know. They cannot, therefore, remove
-themsleves. I am such a person.
-
-Perhaps this is ignorance, more likely a stupid but venal undertaking, At
-any rate, you should immediately shut down this list and inform those
-attempting to create it of proper procedures.
-
-Thank you.
-
-The list is
-
-Pol.ethiopia mailing list
-Pol.ethiopia@lists.sn.apc.org
-http://lists.sn.apc.org/mailman/listinfo/pol.ethiopia
-
-
-
-Michael Albert
-Z Magazine / ZNet
-sysop@zmag.org
-www.zmag.org
-
-
-
-
---__--__--
-
-------------------------------------------------------
-Mailman-Users maillist  -  Mailman-Users@python.org
-http://www.python.org/mailman/listinfo/mailman-users
-
-
-End of Mailman-Users Digest
+Message removed
 
  --------End of Unsent Message
 
diff --git a/tests/test_bounces.py b/tests/test_bounces.py
index 082e9a99..44db3b9b 100755
--- a/tests/test_bounces.py
+++ b/tests/test_bounces.py
@@ -36,54 +36,54 @@ class BounceTest(unittest.TestCase):
         ('Postfix', 'postfix_01.txt', ['xxxxx@local.ie']),
         ('Postfix', 'postfix_02.txt', ['yyyyy@digicool.com']),
         ('Postfix', 'postfix_03.txt', ['ttttt@ggggg.com']),
-        ('Postfix', 'postfix_04.txt', ['davidlowie@mail1.keftamail.com']),
-        ('Postfix', 'postfix_05.txt', ['bjelf@detectit.net']),
+        ('Postfix', 'postfix_04.txt', ['userx@mail1.example.com']),
+        ('Postfix', 'postfix_05.txt', ['userx@example.net']),
         # Exim bounces
-        ('Exim', 'exim_01.txt', ['delangen@its.tudelft.nl']),
+        ('Exim', 'exim_01.txt', ['userx@its.example.nl']),
         # SimpleMatch bounces
         ('SimpleMatch', 'sendmail_01.txt', ['zzzzz@shaft.coal.nl',
                                             'zzzzz@nfg.nl']),
-        ('SimpleMatch', 'simple_01.txt', ['bbbsss@turbosport.com']),
-        ('SimpleMatch', 'simple_02.txt', ['chris.ggggmmmm@usa.net']),
-        ('SimpleMatch', 'simple_04.txt', ['claird@starbase.neosoft.com']),
+        ('SimpleMatch', 'simple_01.txt', ['bbbsss@example.com']),
+        ('SimpleMatch', 'simple_02.txt', ['userx@example.net']),
+        ('SimpleMatch', 'simple_04.txt', ['userx@example.com']),
         ('SimpleMatch', 'newmailru_01.txt', ['zzzzz@newmail.ru']),
-        ('SimpleMatch', 'hotpop_01.txt', ['allensmithee@hotpop.com']),
-        ('SimpleMatch', 'microsoft_03.txt', ['midica@banknbr.com']),
-        ('SimpleMatch', 'simple_05.txt', ['rlosardo@sbcglobal.net']),
-        ('SimpleMatch', 'simple_06.txt', ['dlyle@hamiltonpacific.com']),
-        ('SimpleMatch', 'simple_07.txt', ['william.xxxx@sbcglobal.net']),
-        ('SimpleMatch', 'simple_08.txt', ['severin.XXX@t-online.de']),
-        ('SimpleMatch', 'simple_09.txt', ['RobotMail@auto-walther.de']),
-        ('SimpleMatch', 'simple_10.txt', ['sais@thehartford.com']),
-        ('SimpleMatch', 'simple_11.txt', ['carlosr73@hartfordlife.com']),
-        ('SimpleMatch', 'simple_12.txt', ['charrogar@rhine1.andrew.ac.jp']),
-        ('SimpleMatch', 'simple_13.txt', ['dycusibreix@ademe.fr']),
-        ('SimpleMatch', 'simple_14.txt', ['dump@dachamp.com',
-                                          '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', 'simple_29.txt', ['thilakayi_bing@landshire.com']),
-        ('SimpleMatch', 'simple_30.txt', ['wmnqicorpat@nqicorp.com']),
-        ('SimpleMatch', 'simple_31.txt', ['nmorel@actisce.fr']),
-        ('SimpleMatch', 'simple_32.txt', ['teteyn@agence-forbin.com']),
-        ('SimpleMatch', 'simple_33.txt', ['hmu@extralumin.com']),
-        ('SimpleMatch', 'simple_34.txt', ['roland@xxx.com']),
-        ('SimpleMatch', 'simple_36.txt', ['garyt@xxx.com']),
-        ('SimpleMatch', 'simple_37.txt', ['user@uci.edu']),
-        ('SimpleMatch', 'simple_38.txt', ['prueba@domain.com']),
-        ('SimpleMatch', 'simple_39.txt', ['foo@mail.ru']),
-        ('SimpleMatch', 'simple_41.txt', ['jeff.chan@intercitytime.com']),
-        ('SimpleMatch', 'bounce_02.txt', ['acinsp1@midsouth.rr.com']),
-        ('SimpleMatch', 'bounce_03.txt', ['james@jeborall.demon.co.uk']),
+        ('SimpleMatch', 'hotpop_01.txt', ['userx@example.com']),
+        ('SimpleMatch', 'microsoft_03.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_05.txt', ['userx@example.net']),
+        ('SimpleMatch', 'simple_06.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_07.txt', ['userx@example.net']),
+        ('SimpleMatch', 'simple_08.txt', ['userx@example.de']),
+        ('SimpleMatch', 'simple_09.txt', ['userx@example.de']),
+        ('SimpleMatch', 'simple_10.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_11.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_12.txt', ['userx@example.ac.jp']),
+        ('SimpleMatch', 'simple_13.txt', ['userx@example.fr']),
+        ('SimpleMatch', 'simple_14.txt', ['userx@example.com',
+                                          'usery@example.com']),
+        ('SimpleMatch', 'simple_15.txt', ['userx@example.be']),
+        ('SimpleMatch', 'simple_16.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_17.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_18.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_19.txt', ['userx@example.com.ar']),
+        ('SimpleMatch', 'simple_20.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_23.txt', ['userx@example.it']),
+        ('SimpleMatch', 'simple_24.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_25.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_26.txt', ['userx@example.it']),
+        ('SimpleMatch', 'simple_27.txt', ['userx@example.net.py']),
+        ('SimpleMatch', 'simple_29.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_30.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_31.txt', ['userx@example.fr']),
+        ('SimpleMatch', 'simple_32.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_33.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_34.txt', ['roland@example.com']),
+        ('SimpleMatch', 'simple_36.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_37.txt', ['user@example.edu']),
+        ('SimpleMatch', 'simple_38.txt', ['userx@example.com']),
+        ('SimpleMatch', 'simple_39.txt', ['userx@example.ru']),
+        ('SimpleMatch', 'simple_41.txt', ['userx@example.com']),
+        ('SimpleMatch', 'bounce_02.txt', ['userx@example.com']),
+        ('SimpleMatch', 'bounce_03.txt', ['userx@example.uk']),
         # SimpleWarning
         ('SimpleWarning', 'simple_03.txt', Stop),
         ('SimpleWarning', 'simple_21.txt', Stop),
@@ -92,90 +92,93 @@ class BounceTest(unittest.TestCase):
         ('SimpleWarning', 'simple_35.txt', Stop),
         ('SimpleWarning', 'simple_40.txt', Stop),
         # GroupWise
-        ('GroupWise', 'groupwise_01.txt', ['thoff@MAINEX1.ASU.EDU']),
+        ('GroupWise', 'groupwise_01.txt', ['userx@example.EDU']),
         # This one really sucks 'cause it's text/html.  Just make sure it
         # doesn't throw an exception, but we won't get any meaningful
         # addresses back from it.
         ('GroupWise', 'groupwise_02.txt', []),
         # Actually, it's from Exchange, and Exchange does recognize it
-        ('Exchange', 'groupwise_02.txt', ['omarmo@thebas.com']),
+        ('Exchange', 'groupwise_02.txt', ['userx@example.com']),
+        # Not a bounce but has confused groupwise
+        ('GroupWise', 'groupwise_03.txt', []),
         # Yale's own
-        ('Yale', 'yale_01.txt', ['thomas.dtankengine@cs.yale.edu',
-                                 'thomas.dtankengine@yale.edu']),
+        ('Yale', 'yale_01.txt', ['userx@cs.yale.edu',
+                                 'userx@yale.edu']),
         # DSN, i.e. RFC 1894
-        ('DSN', 'dsn_01.txt', ['JimmyMcEgypt@go.com']),
-        ('DSN', 'dsn_02.txt', ['zzzzz@zeus.hud.ac.uk']),
-        ('DSN', 'dsn_03.txt', ['ddd.kkk@advalvas.be']),
-        ('DSN', 'dsn_04.txt', ['max.haas@unibas.ch']),
+        ('DSN', 'dsn_01.txt', ['userx@example.com']),
+        ('DSN', 'dsn_02.txt', ['zzzzz@example.uk']),
+        ('DSN', 'dsn_03.txt', ['userx@example.be']),
+        ('DSN', 'dsn_04.txt', ['userx@example.ch']),
         ('DSN', 'dsn_05.txt', Stop),
         ('DSN', 'dsn_06.txt', Stop),
         ('DSN', 'dsn_07.txt', Stop),
         ('DSN', 'dsn_08.txt', Stop),
-        ('DSN', 'dsn_09.txt', ['pr@allen-heath.com']),
+        ('DSN', 'dsn_09.txt', ['userx@example.com']),
         ('DSN', 'dsn_10.txt', ['anne.person@dom.ain']),
         ('DSN', 'dsn_11.txt', ['joem@example.com']),
-        ('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']),
-        ('DSN', 'dsn_16.txt', ['hishealinghand@pastors.com']),
+        ('DSN', 'dsn_12.txt', ['userx@example.jp']),
+        ('DSN', 'dsn_13.txt', ['userx@example.com']),
+        ('DSN', 'dsn_14.txt', ['userx@example.com.dk']),
+        ('DSN', 'dsn_15.txt', ['userx@example.com']),
+        ('DSN', 'dsn_16.txt', ['userx@example.com']),
         ('DSN', 'dsn_17.txt', Stop),
         # Microsoft Exchange
-        ('Exchange', 'microsoft_01.txt', ['DJBENNETT@IKON.COM']),
-        ('Exchange', 'microsoft_02.txt', ['MDMOORE@BALL.COM']),
+        ('Exchange', 'microsoft_01.txt', ['userx@example.COM']),
+        ('Exchange', 'microsoft_02.txt', ['userx@example.COM']),
         # SMTP32
-        ('SMTP32', 'smtp32_01.txt', ['oliver@pcworld.com.ph']),
-        ('SMTP32', 'smtp32_02.txt', ['lists@mail.spicynoodles.com']),
-        ('SMTP32', 'smtp32_03.txt', ['borisk@gw.xraymedia.com']),
-        ('SMTP32', 'smtp32_04.txt', ['after_another@pacbell.net',
-                                     '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']),
+        ('SMTP32', 'smtp32_01.txt', ['userx@example.ph']),
+        ('SMTP32', 'smtp32_02.txt', ['userx@example.com']),
+        ('SMTP32', 'smtp32_03.txt', ['userx@example.com']),
+        ('SMTP32', 'smtp32_04.txt', ['after_another@example.net',
+                                     'one_bad_address@example.net']),
+        ('SMTP32', 'smtp32_05.txt', ['userx@example.com']),
+        ('SMTP32', 'smtp32_06.txt', ['Absolute_garbage_addr@example.net']),
+        ('SMTP32', 'smtp32_07.txt', ['userx@example.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']),
+        ('Qmail', 'qmail_01.txt', ['userx@example.de']),
+        ('Qmail', 'qmail_02.txt', ['userx@example.com']),
+        ('Qmail', 'qmail_03.txt', ['userx@example.jp']),
+        ('Qmail', 'qmail_04.txt', ['userx@example.au']),
+        ('Qmail', 'qmail_05.txt', ['userx@example.com']),
         ('Qmail', 'qmail_06.txt', ['ntl@xxx.com']),
         ('Qmail', 'qmail_07.txt', ['user@example.net']),
         ('Qmail', 'qmail_08.txt', []),
         # LLNL's custom Sendmail
-        ('LLNL', 'llnl_01.txt', ['trotts1@llnl.gov']),
+        ('LLNL', 'llnl_01.txt', ['user1@example.gov']),
         # Netscape's server...
         ('Netscape', 'netscape_01.txt', ['aaaaa@corel.com',
                                          'bbbbb@corel.com']),
         # Yahoo's proprietary format
-        ('Yahoo', 'yahoo_01.txt', ['subscribe.motorcycles@listsociety.com']),
-        ('Yahoo', 'yahoo_02.txt', ['agarciamartiartu@yahoo.es']),
-        ('Yahoo', 'yahoo_03.txt', ['cresus22@yahoo.com']),
-        ('Yahoo', 'yahoo_04.txt', ['agarciamartiartu@yahoo.es',
-                                   'open00now@yahoo.co.uk']),
-        ('Yahoo', 'yahoo_05.txt', ['cresus22@yahoo.com',
-                                   'jjb700@yahoo.com']),
-        ('Yahoo', 'yahoo_06.txt', ['andrew_polevoy@yahoo.com',
-                                   'baruch_sterin@yahoo.com',
-                                   'rjhoeks@yahoo.com',
-                                   'tritonrugger91@yahoo.com']),
-        ('Yahoo', 'yahoo_07.txt', ['mark1960_1998@yahoo.com',
-                                   'ovchenkov@yahoo.com',
-                                   'tsa412@yahoo.com',
-                                   'vaxheadroom@yahoo.com']),
-        ('Yahoo', 'yahoo_08.txt', ['chatrathis@yahoo.com',
-                                   'crownjules01@yahoo.com',
-                                   'cwl_999@yahoo.com',
-                                   'eichaiwiu@yahoo.com',
-                                   'rjhoeks@yahoo.com',
-                                   'yuli_kolesnikov@yahoo.com']),
-        ('Yahoo', 'yahoo_09.txt', ['hankel_o_fung@yahoo.com',
-                                   'ultravirus2001@yahoo.com']),
-        ('Yahoo', 'yahoo_10.txt', ['jajcchoo@yahoo.com',
-                                   'lyons94706@yahoo.com',
-                                   'turtle4jne@yahoo.com']),
+        ('Yahoo', 'yahoo_01.txt', ['userx@example.com']),
+        ('Yahoo', 'yahoo_02.txt', ['userx@example.es']),
+        ('Yahoo', 'yahoo_03.txt', ['userx@example.com']),
+        ('Yahoo', 'yahoo_04.txt', ['userx@example.es',
+                                   'usery@example.uk']),
+        ('Yahoo', 'yahoo_05.txt', ['userx@example.com',
+                                   'usery@example.com']),
+        ('Yahoo', 'yahoo_06.txt', ['userx@example.com',
+                                   'usery@example.com',
+                                   'userz@example.com',
+                                   'usera@example.com']),
+        ('Yahoo', 'yahoo_07.txt', ['userw@example.com',
+                                   'userx@example.com',
+                                   'usery@example.com',
+                                   'userz@example.com']),
+        ('Yahoo', 'yahoo_08.txt', ['usera@example.com',
+                                   'userb@example.com',
+                                   'userc@example.com',
+                                   'userd@example.com',
+                                   'usere@example.com',
+                                   'userf@example.com']),
+        ('Yahoo', 'yahoo_09.txt', ['userx@example.com',
+                                   'usery@example.com']),
+        ('Yahoo', 'yahoo_10.txt', ['userx@example.com',
+                                   'usery@example.com',
+                                   'userz@example.com']),
         ('Yahoo', 'yahoo_11.txt', ['bad_user@aol.com']),
         # sina.com appears to use their own weird SINAEMAIL MTA
-        ('Sina', 'sina_01.txt', ['boboman76@sina.com', 'alan_t18@sina.com']),
+        ('Sina', 'sina_01.txt', ['userx@sina.com',
+                                 'usery@sina.com']),
         ('AOL', 'aol_01.txt', ['screenname@aol.com']),
         # No address can be detected in these...
         # dumbass_01.txt - We love Microsoft. :(