diff --git a/UI/MailPartViewers/UIxMailPartLinkViewer.h b/UI/MailPartViewers/UIxMailPartLinkViewer.h
index d89421511..5777f9863 100644
--- a/UI/MailPartViewers/UIxMailPartLinkViewer.h
+++ b/UI/MailPartViewers/UIxMailPartLinkViewer.h
@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2013 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
@@ -37,7 +38,7 @@
           encoding = BASE64; 
           parameterList = { 
             "x-unix-mode" = 0666; 
-             name = "IncoWEBOpenGroupwarepresentation.pdf"; 
+             name = "SOGo.pdf"; 
           }; 
           size = 1314916; 
           subtype = PDF; type = application; 
diff --git a/UI/MailPartViewers/UIxMailPartViewer.h b/UI/MailPartViewers/UIxMailPartViewer.h
index fd0423203..ce8f35f67 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.h
+++ b/UI/MailPartViewers/UIxMailPartViewer.h
@@ -83,6 +83,8 @@
 - (NSString *)pathToAttachmentObject; /* link to SoObject */
 - (NSString *)pathToAttachment;       /* download link */
 
+- (NSString *) mimeImageURL;
+
 @end
 
 #endif /* __Mailer_UIxMailPartViewer_H__ */
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 4e684d092..21aeec623 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -304,7 +304,7 @@
   return url;
 }
 
-- (NSString *) mimeImageUrl
+- (NSString *) mimeImageURL
 {
   NSString *mimeImageFile, *mimeImageUrl;
     
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index 37fcdceb1..03df297cc 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -213,8 +213,10 @@ static BOOL showNamedTextAttachmentsInline = NO;
 	return [self iCalViewer];
     }
   
-  // Tiffs aren't well-supported
-  if ([mt isEqualToString:@"image"] && ![st isEqualToString: @"tiff"])
+  // TIFF files aren't well-supported and Thunderbird sometimes send PDF
+  // files over as image/pdf !
+  if ([mt isEqualToString:@"image"] &&
+      !([st isEqualToString: @"tiff"] || [st isEqualToString: @"pdf"]))
     {
       if ([self _shouldDisplayAsAttachment: _info textPart: NO])
 	return [self linkViewer];
diff --git a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
index bf985eb64..1e7368086 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartLinkViewer.wox
@@ -10,7 +10,7 @@
     <a var:href="pathToAttachment"
       var:title="filenameForDisplay"
       const:absolute="YES"
-      ><img var:src="mimeImageUrl" />
+      ><img var:src="mimeImageURL" />
     </a>
     <div class="linked_attachment_meta">
       <var:string value="filenameForDisplay" 
diff --git a/UI/WebServerResources/mime-image-pdf.png b/UI/WebServerResources/mime-image-pdf.png
new file mode 100644
index 000000000..50d6c151e
Binary files /dev/null and b/UI/WebServerResources/mime-image-pdf.png differ