--- a/emailuis/emailui/src/FreestyleMessageHeaderURLEventHandler.cpp	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/emailui/src/FreestyleMessageHeaderURLEventHandler.cpp	Thu Jan 07 12:38:38 2010 +0200
@@ -191,7 +191,22 @@
     
     if ( found == KErrNotFound )
         {
-        User::Leave( KErrNotFound );
+        // Probably, only the headers were downloaded. Check if attachments 
+        // were downloaded later.
+        iAttachmentsListModel->UpdateListL( iMailMessage );
+        for (TInt i=0; i<iAttachmentsListModel->GetModel().Count(); i++)
+            {
+            if ( iAttachmentsListModel->GetModel()[i].partData.iMessagePartId.Id() == id )
+                {
+                found = i;
+                break;
+                }
+            }
+
+        if ( found == KErrNotFound )
+            {
+            User::Leave( KErrNotFound );
+            }
         }
     
     return iAttachmentsListModel->GetModel()[found];
@@ -217,7 +232,7 @@
             if ( iView.IsEmbeddedMsgSavingAllowed() || !iAttachmentsListModel->IsMessage( aAttachment ) )
                 {
                 CFSEmailUiActionMenu::AddCustomItemL( FsEActionAttachmentSave );    
-                }
+                } 
              
             }
         else