--- a/emailuis/emailui/src/FreestyleMessageHeaderHTML.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/emailui/src/FreestyleMessageHeaderHTML.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -141,6 +141,14 @@
 void CFreestyleMessageHeaderHTML::ConstructL()
     {
     iMailMessage.AttachmentListL( iAttachments );
+    // Remove attachments with no name
+    for ( TInt i = iAttachments.Count() - 1; i >= 0; i-- )
+        {
+        if ( !iAttachments[i]->AttachmentNameL().Length() )
+            {
+            iAttachments.Remove( i );
+            }
+        }
     }
 
 EXPORT_C void CFreestyleMessageHeaderHTML::ExportL() const