- if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII) {
- char *t;
-
- t = p_dupstr(s, n);
- if (mutt_convert_nonmime_string(&t) == 0) {
- d += m_strcpy(d, dlen, t);
- } else {
- d += m_strcpy(d, dlen, s);
- }
- p_delete(&t);
- break;
+ n = m_strlen(s);
+ if (found_encoded && (m = lwslen(s, n)) != 0) {
+ if (m != n)
+ *d++ = ' ', dlen--;
+ n -= m, s += m;
+ }
+
+ if (mime_which_token(mod_cset.assumed_charset, -1) == MIME_US_ASCII) {
+ char *t;
+
+ t = p_dupstr(s, n);
+ if (mutt_convert_nonmime_string(&t) == 0) {
+ d += m_strcpy(d, dlen, t);
+ } else {
+ d += m_strcpy(d, dlen, s);