diff --git a/ChangeLog b/ChangeLog
index ca042d493..a78801b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailRenderingContext.m
+	([UIxMailRenderingContext -viewerForBodyInfo:_info]): display
+	parts with a bodyId as an attachment.
+
 	* UI/Contacts/UIxContactView.m ([UIxContactView -workUrl])
 	([UIxContactView -homeUrl]): the test for the presence of a
 	protocol was inverted, causing the output of wrong urls anyway...
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index 5e275adfd..bcc7a26fe 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -40,10 +40,15 @@
 - (BOOL) _shouldDisplayAsAttachment: (NSDictionary *) info
 {
   NSString *s;
+  BOOL shouldDisplay;
 
   s = [[info objectForKey:@"disposition"] objectForKey: @"type"];
-	
-  return (s && [s caseInsensitiveCompare: @"ATTACHMENT"] == NSOrderedSame);
+
+  shouldDisplay = ((s && ([s caseInsensitiveCompare: @"ATTACHMENT"]
+			  == NSOrderedSame))
+		   || [[info objectForKey: @"bodyId"] length]);
+
+  return shouldDisplay;
 }
 
 @end