diff --git a/ChangeLog b/ChangeLog
index aa67efedd..2c3b81d5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+	([UIxMailPartAlternativeViewer -selectPartIndexFromTypes:]): give
+	precedence on multipart/related parts.
+
 	* UI/MailPartViewers/UIxMailRenderingContext.m
 	([UIxMailRenderingContext -viewerForBodyInfo:_info]): add the
 	mixed viewer as the viewer for "multipart/digest" content.
diff --git a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
index 72ed9b3a0..cf66d6ee9 100644
--- a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+++ b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
@@ -92,6 +92,8 @@
   if ((count = [_types count]) == 0)
     return NSNotFound;
   
+  if ((i = [_types indexOfObject:@"multipart/related"]) != NSNotFound)
+    return i;
   if ((i = [_types indexOfObject:@"text/calendar"]) != NSNotFound)
     return i;
   if ((i = [_types indexOfObject:@"text/html"]) != NSNotFound)