diff --git a/ChangeLog b/ChangeLog
index 962513b2d..243b773d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-04-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	([_UIxHTMLMailContentHandler -characters:_charslength:_len])
+	([_UIxHTMLMailContentHandler -comment:_charslength:_len]): don't
+	cast the unichar data to char, to avoid issues with endianness
+	which prevents the CSS from being parsed properly.
+
 	* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -isMailReply]): new
 	method that returns the JS values "true" or "false" as strings is
 	the mail has a non-null count of recipients.
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 94c7055de..9123ca868 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -171,7 +171,7 @@
       currentChar = _chars + count;
       if (inCSSDeclaration)
         {
-          if (*(char *) currentChar == '}')
+          if (*currentChar == '}')
             {
               inCSSDeclaration = NO;
               hasEmbeddedCSS = NO;
@@ -179,16 +179,16 @@
         }
       else
         {
-          if (*(char *) currentChar == '{')
+          if (*currentChar == '{')
             inCSSDeclaration = YES;
-          if (*(char *) currentChar == ',')
+          if (*currentChar == ',')
             hasEmbeddedCSS = NO;
           else if (!hasEmbeddedCSS)
             {
-              if (*(char *) currentChar == '@')
+              if (*currentChar == '@')
                 hasEmbeddedCSS = YES;
               else
-                if (*(char *) currentChar > 32)
+                if (*currentChar > 32)
                   {
                     [css appendString: [NSString stringWithCharacters: start
                                                  length: (currentChar - start)]];