diff --git a/templates/header_checks.j2 b/templates/header_checks.j2
index 41b961e..318eb85 100644
--- a/templates/header_checks.j2
+++ b/templates/header_checks.j2
@@ -1,5 +1,4 @@
-/^Received:.*with ESMTPSA.*for (.*);/	REPLACE X-Received-For: $1
-/^Received:.*with ESMTPSA/      IGNORE
+/^Received:.*(by.*with ESMTPSA.*)$/	REPLACE Received: $1
 /^X-Originating-IP:/            IGNORE
 /^X-Mailer:/                    IGNORE
 /^User-Agent:/                  IGNORE