diff -r b5fbb9b25d57 -r 67369d1b217f emailuis/emailui/src/FreestyleEmailDownloadInformationMediator.cpp
--- a/emailuis/emailui/src/FreestyleEmailDownloadInformationMediator.cpp	Tue May 11 15:57:15 2010 +0300
+++ b/emailuis/emailui/src/FreestyleEmailDownloadInformationMediator.cpp	Tue May 25 12:23:16 2010 +0300
@@ -829,21 +829,8 @@
     // no close button pressed
     if (iStatus.Int() != EAknSoftkeyClose )
         {
-        // open attachment list
-        if ( iPopupLaunchData.iMessagePartId.IsNullId() )
-            {
-            TAttachmentListActivationData params;
-            params.iMailBoxId = iPopupLaunchData.iMailBoxId;
-            params.iFolderId = iPopupLaunchData.iFolderId;
-            params.iMessageId = iPopupLaunchData.iMessageId;
-            // use package buffer to pass the params
-            TPckgBuf<TAttachmentListActivationData> buf( params );
-            TUid emptyCustomMessageId = { 0 };
-            CFreestyleEmailUiAppUi* appUi = (CFreestyleEmailUiAppUi*)CCoeEnv::Static()->AppUi();
-            appUi->EnterFsEmailViewL( AttachmentMngrViewId, emptyCustomMessageId, buf );
-            }
         // open attachment
-        else
+        if ( !iPopupLaunchData.iMessagePartId.IsNullId() )
             {
             // Force FsEmailUI to foreground because global completion note may appear
             // while some other application is active and our local error notes are not shown