- mutt_canonical_charset (chsbuf, sizeof (chsbuf),
- Charset ? Charset : "us-ascii");
- rfc822_cat (buffer, sizeof (buffer), chsbuf, MimeSpecials);
+ charset_canonicalize(chsbuf, sizeof (chsbuf), Charset);
+ rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);