diff --git a/ChangeLog b/ChangeLog
index 38a054621..832b7b060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailRenderingContext.m: returns the
+	alternativeViewer a multipart/related message is being handled.
+
 	* UI/MailPartViewers/UIxMailPartHTMLViewer.m: reimplemented module
 	from scratch.
 
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index a743983fe..e2a101ae0 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -178,9 +178,10 @@ static BOOL showNamedTextAttachmentsInline = NO;
   if ([mt isEqualToString:@"multipart"]) {
     if ([st isEqualToString:@"mixed"])
       return [self mixedViewer];
-    if ([st isEqualToString:@"signed"])
+    else if ([st isEqualToString:@"signed"])
       return [self signedViewer];
-    if ([st isEqualToString:@"alternative"])
+    else if ([st isEqualToString:@"alternative"]
+             || [st isEqualToString:@"related"])
       return [self alternativeViewer];
     
     if ([st isEqualToString:@"report"])