X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/mail/0428.inbox.JUNK?ds=inline

diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK
index 6d83deb36..1c3ecba1a 100644
--- a/test/mail/0428.inbox.JUNK
+++ b/test/mail/0428.inbox.JUNK
@@ -1,80 +1,84 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@test.ex>
-Envelope-to: userx@test.ex
+Envelope-to: userx8@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@mail.test.ex>
+	id 10HmbG-000000005vi-0000
+	for userx8@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99
-Filter: require["fileinto","comparator-i;ascii-numeric"];
+Message-Id: <E10HmbG-000000005vi-0000@mail.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+	require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
-From: CALLER_NAME <CALLER@test.ex>
-
 Test 8
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@test.ex>
-Envelope-to: userx@test.ex
+Envelope-to: userx10@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbI-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@mail.test.ex>
+	id 10HmbI-000000005vi-0000
+	for userx10@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99-
-Filter: require["fileinto","comparator-i;ascii-numeric"];
+Message-Id: <E10HmbI-000000005vi-0000@mail.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+	require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
-From: CALLER_NAME <CALLER@test.ex>
-
 Test 10
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@test.ex>
-Envelope-to: userx@test.ex
+Envelope-to: userx11@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbJ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbJ-0005vi-00@mail.test.ex>
+	id 10HmbJ-000000005vi-0000
+	for userx11@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
-Filter: require["fileinto","comparator-i;ascii-numeric"];
+Message-Id: <E10HmbJ-000000005vi-0000@mail.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+	require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-99" {
           fileinto "inbox.JUNK";
           stop;
         }
-From: CALLER_NAME <CALLER@test.ex>
-
 Test 11
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@test.ex>
-Envelope-to: userx@test.ex
+Envelope-to: userx12@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbK-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbK-0005vi-00@mail.test.ex>
+	id 10HmbK-000000005vi-0000
+	for userx12@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
-Filter: require["fileinto","comparator-i;ascii-numeric"];
+Message-Id: <E10HmbK-000000005vi-0000@mail.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+	require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-98" {
           fileinto "inbox.JUNK";
           stop;
         }
-From: CALLER_NAME <CALLER@test.ex>
-
 Test 12