diff --git a/ChangeLog b/ChangeLog
index f16209152..883aa3377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m: fixed infinite loop
+	when charset is us-ascii, match it to ascii rather than none.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	([SOGoAppointmentFolder
 	-fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatetitle:titlecomponent:_component]):
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index c93c83b26..c88f04d56 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -483,7 +483,7 @@
 - (xmlCharEncoding) _xmlCharsetForCharset: (NSString *) charset
 {
   struct { NSString *name; xmlCharEncoding encoding; } xmlEncodings[] = {
-    { @"us-ascii", XML_CHAR_ENCODING_NONE},
+    { @"us-ascii", XML_CHAR_ENCODING_ASCII},
     { @"utf-8", XML_CHAR_ENCODING_UTF8},
     { @"utf-16le", XML_CHAR_ENCODING_UTF16LE},
     { @"utf-16be",  XML_CHAR_ENCODING_UTF16BE},
@@ -505,8 +505,7 @@
     { @"iso-8859-9", XML_CHAR_ENCODING_8859_9},
     { @"iso-2022-jp", XML_CHAR_ENCODING_2022_JP},
 //     { @"iso-2022-jp", XML_CHAR_ENCODING_SHIFT_JIS},
-    { @"euc-jp", XML_CHAR_ENCODING_EUC_JP},
-    { @"us-ascii", XML_CHAR_ENCODING_ASCII}};
+    { @"euc-jp", XML_CHAR_ENCODING_EUC_JP}};
   unsigned count;
   xmlCharEncoding encoding;