aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 79084440ef..cc55320bcb 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-08 Dan Winship <danw@ximian.com>
+
+ * e-msg-composer.c (best_charset): Don't use the default charset
+ if the message is US-ASCII.
+
2001-06-07 Radek Doulik <rodo@ximian.com>
* e-msg-composer.c (e_msg_composer_new_with_sig_file): just set
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 3a818fffdb..98062f786f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -174,6 +174,9 @@ best_charset (GByteArray *buf, CamelMimePartEncodingType *encoding)
{
const char *charset;
+ if (best_encoding (buf, "US-ASCII") == CAMEL_MIME_PART_ENCODING_7BIT)
+ return NULL;
+
charset = mail_config_get_default_charset ();
*encoding = best_encoding (buf, charset);
if (*encoding != -1)