if (a->type == TYPEMULTIPART) {
a->encoding = ENC7BIT;
convert_to_7bit(a->parts);
- } else if (a->type == TYPEMESSAGE && tok == MIME_DELIVERY_STATUS) {
+ } else if (a->type == TYPEMESSAGE && tok != MIME_DELIVERY_STATUS) {
if (a->encoding != ENC7BIT)
mutt_message_to_7bit(a, NULL);
} else if (a->encoding == ENC8BIT) {
char p[STRING];
setlocale(LC_TIME, "");
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
strftime(p, sizeof(p), nl_langinfo(D_T_FMT), localtime(&t));
#else
strftime(p, sizeof(p), "%c", localtime(&t));
tt = key->subkeys->timestamp;
tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
tt = key->subkeys->expires;
tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
tt = subkey->timestamp;
tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
tt = subkey->expires;
tm = localtime (&tt);
-#ifdef HAVE_LANGINFO_D_T_FMT
+#ifdef D_T_FMT
strftime (shortbuf, sizeof shortbuf, nl_langinfo (D_T_FMT), tm);
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);