diff --git a/ChangeLog b/ChangeLog
index 97cdaf473..0a75e5fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-09  Cyril Robert <crobert@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailRenderingContext.m: Display .tiff as
+	attachments, some browsers don't support tiff.
+
 2009-07-07  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index c527efc57..b24856f5b 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -247,7 +247,8 @@ static BOOL showNamedTextAttachmentsInline = NO;
 	return [self iCalViewer];
     }
   
-  if ([mt isEqualToString:@"image"])
+  // Tiffs aren't well-supported
+  if ([mt isEqualToString:@"image"] && ![st isEqualToString: @"tiff"])
     {
       if ([self _shouldDisplayAsAttachment: _info])
 	return [self linkViewer];