diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7445e5e9f..9cd22ca4e 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -26385,3 +26385,11 @@ Apologies for any names omitted.
 	map type for this operation". This happened with all built-in
 	map types (static, cidr, etc.) that have no 'bulk create'
 	support. File: global/dynamicmaps.c.
+
+20220417
+
+	Bugfix (introduced: 20220406): reset the milter_header_checks
+	response buffer, so that a negative response for one email
+	message will not be applied to a later email message that is
+	handled by the same cleanup process. File:
+	cleanup/cleanup_milter.c.
diff --git a/postfix/src/cleanup/cleanup_milter.c b/postfix/src/cleanup/cleanup_milter.c
index 673b59c3c..11510b559 100644
--- a/postfix/src/cleanup/cleanup_milter.c
+++ b/postfix/src/cleanup/cleanup_milter.c
@@ -573,6 +573,7 @@ static void cleanup_milter_header_checks_reinit(CLEANUP_STATE *state)
     if (state->redirect)
 	myfree(state->redirect);
     state->redirect = 0;
+    VSTRING_RESET(cleanup_milter_hbc_reply);
 }
 
 /* cleanup_milter_hbc_finish - finalize post-Milter header checks */
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 265c54037..56e70f43d 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20220416"
+#define MAIL_RELEASE_DATE	"20220417"
 #define MAIL_VERSION_NUMBER	"3.8"
 
 #ifdef SNAPSHOT