diff --git a/ChangeLog b/ChangeLog
index 8bbf9143b..8039c5fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartAlternativeViewer.m: select the
+	text/html component before text/plain.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	-addRequiredKeysOfStructure:path:toArray:recurse:]): accepts the
 	fetching of HTML parts.
diff --git a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
index 95e4e2e7a..e7ff28aa1 100644
--- a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+++ b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
@@ -89,10 +89,11 @@
   if ((count = [_types count]) == 0)
     return NSNotFound;
   
-  /* we always choose text/plain if available */
+  if ((i = [_types indexOfObject:@"text/html"]) != NSNotFound)
+    return i;
   if ((i = [_types indexOfObject:@"text/plain"]) != NSNotFound)
     return i;
-  
+
   /* then we scan for other text types and choose the first one found */
   for (i = 0; i < count; i++) {
     if ([(NSString *)[_types objectAtIndex:i] hasPrefix:@"text/"])