hosts_require_helo

49 files changed, 135 insertions, 95 deletions

diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index cde2b58c5..5494e4bda 100644
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -2,7 +2,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name;
@@ -13,7 +14,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 12
+X-message-linecount: 13
 X-received-count: 1
 
 This is a test message.
@@ -24,7 +25,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaY-0005vi-00
 	for CALLER@the.local.host.name;
@@ -36,7 +38,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 11
+X-message-linecount: 12
 X-received-count: 1
 
 This is a second test message.
@@ -45,7 +47,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaZ-0005vi-00
 	for CALLER@the.local.host.name;
@@ -58,7 +61,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 12
+X-message-linecount: 13
 X-received-count: 1
 
 This is a third test message.
diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index da5322b29..8fd4eacf7 100644
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbF-0005vi-00
diff --git a/test/mail/0023.cond--1 b/test/mail/0023.cond--1
index 334186fff..56557acc9 100644
--- a/test/mail/0023.cond--1
+++ b/test/mail/0023.cond--1
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbL-0005vi-00
diff --git a/test/mail/0023.cond-0 b/test/mail/0023.cond-0
index 8b99af1f9..39d3f9f3c 100644
--- a/test/mail/0023.cond-0
+++ b/test/mail/0023.cond-0
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbH-0005vi-00
diff --git a/test/mail/0023.cond-00 b/test/mail/0023.cond-00
index c84870654..793280ce8 100644
--- a/test/mail/0023.cond-00
+++ b/test/mail/0023.cond-00
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbI-0005vi-00
diff --git a/test/mail/0023.cond-1 b/test/mail/0023.cond-1
index d5ebc3646..969427691 100644
--- a/test/mail/0023.cond-1
+++ b/test/mail/0023.cond-1
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbB-0005vi-00
diff --git a/test/mail/0023.cond-10 b/test/mail/0023.cond-10
index 7bc0533b7..9c6dd1d3c 100644
--- a/test/mail/0023.cond-10
+++ b/test/mail/0023.cond-10
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbC-0005vi-00
diff --git a/test/mail/0023.cond-false b/test/mail/0023.cond-false
index 05fdd3f5b..7be8d56c1 100644
--- a/test/mail/0023.cond-false
+++ b/test/mail/0023.cond-false
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbJ-0005vi-00
diff --git a/test/mail/0023.cond-no b/test/mail/0023.cond-no
index eb22c8e26..b28aa57ec 100644
--- a/test/mail/0023.cond-no
+++ b/test/mail/0023.cond-no
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbG-0005vi-00
diff --git a/test/mail/0023.cond-rhubarb b/test/mail/0023.cond-rhubarb
index 030ca9d6e..fd8c33cd2 100644
--- a/test/mail/0023.cond-rhubarb
+++ b/test/mail/0023.cond-rhubarb
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbE-0005vi-00
@@ -9,7 +9,7 @@ X-message-body-size: 0
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbM-0005vi-00
diff --git a/test/mail/0023.cond-true b/test/mail/0023.cond-true
index 7e8241495..46815502f 100644
--- a/test/mail/0023.cond-true
+++ b/test/mail/0023.cond-true
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbD-0005vi-00
diff --git a/test/mail/0023.cond-yes b/test/mail/0023.cond-yes
index 967ff7ce3..d20f426ca 100644
--- a/test/mail/0023.cond-yes
+++ b/test/mail/0023.cond-yes
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbA-0005vi-00
@@ -10,7 +10,7 @@ X-message-body-size: 0
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbK-0005vi-00
diff --git a/test/mail/0023.okbatch b/test/mail/0023.okbatch
index 700461cc7..710164287 100644
--- a/test/mail/0023.okbatch
+++ b/test/mail/0023.okbatch
@@ -2,7 +2,7 @@ From rcpttest@test.ex Tue Mar 02 09:44:33 1999
 Envelope-to: ok1@test.ex,
  ok2@test.ex,
  ok3@test.ex
-Received: from [56.56.58.58] (ident=CALLER)
+Received: from [56.56.58.58] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <rcpttest@test.ex>)
 	id 10HmbN-0005vi-00;
diff --git a/test/mail/0023.userx b/test/mail/0023.userx
index 02a958b00..b95124b54 100644
--- a/test/mail/0023.userx
+++ b/test/mail/0023.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
@@ -12,7 +12,7 @@ X-message-body-size: 28
 Test without verify sender.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [55.55.55.55] (ident=CALLER)
+Received: from [55.55.55.55] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaZ-0005vi-00
diff --git a/test/mail/0023.userx-vs b/test/mail/0023.userx-vs
index d5e8cd1ed..ffd2ef878 100644
--- a/test/mail/0023.userx-vs
+++ b/test/mail/0023.userx-vs
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
diff --git a/test/mail/0024.postmaster b/test/mail/0024.postmaster
index ea1c5d5d4..cba2de24b 100644
--- a/test/mail/0024.postmaster
+++ b/test/mail/0024.postmaster
@@ -1,5 +1,5 @@
 From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
@@ -9,7 +9,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 1
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00;
@@ -18,7 +18,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbA-0005vi-00
@@ -28,7 +28,7 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
 Message 4
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbB-0005vi-00;
diff --git a/test/mail/0024.userx b/test/mail/0024.userx
index d4b2247a3..519bd3f6c 100644
--- a/test/mail/0024.userx
+++ b/test/mail/0024.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00;
@@ -8,7 +8,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbB-0005vi-00;
diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index a845d2ddd..b1fa7dcf8 100644
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00;
 	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 21b9abc15..2560fd0da 100644
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -1,5 +1,6 @@
 From x@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbF-0005vi-00
 	for userx@test.ex;
@@ -12,7 +13,8 @@ X-warning: this is a test warning
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbG-0005vi-00
 	for userx@test.ex;
@@ -27,7 +29,8 @@ X-warning: this is a test warning
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for userx@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index cb34feac9..059429e43 100644
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -62,7 +62,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbB-0005vi-00
 	for userx@test.ex;
@@ -141,7 +142,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbG-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index bcc824b53..a68883047 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -66,7 +66,8 @@ From userx@cus.cam.ac.uk Tue Mar 02 09:44:33 1999
 Return-path: <userx@cus.cam.ac.uk>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	id 10HmbB-0005vi-00
 	for userx@test.ex;
@@ -161,7 +162,8 @@ From userx@somehost.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <userx@somehost.test.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <userx@somehost.test.ex>)
 	id 10HmbH-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7587d5f48..b60764ea5 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -31,7 +31,8 @@ From postmaster@exim.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@exim.test.ex;
diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index 122fc97eb..dd97d4c61 100644
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=root)
+Received: from [V4NET.11.12.13] (helo=test ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ host_lookup_deferred: 0
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [99.99.99.99] (ident=root)
+Received: from [99.99.99.99] (helo=test ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
@@ -23,7 +23,7 @@ host_lookup_deferred: 1
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [V4NET.99.99.96] (ident=root)
+Received: from [V4NET.99.99.96] (helo=test ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaZ-0005vi-00
diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 0f5f1860c..65393eae9 100644
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -66,7 +66,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbB-0005vi-00
 	for userx@test.ex;
@@ -146,7 +147,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbG-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 2fb7c1551..2a978a7fd 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -43,7 +43,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <abcd@x.y.z>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
 	id 10HmaX-0005vi-00;
 	Tue, 2 Mar 1999 09:44:33 +0000
@@ -100,7 +101,8 @@ Status: 5.0.0
 Content-type: text/rfc822-headers
 
 Return-path: <abcd@x.y.z>
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
 	id 10HmbA-0005vi-00;
 	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 164beddda..d5251f7c4 100644
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -16,7 +16,8 @@ MAIL FROM:<doesn't@matter>
 RCPT TO:<x@copy.domain>
 RCPT TO:<y@copy.domain>
 DATA
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <doesn't@matter>)
 	id 10HmaY-0005vi-00;
 	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index 3d5baab14..9d1ba77a5 100644
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -1,5 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex;
@@ -14,7 +15,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 This line follows ..
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 4b893ffcd..e8662a624 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -23,7 +23,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <foo@bar>)
 	id 10HmbA-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index 35f5435f1..1387ea357 100644
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -21,7 +21,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0230.x b/test/mail/0230.x
index bef6df0d0..02272d375 100644
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -1,5 +1,5 @@
 From x@y.x Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4] (port=1113)
+Received: from [ip4.ip4.ip4.ip4] (port=1113 helo=test)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaY-0005vi-00
@@ -9,7 +9,7 @@ Port: 1113
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1] (port=1114)
+Received: from [127.0.0.1] (port=1114 helo=test)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaZ-0005vi-00
@@ -29,7 +29,7 @@ Port: 1115
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
-Received: from [V4NET.9.8.7] (port=1111 ident=root)
+Received: from [V4NET.9.8.7] (port=1111 helo=test ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaX-0005vi-00
diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 80a36c35a..6eab47653 100644
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -37,7 +37,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <"abc@def"@unknown.domain>)
 	id 10HmaZ-0005vi-00
 	for unknown@test.ex;
diff --git a/test/mail/0256.abcd+unknown.domain+"abc@def" b/test/mail/0256.abcd+unknown.domain+"abc@def"
index 80a36c35a..6eab47653 100644
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -37,7 +37,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <"abc@def"@unknown.domain>)
 	id 10HmaZ-0005vi-00
 	for unknown@test.ex;
diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 1cc37c54d..722707bce 100644
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -128,7 +128,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 Not: a header line
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
 	for userx@test.ex;
@@ -145,7 +146,8 @@ CR.CR
 terminate the message
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbG-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0386.2 b/test/mail/0386.2
index 79c2eea4a..fbfcae1fb 100644
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -1,5 +1,5 @@
 From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ X-Warning: This is a test blacklisting message
 Message 1
 
 From x@y Tue Mar 02 09:44:33 1999
-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 69b311ed1..f9dde9899 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -50,7 +50,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userx@test.ex;
@@ -63,7 +64,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for userx@test.ex;
@@ -76,7 +78,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for userx@test.ex;
@@ -89,7 +92,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0398.x b/test/mail/0398.x
index 081d38b6d..ac339e4f7 100644
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -1,5 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by mail.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for x@local;
diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 416fabca4..8e2ee546c 100644
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -14,7 +14,8 @@ X-Router: 3
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex;
diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index c0010e1a5..ded6dfb18 100644
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -1,6 +1,7 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 At-Start: some text
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for someone@el.se;
diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index e8882eb56..54e226623 100644
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -1,5 +1,6 @@
 From postmaster@y Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <postmaster@y>)
 	id 10HmaX-0005vi-00
 	for userx@y;
diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index 67462d318..b94223394 100644
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@dom.com;
diff --git a/test/mail/0517.usery b/test/mail/0517.usery
index 3afba6d55..3a2a64b93 100644
--- a/test/mail/0517.usery
+++ b/test/mail/0517.usery
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for usery@dom.com;
diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index 541141825..e0e7f97f4 100644
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -1,5 +1,6 @@
 From mailok@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <mailok@test.ex>)
 	id 10HmaX-0005vi-00
 	for rcptok@test.ex;
diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index 5c0c1854b..48d5f3cbe 100644
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -1,5 +1,6 @@
 From mailok@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <mailok@test.ex>)
 	id 10HmaX-0005vi-00
 	for rcptok@test.ex;
diff --git a/test/mail/0580.local b/test/mail/0580.local
index 9df481db9..16b65d2b7 100644
--- a/test/mail/0580.local
+++ b/test/mail/0580.local
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00;
 	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index 2cd5947d5..987765ebe 100644
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -2,7 +2,8 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name;
@@ -19,7 +20,7 @@ From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 18
+X-message-linecount: 19
 X-received-count: 1
 
 This is a test message.
@@ -30,7 +31,8 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaY-0005vi-00
 	for CALLER@the.local.host.name;
@@ -41,7 +43,7 @@ From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 10
+X-message-linecount: 11
 X-received-count: 1
 
 This is a second test message.
diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index cfc50295f..a0aa95620 100644
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -11,8 +11,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
 This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
-	by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
+	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index adeef5a8d..2203c8e2b 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,6 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
@@ -38,7 +38,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com
 This is a test encrypted message from a verified host.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
@@ -52,7 +52,7 @@ This is a test encrypted message.
 It should be sent under the RSA server cert and with an RSA cipher.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 13dcbf247..4cde37482 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,6 +1,6 @@
 From a@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <a@test.ex>)
 	id 10HmaX-0005vi-00
@@ -12,8 +12,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
 	id 10HmaY-0005vi-00
@@ -25,8 +25,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From b@test.ex Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
-	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <b@test.ex>)
 	id 10HmaZ-0005vi-00
@@ -38,8 +38,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 This is a test encrypted message from a verified host.
 
 From c@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-	by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <c@test.ex>)
 	id 10HmbA-0005vi-00
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 4e35082dc..abe23c5fb 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,5 +1,5 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
 	by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)