* Internet Gateways. So we actually decode it.
*/
- if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
- rfc2047_decode (&p->value);
- else if (!option (OPTSTRICTMIME)) {
+ if (option(OPTRFC2047PARAMS) && p->value && strstr(p->value, "=?")) {
+ rfc2047_decode(&p->value);
+ } else {
if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
mutt_convert_nonmime_string(&p->value);
}