2 files changed, 7 insertions, 1 deletions
diff --git a/i18n.h b/i18n.h
index d364292c..f3adc7a3 100644
--- a/i18n.h
+++ b/i18n.h
@@ -6,6 +6,7 @@
 #ifdef ENABLE_NLS
 #undef __OPTIMIZE__
 #include <libintl.h>
+#include <langinfo.h>
 #define GT_(String) gettext((String))
 #define NGT_(String) (String)
 #else
diff --git a/sink.c b/sink.c
index 577b3731..54db4029 100644
--- a/sink.c
+++ b/sink.c
@@ -1534,7 +1534,12 @@ int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
     }
     else				/* send to postmaster  */
 	status = open_sink(ctl, &reply, &good, &bad);
-    if (status == 0) stuff_warning(ctl, "Date: %s", rfc822timestamp());
+    if (status == 0) {
+	stuff_warning(ctl, "Date: %s", rfc822timestamp());
+	stuff_warning(ctl, "MIME-Version: 1.0");
+	stuff_warning(ctl, "Content-Transfer-Encoding: 8bit");
+	stuff_warning(ctl, "Content-Type: text/plain; charset=\"%s\"", nl_langinfo(CODESET));
+    }
     return(status);
 }