diff --git a/postfix/HISTORY b/postfix/HISTORY
index d8d34834f..3e6bca4a4 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7974,9 +7974,10 @@ Apologies for any names omitted.
 
 20030416
 
-	Bugfix: missing output flush when message content did not
-	end in newline while converting 8-bit to 7-bit mail.  File:
-	smtp/smtp_proto.c.
+	Bugfix: missing partial last line when 1) someone submits
+	8-bit mail not ending in newline via /usr/sbin/sendmail
+	and 2) MIME input processing is turned off, and 3) MIME
+	8bit->7bit conversion is requested upon delivery via SMTP.
 
 	Cleanup: auto-bcc recipients are now added in one place
 	(the cleanup server) instead of by individual front-end
@@ -8009,6 +8010,10 @@ Apologies for any names omitted.
 	smtp_host_lookup (default: dns, native). Files: smtp/smtp.c,
 	smtp/smtp_addr.c.
 
+20030418
+
+	Bugfix: "sendmail -t" broke with unrecognized message headers.
+
 Open problems:
 
 	Low: smtp-source may block when sending large test messages.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d31e34b0b..35ca549af 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,10 +20,10 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE	"20030417"
+#define MAIL_RELEASE_DATE	"20030418"
 
 #define VAR_MAIL_VERSION	"mail_version"
-#define DEF_MAIL_VERSION	"2.0.8-" MAIL_RELEASE_DATE
+#define DEF_MAIL_VERSION	"2.0.9-" MAIL_RELEASE_DATE
 extern char *var_mail_version;
 
  /*
diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index 26989db70..184d28304 100644
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -413,6 +413,7 @@ static void output_header(void *context, int header_class,
      * appropriate place.
      */
     if (header_class == MIME_HDR_PRIMARY
+	&& header_info
 	&& header_info->flags & HDR_OPT_RECIP
 	&& header_info->flags & HDR_OPT_EXTRACT
 	&& (state->resent == 0 || (header_info->flags & HDR_OPT_RR))) {
diff --git a/postfix/src/smtp/smtp_proto.c b/postfix/src/smtp/smtp_proto.c
index 543d78b2a..b7cc68c05 100644
--- a/postfix/src/smtp/smtp_proto.c
+++ b/postfix/src/smtp/smtp_proto.c
@@ -830,6 +830,15 @@ int     smtp_xfer(SMTP_STATE *state)
 	    }
 
 	    if (state->mime_state) {
+
+		/*
+		 * The cleanup server normally ends MIME content with a
+		 * normal text record. The following code is needed to flush
+		 * an internal buffer when someone submits 8-bit mail not
+		 * ending in newline via /usr/sbin/sendmail while MIME input
+		 * processing is turned off, and MIME 8bit->7bit conversion
+		 * is requested upon delivery.
+		 */
 		mime_errs =
 		    mime_state_update(state->mime_state, rec_type, "", 0);
 		if (mime_errs) {