Add References: support to autoreply.

30 files changed, 405 insertions, 1 deletions

diff --git a/test/confs/0530 b/test/confs/0530
new file mode 100644
index 000000000..b7ad3ffd2
--- /dev/null
+++ b/test/confs/0530
@@ -0,0 +1,47 @@
+# Exim test configuration 0530
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept control = suppress_local_fixups
+
+
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = accept
+  senders = :
+  transport = t1
+
+r2:
+  driver = accept
+  transport = t2
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+t2:
+  driver = autoreply
+  to = $sender_address
+  subject = Re: $h_subject:
+  text = This is the text of the autoreply.
+  user = CALLER
+
+# End
diff --git a/test/log/0530 b/test/log/0530
new file mode 100644
index 000000000..7d6998071
--- /dev/null
+++ b/test/log/0530
@@ -0,0 +1,60 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbH-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbO-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbN-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbQ-0005vi-00 <= <> R=10HmbP-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbQ-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbP-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 936b3392f..29b1e9a95 100644
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -23,6 +23,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -57,6 +58,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 9578d31ea..8e33c3631 100644
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -21,6 +21,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index f2bd63922..36df01632 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -51,6 +51,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: CALLER@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
@@ -290,6 +291,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@the.local.host.name>
+References: <E10HmbQ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbR-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER
index 2b4143941..5199f679a 100644
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -52,6 +54,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -72,6 +75,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -100,6 +104,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@test.ex>
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
+References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 5875a0ed7..45eac6bfe 100644
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index b852afc49..667c73139 100644
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -7,6 +7,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -23,6 +24,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index 73e4e3a06..fb5be8ac1 100644
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -63,6 +63,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex,  abey seedy <abcd@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -94,6 +95,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex,   abcd@test.ex
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 825e700ab..7a5b5233c 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -49,6 +49,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER@exim.test.ex
diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 9a8c7ae3b..14156674a 100644
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -4,6 +4,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex
diff --git a/test/mail/0114.file b/test/mail/0114.file
index 330232063..a04c45d00 100644
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -15,6 +15,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: A. File <file@test.ex>, No One <null@test.ex>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index ae5cdfec8..e7882aa43 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: Reply Person <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 4ce6d8364..2fc9e36ea 100644
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -5,6 +5,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,6 +20,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -33,6 +35,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -47,6 +50,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -61,6 +65,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
+References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 731e0346c..6db0b20c3 100644
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -17,6 +18,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmbG-0005vi-00@myhost.test.ex>
+References: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index 10720d583..a932aa023 100644
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	for foo2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo2@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@myhost.test.ex>
+References: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 8c1cd0f5c..574730524 100644
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	for foo3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo3@test.ex
 In-Reply-To: <E10HmbD-0005vi-00@myhost.test.ex>
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 5875a0ed7..45eac6bfe 100644
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index ce0986b1e..6c0b1ff4e 100644
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -5,6 +5,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 To: postmaster@myhost.test.ex
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0243.CALLER b/test/mail/0243.CALLER
index f18e30689..11fc70884 100644
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -8,6 +8,7 @@ Reply-To: x@y,
 To: CALLER@nl.demon.net
 Subject: Re: 
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index ae6bd7cd5..8f9e5141b 100644
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@myhost.test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0404.sender b/test/mail/0404.sender
index 12f342da8..fd77af8fe 100644
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -3,6 +3,7 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index 280836aaa..61cee3e9d 100644
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -9,6 +9,7 @@ From: userx@test.ex
 To: someone@test.ex
 Subject: =?utf-8?Q?Auto=3A_?=
 In-Reply-To: <E10HmbL-0005vi-00@mail.test.ex>
+References: <E10HmbL-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 MIME-Version: 1.0
 Content-Type: text/plain;
diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 2d3947556..76b76de6b 100644
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -7,6 +7,7 @@ Reply-To: postmaster@test.ex
 To: CALLER@test.ex
 Subject: Submission of mail from CALLER@test.ex directly to the XXX hosts
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index 27ea508a1..298abf033 100644
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -5,6 +5,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 h1: the first added header
 h2: the second added header
diff --git a/test/mail/0494.userx b/test/mail/0494.userx
index 422d2150c..4379cb298 100644
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 To: userx@test.ex
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex
diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER
new file mode 100644
index 000000000..d07382180
--- /dev/null
+++ b/test/mail/0530.CALLER
@@ -0,0 +1,144 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmaY-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, no References, no In-Reply-to
+In-Reply-To: <m1@b>
+References: <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbA-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, no References, In-Reply-to
+In-Reply-To: <m1@b>
+References: <i1@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbC-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (1), In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbE-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (5), no In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbG-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (15), In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbI-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, no References, no In-Reply-to
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbK-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, no References, In-Reply-to
+References: <i1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbM-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (1), In-Reply-to
+References: <r1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbO-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (5), no In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	id 10HmbQ-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (15), In-Reply-to
+References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
diff --git a/test/scripts/0000-Basic/0530 b/test/scripts/0000-Basic/0530
new file mode 100644
index 000000000..6c57868ab
--- /dev/null
+++ b/test/scripts/0000-Basic/0530
@@ -0,0 +1,82 @@
+# autoreply and References: headers
+#
+exim -odi userx@test.ex
+Subject: Message-id, no References, no In-Reply-to
+Message-id: <m1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, no References, In-Reply-to
+Message-id: <m1@b>
+In-Reply-To: <i1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (1), In-Reply-to
+Message-id: <m1@b>
+References: <r1@b>
+In-Reply-To: <i1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (5), no In-Reply-to
+Message-id: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (15), In-Reply-to
+Message-id: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+            <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
+            <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
+In-Reply-To: <i1@b>
+****
+# In order not to have Exim create a Message-ID: header, we need to set
+# suppress_local_fixups, but the not-smtp ACL is too late. So we must use
+# an SMTP interface.
+#
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, no References, no In-Reply-to
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, no References, In-Reply-to
+In-Reply-To: <i1@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (1), In-Reply-to
+References: <r1@b>
+In-Reply-To: <i1@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (5), no In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (15), In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+            <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
+            <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
+In-Reply-To: <i1@b>
+.
+quit
+****
diff --git a/test/stderr/0404 b/test/stderr/0404
index ad1ec2e38..eacb762b5 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -246,6 +246,7 @@ search_tidyup called
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex,
 **** debug string too long - truncated ****
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 
 rewrite_one_header: type=T:
@@ -258,6 +259,7 @@ search_tidyup called
 T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.e
 **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+  References: <E10HmaX-0005vi-00@mail.test.ex>
   Auto-Submitted: auto-replied
 I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
@@ -291,7 +293,7 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=608
-body_linecount=1 message_linecount=8
+body_linecount=1 message_linecount=9
 Delivery address list:
   sender@test.ex 
   sender@test.ex 
diff --git a/test/stdout/0530 b/test/stdout/0530
new file mode 100644
index 000000000..1a39f693c
--- /dev/null
+++ b/test/stdout/0530
@@ -0,0 +1,30 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmbH-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmbJ-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmbL-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmbN-0005vi-00

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmbP-0005vi-00

+221 myhost.test.ex closing connection