X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fnotify_email.c;h=24c66ec051b965aa5cbfedd228d774430d951c53;hb=6bf2e82bf5049af097beae4a8b7f086466520839;hp=6b4678a7882a22baa010a569ba06cf1e7993ab6b;hpb=6c4ad411cc83a68086bebc24e814c3aea1cb8096;p=collectd.git

diff --git a/src/notify_email.c b/src/notify_email.c
index 6b4678a7..24c66ec0 100644
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -229,6 +229,7 @@ static int notify_email_notification (const notification_t *n,
     user_data_t __attribute__((unused)) *user_data)
 {
 
+  time_t tt;
   struct tm timestamp_tm;
   char timestamp_str[64];
 
@@ -248,7 +249,8 @@ static int notify_email_notification (const notification_t *n,
       (email_subject == NULL) ? DEFAULT_SMTP_SUBJECT : email_subject,
       severity, n->host);
 
-  localtime_r (&n->time, &timestamp_tm);
+  tt = CDTIME_T_TO_TIME_T (n->time);
+  localtime_r (&tt, &timestamp_tm);
   strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
       &timestamp_tm);
   timestamp_str[sizeof (timestamp_str) - 1] = '\0';
@@ -256,7 +258,7 @@ static int notify_email_notification (const notification_t *n,
   /* Let's make RFC822 message text with \r\n EOLs */
   ssnprintf (buf, buf_len,
       "MIME-Version: 1.0\r\n"
-      "Content-Type: text/plain;\r\n"
+      "Content-Type: text/plain; charset=\"US-ASCII\"\r\n"
       "Content-Transfer-Encoding: 8bit\r\n"
       "Subject: %s\r\n"
       "\r\n"