diff -r 0396474f30f5 -r 4ce476e64c59 meetingrequest/mricalviewer/src/cesmrmrinfoicalretriever.cpp
--- a/meetingrequest/mricalviewer/src/cesmrmrinfoicalretriever.cpp	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mricalviewer/src/cesmrmrinfoicalretriever.cpp	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,6 @@
 #include "emailtrace.h"
 #include "cesmrmrinfoicalretriever.h"
 #include "cesmrinforecurrencehandler.h"
-#include "cesmrattachmentinfo.h"
 #include "mesmricalviewerobserver.h"
 #include "tesmrinputparams.h"
 #include "esmricalviewerutils.h"
@@ -40,7 +39,7 @@
 #include <calentry.h>
 #include <caluser.h>
 #include <calalarm.h>
-#include <CalenInterimUtils2.h>
+#include <caleninterimutils2.h>
 #include <utf.h>
 
 // Unnamed namespace for local definitions and functions
@@ -327,7 +326,6 @@
     FUNC_LOG;
     iSupportedFields.Reset();
     iSupportedFields.Close();
-    delete iAttachmentInfo;
     delete iConvertedEntry;
     }
 
@@ -392,8 +390,6 @@
             FillRecurrenceL();
             }
 
-        FillAttachmentInfoL();
-
         // Fill input parameters
         // Ownership is not trasferred
         iInputParameters.iCalEntry = iConvertedEntry;
@@ -586,7 +582,7 @@
         if ( KErrNone == err && minutesBetween.Int() > 0 )
             {
             alarm->SetTimeOffset( minutesBetween );
-            // this method copies alarm details and does not take ownership 
+            // this method copies alarm details and does not take ownership
             iConvertedEntry->SetAlarmL( alarm );
             }
         // that's why we can destroy it here
@@ -633,74 +629,5 @@
         }
     }
 
-// ---------------------------------------------------------------------------
-// CESMRInfoIcalRetrieverCmd::FillAttachmentInfoL
-// ---------------------------------------------------------------------------
-//
-void CESMRInfoIcalRetrieverCmd::FillAttachmentInfoL()
-    {
-    FUNC_LOG;
-    CFSMailMessage* msg = Message();
-
-    if ( msg->IsFlagSet( EFSMsgFlag_Attachments ) )
-        {
-        RPointerArray<CFSMailMessagePart> attachmentParts;
-        CleanupStack::PushL(
-                TCleanupItem(
-                    ESMRIcalViewerUtils::MessagePartPointerArrayCleanup,
-                    &attachmentParts    ) );
-
-        msg->AttachmentListL( attachmentParts );
-
-        TInt attachmentCount( attachmentParts.Count() );
-        if ( attachmentCount > 0 )
-            {
-            delete iAttachmentInfo;
-            iAttachmentInfo = NULL;
-            
-            iInputParameters.iAttachmentInfo = NULL;
-
-            CESMRAttachmentInfo* attachmentInfo = CESMRAttachmentInfo::NewL();
-            CleanupStack::PushL( attachmentInfo );
-
-            for( TInt i(0); i < attachmentCount; ++i )
-                {
-                CESMRAttachment::TESMRAttachmentState state(
-                        CESMRAttachment::EAttachmentStateDownloaded );
-
-                if ( EFSFull != attachmentParts[i]->FetchLoadState() )
-                    {
-                    state = CESMRAttachment::EAttachmentStateNotDownloaded;
-                    }
-
-                TInt contentSize( attachmentParts[i]->ContentSize() );
-                TPtrC attachmentName( attachmentParts[i]->AttachmentNameL() );
-                if ( contentSize >= 0 && attachmentName.Length() )
-                    {
-                    attachmentInfo->AddAttachmentInfoL(
-                            attachmentName,
-                            contentSize,
-                            state );
-                    }
-                }
-
-            if ( attachmentInfo->AttachmentCount() )
-                {
-                iAttachmentInfo = attachmentInfo;
-                CleanupStack::Pop( attachmentInfo );
-                // ownership does not change
-                iInputParameters.iAttachmentInfo = iAttachmentInfo;
-                }
-            else
-                {
-                CleanupStack::PopAndDestroy( attachmentInfo );
-                }
-
-            attachmentInfo = NULL;
-            }
-        CleanupStack::PopAndDestroy(); // attachmentparts
-        }
-    }
-
 // EOF