--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/conversationidpsconsts.h	Fri May 14 15:49:35 2010 +0300
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Publish and subscribe constants used to publish 
+ *              conversation id for hiding notification.
+ *
+ */
+
+#ifndef CONVERSATIONID_PS_CONSTS_H
+#define CONVERSATIONID_PS_CONSTS_H
+
+const qint32 KMsgCVIdProperty = {0x2002E678}; // same as msgnotifier's UID
+const quint32 KMsgCVIdKey = 0x00000001;
+
+// msgapp UId
+const TUid KMsgAppUid ={0x2001FE79};
+
+#endif // CONVERSATIONID_PS_CONSTS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/msgcontacthandler.h	Fri May 14 15:49:35 2010 +0300
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: This header handles the phonebook manager resolve number static
+ *              functions.
+ *
+ */
+
+#ifndef MSGCONTACTHANDLER_H_
+#define MSGCONTACTHANDLER_H_
+
+#include <qmobilityglobal.h>
+
+#include <qtcontacts.h>
+#include <qcontactfilter.h>
+#include <qcontactdetailfilter.h>
+#include <QFile>
+#include <qversitcontactimporter.h>
+#include <qversitdocument.h>
+#include <qversitreader.h>
+
+QTM_BEGIN_NAMESPACE
+class QContactManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
+
+class MsgContactHandler
+{
+    
+public:
+
+    /**
+     * This shall resolve contact number with display name
+     * @param contactNumber number to resolve
+     * @param displayName resolved name
+     * @param countPhoneNumber specifies number of contacts inside 
+     * the resolved contact ex mobile, home, office etc
+     * @return contacts unique localId
+     */
+    static int resolveContactDisplayName(const QString& contactNumber,
+                                         QString& displayName,
+                                         int& countPhoneNumber)
+    {
+        QContactManager * phonebookManager;
+        QContactDetailFilter phoneFilter;
+        phonebookManager = new QContactManager("symbian");
+        phoneFilter.setDetailDefinitionName(QContactPhoneNumber::DefinitionName,
+                                            QContactPhoneNumber::FieldNumber);
+
+        QVariant address(contactNumber);
+        phoneFilter.setValue(address);
+        phoneFilter.setMatchFlags(QContactFilter::MatchEndsWith);
+
+        QList<QContact> matchingContacts =
+                phonebookManager->contacts(phoneFilter);
+
+        if (matchingContacts.count() > 0)
+        {
+            // Fill the contact details
+            QContact match = matchingContacts.at(0);
+
+            displayName = match.displayLabel();
+            QList<QContactPhoneNumber> numbers = 
+                    match.details<QContactPhoneNumber> ();
+            countPhoneNumber = numbers.count();
+            return match.localId();
+        }
+        else // no matching contacts
+        {
+            displayName = contactNumber;
+            return -1;
+        }
+    }
+    
+    /**
+     * This shall resolve contact number with display name
+     * @param contactNumber number to resolve
+     * @param fieldName specifies filter name
+     * @param fieldType specifies filter type
+     * @return contact unique local id
+     */
+    static int resolveContactDisplayName(const QString& contactNumber,
+                                         const QString& fieldName,
+                                         const QString& fieldType)
+    {
+        int contactId = -1;
+
+        QContactManager phonebookManager("symbian");
+
+        QContactDetailFilter phoneFilter;
+        phoneFilter.setDetailDefinitionName(fieldName, fieldType);
+        phoneFilter.setValue(contactNumber);
+        phoneFilter.setMatchFlags(QContactFilter::MatchEndsWith);
+
+        QList<QContact>
+                matchingContacts = phonebookManager.contacts(phoneFilter);
+
+        if (matchingContacts.count() > 0)
+        {
+            contactId = matchingContacts.at(0).localId();
+        }
+        return contactId;
+    }
+
+    //---------------------------------------------------------------
+    // findContactList
+    // Finds the contact matching the phone number.
+    // @param phoneNumber Phone number to be matchned.
+    // @return List of matching contacts.
+    //---------------------------------------------------------------
+    static QList<QContact> findContactList(const QString &phoneNumber)
+    {
+        QContactManager phonebookManager("symbian");
+
+        QContactDetailFilter phoneFilter;
+        phoneFilter.setDetailDefinitionName(QContactPhoneNumber::DefinitionName,
+            QContactPhoneNumber::FieldNumber);
+        phoneFilter.setValue(phoneNumber);
+        phoneFilter.setMatchFlags(QContactFilter::MatchEndsWith);
+        
+        QList<QContact> matchingContacts = phonebookManager.contacts(phoneFilter);
+
+        return matchingContacts;
+    }
+    
+    /**
+     * Get display-name of a contact from VCard.
+     * @param filePath, VCard file-path
+     * @return display-name
+     */
+
+    static QString getVCardDisplayName(QString& filePath)
+    {
+        QString displayName = QString("");
+        //open file for parsing
+        QFile file(filePath);
+        if (!file.open(QIODevice::ReadOnly))
+        {
+            return displayName;
+        }
+        // parse contents
+        QVersitReader reader;
+        reader.setDevice(&file);
+        if (reader.startReading())
+        {
+            if (reader.waitForFinished())
+            {
+                QList<QVersitDocument> versitDocuments = reader.results();
+                // Use the resulting document
+                if (versitDocuments.count() > 0)
+                {
+                    QVersitContactImporter importer;
+                    QList<QContact> contacts =
+                            importer.importContacts(versitDocuments);
+                    // get display-name
+                    if (contacts.count() > 0)
+                    {
+                        //resolveSynthesizedDisplayLabel
+                        QContactManager* contactManager =
+                                new QContactManager("symbian");
+                        displayName
+                                = contactManager->synthesizedDisplayLabel(contacts[0]);
+                        delete contactManager;
+                    }
+                }
+            }
+        }
+        file.close();
+        return displayName;
+    }
+};
+
+#endif /* MSGCONTACTHANDLER_H_ */

--- a/messagingapp/messagingapp.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/messagingapp.pro	Fri May 14 15:49:35 2010 +0300
@@ -29,3 +29,4 @@
 SUBDIRS += smartmessaging/smartmessaging.pro
 SUBDIRS += shareui/shareui.pro
 SUBDIRS += msgui/msgui.pro
+SUBDIRS += msgservices/msgservices.pro

--- a/messagingapp/msgappfw/msgappfw.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgappfw/msgappfw.pro	Fri May 14 15:49:35 2010 +0300
@@ -22,4 +22,4 @@
 # Platforms
 SYMBIAN_PLATFORMS = WINSCW ARMV5
 
-SUBDIRS += utils server client plugin msghistory
+SUBDIRS += utils server client plugins msghistory

--- a/messagingapp/msgappfw/msghistory/src/msgitem.cpp	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgappfw/msghistory/src/msgitem.cpp	Fri May 14 15:49:35 2010 +0300
@@ -22,6 +22,7 @@
 // ---------------------------------------------------------------------------
 MsgItem::MsgItem()
     {
+    mAttributes = MsgAttributeNone;
     }
 
 // ---------------------------------------------------------------------------

--- a/messagingapp/msgappfw/plugin/group/csmsg.mmp	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CS Msg Plugin
-*
-*/
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-CAPABILITY      CAP_ECOM_PLUGIN 
-VENDORID        VID_DEFAULT
-TARGET          csmsg.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x2002A546
-
-VERSION 	1.0
-
-PAGED
-
-// RESOURCE
-START RESOURCE ../rss/csmsg.rss
-TARGET csmsg.rsc
-END
-
-SOURCEPATH      ../src
-
-SOURCE          proxy.cpp
-SOURCE 		ccsmsg.cpp
-SOURCE 		ccsmsgpluginutility.cpp
-SOURCE 		ccsmsghandler.cpp
-
-USERINCLUDE     ../inc
-USERINCLUDE     ../../server/inc
-USERINCLUDE     ../../utils/inc
-USERINCLUDE     ../../../../inc
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib
-LIBRARY         eCom.lib
-LIBRARY         csutils.lib
-DEBUGLIBRARY    flogger.lib
-
-// Msg Server
-LIBRARY         Smcm.lib
-LIBRARY         gsmu.lib
-LIBRARY         etext.lib
-LIBRARY         msgs.lib

--- a/messagingapp/msgappfw/plugin/inc/ccsmsg.h	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Message Plugin main class
- *
-*/
-
-
-#ifndef _C_CS_MSG_H_
-#define _C_CS_MSG_H_
-
-// INCLUDE FILES
-
-// SYSTEM INCLUDES
-
-// USER INCLUDES
-#include "ccsplugin.h"
-#include "mcsmsgobserver.h"
-#include "ccsdebug.h"
-#include "ccsdefs.h"
-
-// FORWARD DECLARATION
-class MCsPluginEventObserver;
-class MCsMsgObserver;
-class CCsConversationEntry;
-class CCsMsgHandler;
-
-/**
- *  Message plugin class
- *  This class interacts with MsvServer to fetch the message data.
- */
-class CCsMsg : public CCsPlugin, public MCsMsgObserver
-    {
-public: 
-
-    /**
-     * Two phase construction
-     */
-    static CCsMsg* NewL( MCsPluginEventObserver* aMCsPluginEventObserver);
-
-    /**
-     * Destructor
-     */
-    virtual ~CCsMsg();
-
-
-public: // From base class CCsPlugin
-    /**
-     *  GetConversationsL
-     *  This function starts the state machine to fetch msg data from msvserver
-     */        
-    void GetConversationsL();
-
-public: //MCsMsgObserver
-    /**
-     *  HandleReadCompleteL
-     *  Sends the CCsConversationEntry array to Conversation Server
-     *  @param aConversationEntryLists The object to be used to handle updates 
-     *  from the plugin
-     */
-    void HandleReadCompleteL( const RPointerArray<CCsConversationEntry> *aConversationEntryLists);
-
-    /**
-     *  HandleUpdateCompleteL
-     *  Sends the CCsConversationEntry array to Conversation Server
-     *  @param aConversationEntryLists The object to be used to handle updates 
-     *  from the plugin
-     */
-    void HandleUpdateCompleteL( const RPointerArray<CCsConversationEntry> *aConversationEntryLists);
-
-    /**
-     *  HandleDeleteCompleteL
-     *  Sends the CCsConversationEntry array to Conversation Server
-     *  @param aConversationEntryLists The object to be used to handle updates 
-     *  from the plugin
-     */
-    void HandleDeleteCompleteL( const RPointerArray<CCsConversationEntry> *aConversationEntryLists);
-
-    /**
-     * HandleRefreshCompleteL
-     * Notify conversation server to refresh the conversations from this plugin.
-     */
-    void HandleRefreshCompleteL();
-    
-    /**
-     *  HandleCachingCompleted
-     *  Sends the cache completed status to server
-     */
-    void HandleCachingCompleted();
-
-    /**
-     *  HandleCachingError
-     *  Sends the error occured during the caching to server
-     */
-    void HandleCachingError(const TInt aError);
-    
-private:
-
-    /**
-     * Constructor
-     */
-    CCsMsg(MCsPluginEventObserver* aObserver);
-
-    /**
-     * 2nd phase construtor
-     */
-    void ConstructL();
-
-private: //Data
-
-    /**
-     * The msg plugin class which sends the initial set of conversation 
-     * entries upon bootup to conversations server.
-     * and notifies the conversations server about the new MsvServer events
-     */
-    CCsMsgHandler* iMsgHandler;  
-
-    /**
-     * iPluginEventObserver
-     * Plugin event observer
-     * Not Own.
-     */
-    MCsPluginEventObserver* iPluginEventObserver;
-    };
-
-#endif // _C_CS_MSG_H_

--- a/messagingapp/msgappfw/plugin/inc/ccsmsghandler.h	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,266 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Request Handler plugin
- *
-*/
-
-
-#ifndef _C_CS_MSG_REQUEST_HANDLER_H_
-#define _C_CS_MSG_REQUEST_HANDLER_H_
-
-//SYSTEM INCLUDES
-#include <msvapi.h>
-
-//USER INCLUDES
-#include "ccsmsg.h"
-#include "ccsmsgpluginutility.h"
-
-
-// FORWARD DECLARATION
-class CCsPlugin;
-class CMsvSession;
-class MCsPluginEventObserver;
-class MMsvSessionObserver;
-class CCsConversationEntry;
-class CCsMsg;
-class CCsMsgPluginUtility;
-class CClientMtmRegistry;
-class CSmsClientMtm;
-class CMmsClientMtm;
-
-/**
- * Operation Type
- */  
-enum TEventType
-    {
-    ERead,
-    EUpdate,
-    EDelete
-    };
-
-/**
- * States
- */
-enum TMsgHandlerState
-    {
-    EReadInbox,
-    EReadSent,
-    EProcessDraft,
-    EReadOutbox,
-    ESortEntries,
-    EProcessEntries,
-    EComplete
-    };
-
-/**
- *  Message plugin Request Handler Class
- *  This class interacts with MsvServer to fetch message data
- */
-class CCsMsgHandler : public CBase, public MMsvSessionObserver
-    {
-
-public: 
-
-    /**
-     * Two phase construction
-     * @param aMsgObserver MCsMsgObserver interface
-     */
-    static CCsMsgHandler* NewL(MCsMsgObserver *aMsgObserver);
-
-    /**
-     * Destructor
-     */
-    virtual ~CCsMsgHandler();
-
-    /**
-     *  Start
-     *  This function starts the state machine to fetch msg data from msvserver
-     */        
-    void StartL();
-
-public://MMsvSessionObserver
-    /**
-     * Handles the MsvServer updates. Implemented for MMsvSessionObserver
-     */
-    void HandleSessionEventL(TMsvSessionEvent aEvent, 
-            TAny* aArg1, 
-            TAny* aArg2, 
-            TAny* aArg3);
-
-private:
-
-    /**
-     * CIdle callback
-     */
-    static TInt UploadMsg(TAny* arg);
-
-    /**
-     * State handler to read all messages 
-     */
-    TInt UploadMsgL();
-
-    /**
-     * Checks if the MTM type supported
-     */
-    TBool IsMtmSupported(long uid);
-
-private:
-
-    /**
-     * Constructor   
-     */
-    CCsMsgHandler();
-
-    /**
-     * 2nd phase construtor
-     * @param aMsgPlugin The main message plugin object
-     */
-    void ConstructL(MCsMsgObserver *aMsgPlugin);
-
-    /**
-     * ProcessResultsL fetches results and updates the CCsServer
-     * with the fetched data
-     */    
-    void ProcessResultsL(TMsvEntry aEntry);
-
-    /**
-     * Create CCsConversationEntry and adds to the list     
-     * @param aContact, Contact details
-     * @param aDescription, message body
-     * @param aEntry, TMsvEntry
-     */
-    void CreateAndAddEntryL(const TDesC& aContact,
-            const TDesC& aDescription,
-            const TMsvEntry& aEntry);
-
-    /**
-     * Process each entry
-     * @param aEvent Read, Update, Delete
-     * @param aContact (From/To) Field
-     * @param aDescription, message body
-     * @param aEntry, Message entry
-     */
-    void ProcessEntryL(TEventType aEvent, 
-            const TDesC& aContact,
-            const TDesC& aDescription,
-            const TMsvEntry& aEntry);
-
-    /**
-     * Process each entry
-     *@param aSelection, CMsvEntrySelections
-     *@param aParent, parent id if TMsvEntry
-     */    
-    void HandleEventL(CMsvEntrySelection* aSelection, TMsvId aParent);
-
-    /**
-     * Extracts the addresses in the to field and updates them to server
-     *@param aEntry, TMsvEntry
-     *@param aEvent Read, Update, Delete
-     *@param aFromAddress, from address of the message
-     */    
-    void ExtractAddressesL( 
-            TMsvEntry aEntry , 
-            TEventType aEvent,
-            RPointerArray<HBufC>& addressList);
-
-    /**
-     * Cleanup
-     */
-    void CleanupL();
-
-    /**
-     * Extracts the Message type based on the MTM value 
-     * @param aEntry, TMsvEntry
-     */
-    TCsType ExtractCsType( const TMsvEntry& aEntry);
-
-	
-private: //Data
-
-    /**
-     * MsvServer session object
-     */
-    CMsvSession* iSession;
-
-    /**
-     * Utility object
-     */
-    CCsMsgPluginUtility* iMsgPluginUtility;
-
-    /**
-     * iConverstationEntryList
-     * ConversationEntry list
-     * Own.
-     */    
-    RPointerArray<CCsConversationEntry> *iConverstationEntryList;
-
-    /**
-     * iMsgObserver
-     * The Observer interface
-     * Not Own.
-     */        
-    MCsMsgObserver *iMsgObserver;
-
-    /**
-     * Mtm registry object
-     */
-    CClientMtmRegistry* iMtmRegistry;
-
-    /**
-     * SMS client mtm object
-     */
-    CSmsClientMtm* iSmsMtm;
-
-    /**
-     * Mms client mtm object
-     */
-    CMmsClientMtm* iMmsMtm;
-
-    /**
-     * Previous entry, used for comparing with new entry received    
-     */
-    TMsvEntry iPrevEntry;
-
-    /**
-     * Root entry
-     */
-    CMsvEntry* iRootEntry;
-
-    /**
-     * Mesage count
-     */
-    TInt iMessageCount;
-
-    /**
-     * Messages under root entry
-     */
-    CMsvEntrySelection* iMessages;
-
-    /**
-     * Master array for holding all the messages 
-     */
-   RArray<TMsvId>* iMessageArray;
-
-    /**
-     * State
-     */
-    TMsgHandlerState iState;
-
-    /**
-     * Active object
-     */
-    CIdle* iIdle;
-    };
-
-#endif // _C_CS_MSG_REQUEST_HANDLER_H_

--- a/messagingapp/msgappfw/plugin/inc/ccsmsgpluginutility.h	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Utility class
- *
-*/
-
-
-#ifndef _C_CS_MSG_PLUGIN_UTILITY_H_
-#define _C_CS_MSG_PLUGIN_UTILITY_H_
-
-// SYSTEM INCLUDES
-#include <msvapi.h>
-#include <smuthdr.h>                    // CSmsHeader
-#include <txtetext.h>
-#include <msvids.h>
-#include <ccsdefs.h>
-#include <ccsconversationentry.h>
-
-// FORWARD DECLARATION
-class CCsConversationEntry;
-
-/**
- *  Message plugin Utility Class
- *  This class provides some utility methods
- */
-class CCsMsgPluginUtility: public CBase
-    {
-
-public:
-
-    /**
-     * Two phase construction
-     */
-    static CCsMsgPluginUtility* NewL();
-
-    /**
-     * Destructor
-     */
-    virtual ~CCsMsgPluginUtility();
-
-    /**
-     * Creates CCsConversationEntry using input parameters
-     *
-     * @since S60
-     * @param aContact Conatct details
-     * @param aEnryId Unique Id 
-     * @param aTimeStamp time stamp details
-     * @param aDir TMsvId of Parent
-     * @param aDescription description of the body message
-     * @param aSendState TCsSendState enum value
-     * @param aMsgAttribs TCsAttribute enum value
-     * @return  CCsConversationEntry object
-     */
-    CCsConversationEntry* CreateConversationEntryL(
-            const HBufC* aContact,
-            TMsvId aEnryId,
-            TInt64 aTimeStamp,
-            TMsvId aDir,
-            const HBufC* aDescription,
-            TCsSendState aSendState,
-            TCsAttribute aMsgAttribs,
-            TCsType aCsType) const ;
-
-    /**
-     * Map the call direction to TCsDirection.
-     *
-     * @since S60
-     * @param aDir The direction string which needs to be mapped
-     * @return TCsDirection enum value
-     */
-    TCsDirection MapDirection( TMsvId aDir ) const;
-
-    /**
-     * Returns the message attributes as a bitmask of TCsAttribute values.
-     *
-     * @param aEntry Message entry.
-     * @return A bitmask of TCsAttribute values.
-     * @see TCsAttribute
-     */
-    TUint16 GetMsgAttributes( const TMsvEntry& aEntry );
-
-    /**
-     * Returns the send status.
-     *
-     * @param aContext Message entry.
-     * @return send status like failed, sent, suspended etc.
-     * @see TCsSendState
-     */
-    TCsSendState GetSendState( const TMsvEntry& aContext );
-
-    /**
-     * Create the Contact (From/To) of the message
-     *
-     * @param aSession Message Server session
-     * @param aEntry Message entry
-     * @param addressList List from extracted from/to addresses
-     */
-    void CreateContactL( CMsvSession* aSession,
-                         const TMsvEntry& aEntry,
-                         RPointerArray<HBufC>& addressList);
-
-    /**
-     * Compare previous entry with new entry
-     *
-     * @param aOldContext previous Message entry
-     * @param aNewContext new Message entry
-     * @param aDir entry folder
-     * @return  ETrue/EFalse for same/different
-     */
-    TBool CompareEntry( const TMsvEntry& aOldContext,
-                        const TMsvEntry& aNewContext, 
-                        TMsvId aDir ) const;
-
-    /**
-     * Extracts name and address from the aMsvAddress
-     * which is of the form name<address>
-     * @param aMsvAddress which is of the form name<address>
-     * @param aName  extracted name
-     * @param aAddress extracted address
-     */
-    void NameAndAddress( const TPtrC& aMsvAddress, 
-                         TPtrC& aName, 
-                         TPtrC& aAddress );
-
-    /**
-     * Extract the address part for MMS ignoring the alias
-     */
-    TPtrC PureAddress(const TDesC& aAddress);
-
-private:
-    /**
-     * Constructor
-     */
-    CCsMsgPluginUtility();
-
-    };
-
-#endif // _C_CS_MSG_PLUGIN_UTILITY_H_

--- a/messagingapp/msgappfw/plugin/inc/mcsmsgobserver.h	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  The observer interface which handles the completion of 
- *                reading message entries. 
- *
-*/
-
-
-#ifndef __M_CS_MSG_OBSERVER__ 
-#define __M_CS_MSG_OBSERVER__
-
-// INCLUDE FILES
-#include  "ccsdefs.h"
-
-// FORWARD DECLARATION
-class CCsConversationEntry;
-
-// CLASS DECLARATION
-/**
- *  MCsMsgObserver
- *  Mixin class.
- *  Observer which handles message read completion.
- */
-class MCsMsgObserver
-    {
-public:
-    /**
-     * HandleConverastions.
-     * Handle Conversation event from Plugins
-     * 
-     * @param aConversationEntryLists    List of conversation entries.
-     */
-    virtual void HandleReadCompleteL(const RPointerArray<CCsConversationEntry> *aConversationEntryLists) = 0;
-
-    /**
-     *  HandleUpdateCompleteL
-     *  Sends the CCsConversationEntry array to Conversation Server
-     *  @param aConversationEntryLists The object to be used to handle updates 
-     *  from the plugin
-     */
-    virtual void HandleUpdateCompleteL( const RPointerArray<CCsConversationEntry> *aConversationEntryLists) = 0;
-
-    /**
-     *  HandleDeleteCompleteL
-     *  Sends the CCsConversationEntry array to Conversation Server
-     *  @param aConversationEntryLists The object to be used to handle updates 
-     *  from the plugin
-     */
-    virtual void HandleDeleteCompleteL( const RPointerArray<CCsConversationEntry> *aConversationEntryLists) = 0;
-
-    /**
-     * HandleRefreshCompleteL
-     * Notify conversation server to refresh the conversations from this plugin.
-     */
-    virtual void HandleRefreshCompleteL() = 0;
-    
-    /**
-     *  HandleCachingCompleted
-     *  Sends the cache completed status to server
-     */
-    virtual void HandleCachingCompleted() = 0;
-
-    /**
-     *  HandleCachingError
-     *  Sends the error occured during the caching to server
-     */
-    virtual void HandleCachingError(const TInt aError) = 0;
-
-    };
-
-#endif // __M_CS_MSG_OBSERVER__
-
-// End of File

--- a/messagingapp/msgappfw/plugin/plugin.pro	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-TEMPLATE = subdirs
-
-QT -= gui
-
-# Platforms
-SYMBIAN_PLATFORMS = WINSCW ARMV5
-
-# Build.inf rules
-
-symbian {
-    BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
-    "./rom/csmsg.iby             CORE_APP_LAYER_IBY_EXPORT_PATH(csmsg.iby)"
-}
-
-symbian {
-BLD_INF_RULES.prj_mmpfiles = "./group/csmsg.mmp"
-}

--- a/messagingapp/msgappfw/plugin/rom/csmsg.iby	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-#ifndef __CSMSG_IBY__
-#define __CSMSG_IBY__
-
-ECOM_PLUGIN(csmsg.dll, csmsg.rsc)
-
-// csmsg plugin resource
-data=DATAZ_\RESOURCE_FILES_DIR\plugins\csmsg.rsc    RESOURCE_FILES_DIR\plugins\csmsg.rsc
-
-
-#endif // __CSMSG_IBY__

--- a/messagingapp/msgappfw/plugin/rss/csmsg.rss	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
-{
-	// UID for the DLL
-	dll_uid = 0x2002A546;
-	
-	// Declare array of interface info
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			
-			// UID of interface that is implemented
-			interface_uid = 0x2002A545;
-			
-			implementations = 
-				{
-				
-				// Info for all implementations					
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x2002A5B7;
-					version_no         = 1;
-					display_name       = "Message Plugin";
-					default_data       = "CS Plugin";    
-					opaque_data        = ""; 
-					}
-					
-				};
-			}
-		};
-}
-	

--- a/messagingapp/msgappfw/plugin/src/ccsmsg.cpp	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CS Message Plugin main class
- *
-*/
-
-
-// SYSTEM INCLUDES
-#include <mcsplugineventobserver.h>
-
-// USER INCLUDES
-#include "ccsmsg.h"
-#include "ccsmsghandler.h"
-
-// ============================== MEMBER FUNCTIONS ============================
-// ----------------------------------------------------------------------------
-// CCsMsg::NewL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-CCsMsg* CCsMsg::NewL(MCsPluginEventObserver* aObserver)
-    {
-    PRINT ( _L("Enter CCsMsg::NewL") );
-
-    CCsMsg* self = new ( ELeave ) CCsMsg(aObserver);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    PRINT ( _L("End CCsMsg::NewL") );
-
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsg::CCsMsg
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-CCsMsg::CCsMsg(MCsPluginEventObserver* aObserver):iPluginEventObserver (aObserver)
-            {
-            }
-
-// ----------------------------------------------------------------------------
-// CCsMsg::ConstructL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-void CCsMsg::ConstructL()
-    {
-    PRINT ( _L("Enter CCsMsg::ConstructL") );
-    iMsgHandler=CCsMsgHandler::NewL(this);
-    PRINT ( _L("Exit CCsMsg::ConstructL") );
-    }
-// ----------------------------------------------------------------------------
-// CCsMsg::~CCsMsg
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CCsMsg::~CCsMsg()
-    {
-    PRINT ( _L("Enter CCsMsg::~CCsMsg") );
-
-    if(iMsgHandler)
-        delete iMsgHandler;
-    iMsgHandler = NULL;
-
-    PRINT ( _L("End CCsMsg::~CCsMsg") );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleReadCompleteL()
-// Sends the CCsConversationEntry array to Conversation Server
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleReadCompleteL( const RPointerArray<CCsConversationEntry>
-*aConversationEntryLists)
-    {
-    iPluginEventObserver->AddConversations( *aConversationEntryLists );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleUpdateCompleteL()
-// Sends the CCsConversationEntry array to Conversation Server
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleUpdateCompleteL( const RPointerArray<CCsConversationEntry>
-*aConversationEntryLists)
-    {
-    iPluginEventObserver->ModifyConversations( *aConversationEntryLists );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleDeleteCompleteL()
-// Sends the CCsConversationEntry array to Conversation Server
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleDeleteCompleteL( const RPointerArray<CCsConversationEntry>
-*aConversationEntryLists)
-    {
-    iPluginEventObserver->DeleteConversations( *aConversationEntryLists );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleCachingCompleted
-// Sends the cache completed status to server
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleCachingCompleted()
-    {
-    iPluginEventObserver->CachingCompleted();
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleCachingError
-// Sends the error occured during the caching to server
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleCachingError(const TInt aError)
-    {
-    iPluginEventObserver->CachingError(aError);
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::GetConversationsL()
-// This function starts the state machine to fetch msg data from msvserver
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::GetConversationsL()
-    {
-    PRINT ( _L("Enter CCsMsg::GetConversationsL") );
-    //start handler
-    iMsgHandler->StartL();
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsg::HandleRefreshCompleteL
-// Notify server to refresh conversations.
-// -----------------------------------------------------------------------------
-//
-void CCsMsg::HandleRefreshCompleteL()
-    {
-    iPluginEventObserver->RefreshConversations();
-    }
-
-// End of file

--- a/messagingapp/msgappfw/plugin/src/ccsmsghandler.cpp	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,836 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CS Message Handler, This class caches the conversation server
- *                with the message data and also sends run-time updates to the
- *                server with the message data
- *
-*/
-
-
-// USER INCLUDES
-#include "ccsmsghandler.h"
-#include "msgbiouids.h"
-
-// SYSTEM INCLUDES
-#include <smsclnt.h>                   
-#include <mmsclient.h>
-#include <mtclreg.h>
-#include <csmsemailfields.h>
-#include <txtrich.h>
-#include <msvids.h>
-#include <e32const.h>
-#include <SendUiConsts.h>
-#include <pushentry.h> // For services messages
-#include <e32cmn.h>
-
-
-//CONSTANTS
-const TInt KMessageArrayGranularity = 50;
-
-// NOTE:- DRAFT ENTRIES ARE NOT HANDLED IN THE PLUGIN
-
-// ============================== MEMBER FUNCTIONS ============================
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::NewL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-CCsMsgHandler* CCsMsgHandler::NewL(MCsMsgObserver *aMsgObserver)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::NewL") );
-
-    CCsMsgHandler* self = new ( ELeave ) CCsMsgHandler();
-    CleanupStack::PushL( self );
-    self->ConstructL(aMsgObserver);
-    CleanupStack::Pop( self );
-
-    PRINT ( _L("End CCsMsgHandler::NewL") );
-
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::~CCsMsgHandler
-// Destructor
-// ----------------------------------------------------------------------------
-//
-CCsMsgHandler::~CCsMsgHandler()
-    {
-    PRINT ( _L("Enter CCsMsgHandler::~CCsMsgHandler") );
-
-    if(iMsgPluginUtility)
-        {
-        delete iMsgPluginUtility;
-        iMsgPluginUtility = NULL;
-        }
-
-    if(iConverstationEntryList)
-        {
-        iConverstationEntryList->ResetAndDestroy();
-        iConverstationEntryList->Close();
-        delete iConverstationEntryList;
-        iConverstationEntryList = NULL;
-        }
-
-    if(iSmsMtm)
-        {
-        delete iSmsMtm;
-        iSmsMtm = NULL;
-        }
-
-    if(iMmsMtm)
-        {
-        delete iMmsMtm;
-        iMmsMtm = NULL;
-        }
-
-    if(iMtmRegistry)
-        {
-        delete iMtmRegistry;
-        iMtmRegistry = NULL;
-        }
-
-    if(iSession)
-        {
-        delete iSession;
-        iSession = NULL;
-        }
-
-    if ( iRootEntry )
-        {
-        delete iRootEntry;
-        iRootEntry = NULL;
-        }
-
-    if ( iMessages )
-        {
-	    iMessages->Reset();
-        delete iMessages;
-        iMessages = NULL;
-        }
-    
-    if(iMessageArray)
-    {
-        iMessageArray->Reset();
-        iMessageArray->Close();
-        delete iMessageArray;
-        iMessageArray = NULL;
-    }
-
-    PRINT ( _L("End CCsMsgHandler::~CCsMsgHandler") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::ConstructL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-void CCsMsgHandler::ConstructL(MCsMsgObserver *aMsgObserver)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::ConstructL") );
-
-    iMsgObserver = aMsgObserver;
-
-    iSession = CMsvSession::OpenSyncL(*this);
-
-    iMsgPluginUtility = CCsMsgPluginUtility::NewL();
-
-    iConverstationEntryList = new(ELeave)RPointerArray<CCsConversationEntry>();
-
-    iMtmRegistry = CClientMtmRegistry::NewL( *iSession );
-
-    iSmsMtm = static_cast<CSmsClientMtm*>( iMtmRegistry->
-            NewMtmL( KSenduiMtmSmsUid ) );
-
-    iMmsMtm = static_cast<CMmsClientMtm*>( iMtmRegistry->
-            NewMtmL( KSenduiMtmMmsUid ) );
-
-    iState = EReadInbox;
-
-    iMessageArray = new (ELeave)RArray <TMsvId>(KMessageArrayGranularity);
-
-    iMessageCount = 0;
-
-    PRINT ( _L("End CCsMsgHandler::ConstructL") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::CCsMsgHandler
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-//
-CCsMsgHandler::CCsMsgHandler()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::ProcessResultsL()
-// ProcessResultsL fetches results for the searchsort query and
-// updates the CCsServer with the fetched data
-// -----------------------------------------------------------------------------
-//
-void CCsMsgHandler::ProcessResultsL(TMsvEntry entry)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::ProcessResultsL"));
-
-    // Cleanup the conversationEntry List initially.
-    // So that the previous entries not cleaned up in
-    // the event of Leave have been clean up.
-    iConverstationEntryList->ResetAndDestroy();
-
-    RPointerArray<HBufC> addressList;
-
-    // Ignore hidden items during upload
-    if ( entry.Visible() == EFalse )
-        {
-        return;
-        }
-    
-    if ( entry.Parent() == KMsvGlobalInBoxIndexEntryIdValue ||
-         entry.Parent() == KMsvSentEntryIdValue ||
-         entry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue )
-        {
-        iMsgPluginUtility->CreateContactL(iSession, entry, addressList);
-
-        //process entry
-        ExtractAddressesL(entry, ERead, addressList);
-
-        addressList.ResetAndDestroy();	
-        }
-
-    PRINT ( _L("Exit CCsMsgHandler::ProcessResultsL") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::HandleSessionEventL
-// Implemented for MMsvSessionObserver
-// ----------------------------------------------------------------------------
-//
-void CCsMsgHandler::HandleSessionEventL( TMsvSessionEvent aEvent,
-        TAny* aArg1,
-        TAny* aArg2,
-        TAny* /*aArg3*/)
-    {
-    PRINT1 ( _L("Enter CCsMsgHandler::HandleSessionEventL aEvent=%d"),aEvent );
-
-    CMsvEntrySelection* selection=NULL;
-    TMsvId parent;
-
-    //args
-    if(aArg1 == NULL || aArg2 == NULL)
-        {
-        PRINT ( _L("Enter CCsMsgHandler::HandleSessionEventL arguments invalid"));
-        return;
-        }
-
-    //start, processing the event
-    selection= (CMsvEntrySelection*)aArg1;
-    parent = *(TMsvId*)aArg2;
-
-    // Cleanup the conversationEntry List initially.
-    iConverstationEntryList->ResetAndDestroy();
-
-    switch( aEvent )
-        {
-        case EMsvEntriesChanged:
-        case EMsvEntriesMoved:
-            {
-            HandleEventL(selection,parent);
-            }
-            break;
-            
-        case EMsvEntriesDeleted:
-            {
-            if ( parent == KMsvGlobalInBoxIndexEntryIdValue || 
-                 parent == KMsvSentEntryIdValue ||
-                 parent == KMsvGlobalOutBoxIndexEntryIdValue)
-                {
-                for( TInt i=0 ; i < selection->Count() ; i++ )
-                    {
-                    TMsvId id = selection->At( i );
-
-                    //use utility to create conversation entry
-                    CCsConversationEntry *conversationEntry = 
-                    iMsgPluginUtility->CreateConversationEntryL(
-                            NULL,
-                            id,
-                            0,
-                            parent,
-                            NULL,
-                            ECsSendStateUnknown,
-                            ECsAttributeNone,
-                            0);
-                    CleanupStack::PushL(conversationEntry);
-                    iConverstationEntryList->AppendL( conversationEntry );
-                    CleanupStack::Pop(conversationEntry);
-
-                    // call observer interface for each entry
-                    iMsgObserver->HandleDeleteCompleteL(iConverstationEntryList);
-
-                    //cleanup before next iteration
-                    iConverstationEntryList->ResetAndDestroy();
-                    }
-                }
-            }
-            break;
-            
-        case EMsvMediaChanged:
-            iMsgObserver->HandleRefreshCompleteL();
-            break;
-        }
-
-    // Cleanup the conversationEntry List before function exits.
-    iConverstationEntryList->ResetAndDestroy();
-    PRINT ( _L("Exit CCsMsgHandler::HandleSessionEventL") );
-    }
-
-// ---------------------------------------------------------------------
-// CCsMsgHandler::HandleEvent
-// Handle events
-// ---------------------------------------------------------------------
-//
-void CCsMsgHandler::HandleEventL(CMsvEntrySelection* aSelection, TMsvId aParent)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::HandleEvent") );
-    TMsvEntry entry;
-    TMsvId service;
-    TInt error= KErrNone;
-    RPointerArray<HBufC> addressList;
-
-    for( TInt i=0 ; i < aSelection->Count() ; i++ )
-        {
-        error = iSession->GetEntry(aSelection->At(i),service,entry);
-        
-        if ( entry.Visible() == EFalse )
-            {
-            // Do a delete if entry becomes invisible.
-            // e.g) My Nokia registration messages.
-            RPointerArray<CCsConversationEntry>* hiddenEntries =  
-                    new (ELeave) RPointerArray<CCsConversationEntry>();
-            
-            CCsConversationEntry *conversationEntry = 
-                    iMsgPluginUtility->CreateConversationEntryL ( 
-                            NULL,
-                            entry.Id(),
-                            0,
-                            aParent,
-                            NULL,
-                            ECsSendStateUnknown,
-                            ECsAttributeNone,
-                            0 );  
-            CleanupStack::PushL(conversationEntry);
-            hiddenEntries->AppendL( conversationEntry );
-            CleanupStack::Pop(conversationEntry);
-            
-            // Delete at server
-            iMsgObserver->HandleDeleteCompleteL(hiddenEntries);
-            hiddenEntries->ResetAndDestroy();
-            hiddenEntries->Close();
-            delete hiddenEntries;
-            
-            break;
-            }
-        
-        if ( (KErrNone == error) && (IsMtmSupported(entry.iMtm.iUid) ) )
-            {
-            // sent/inbox/Outbox entry
-            if ( aParent == KMsvSentEntryIdValue ||
-                 aParent == KMsvGlobalInBoxIndexEntryIdValue )
-                {
-                // currently server needs number, so getting it from header
-                iMsgPluginUtility->CreateContactL(iSession, entry,
-                        addressList);
-
-                //process entry
-                // entry created in sent already exists, hence an update
-                ExtractAddressesL(entry, EUpdate, addressList);
-
-                addressList.ResetAndDestroy();
-                }  
-                
-            //for drafts and outbox, the entry changes multiple times,
-            // so making a check if entry has changed
-            else if(aParent == KMsvGlobalOutBoxIndexEntryIdValue)
-                {
-                //outbox
-                if(!(iMsgPluginUtility->CompareEntry(iPrevEntry,entry,aParent)))
-                    {
-                    TUint sendState = entry.SendingState();
-                    
-                    // if the entry state is sent, we dont need to process it
-                    // as it is going to appear in sent items
-                    if( ECsSendStateSent != iMsgPluginUtility->GetSendState(entry) )
-                        {
-                        // currently server needs number, so getting it from header
-                        iMsgPluginUtility->CreateContactL(iSession, entry,
-                                addressList);
-                        
-                        //process entry
-                        // entry created in sent already exists, hence an update
-                        ExtractAddressesL(entry, EUpdate, addressList);
-                        
-                        iPrevEntry = entry;
-                        
-                        addressList.ResetAndDestroy();
-                        }
-                    }//end check changed entry
-                }
-            }
-        }//end for loop
-
-    PRINT ( _L("Exit CCsMsgHandler::HandleEvent") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::CreateAndAddEntryL
-// Creates CCsConversationEntry and adds to the list
-// ----------------------------------------------------------------------------
-//
-void CCsMsgHandler::CreateAndAddEntryL(const TDesC& aContact, 
-        const TDesC& aDescription, 
-        const TMsvEntry& aEntry)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::CreateAndAddEntryL") );
-
-    HBufC* contact = NULL;
-    HBufC* sDescription = NULL;
-
-    if (aContact.Length()>0)
-        {
-        contact = aContact.AllocL();
-        CleanupStack::PushL(contact);
-        }
-    if (aDescription.Length()>0)
-        {
-        sDescription = aDescription.AllocL();
-        CleanupStack::PushL(sDescription);
-        }
-
-    //use utility to create conversation entry
-    CCsConversationEntry *conversationEntry = iMsgPluginUtility->CreateConversationEntryL(
-            contact,
-            aEntry.Id(),
-            aEntry.iDate.Int64(),
-            aEntry.Parent(),
-            sDescription,
-            iMsgPluginUtility->GetSendState(aEntry),
-            iMsgPluginUtility->GetMsgAttributes(aEntry),
-            ExtractCsType(aEntry));
-    CleanupStack::PushL(conversationEntry);
-
-    //add to the list
-    iConverstationEntryList->AppendL( conversationEntry );
-    CleanupStack::Pop(conversationEntry);
-
-    // cleanup
-    if (sDescription)
-        {
-        CleanupStack::PopAndDestroy(sDescription);
-        }
-    if (contact)
-        {
-        CleanupStack::PopAndDestroy(contact);
-        }
-
-    PRINT ( _L("Exit CCsMsgHandler::CreateAndAddEntryL") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::ProcessEntryL
-// Creates CCsConversationEntry and adds to the list
-// ----------------------------------------------------------------------------
-//
-void CCsMsgHandler::ProcessEntryL( TEventType aEvent, const TDesC& aContact, 
-        const TDesC& aDescription, const TMsvEntry& aEntry)
-    {
-    PRINT ( _L("Enter CCsMsgHandler::ProcessEntryL") );
-
-    // create and add entry to the list
-    CreateAndAddEntryL(aContact,aDescription,aEntry);
-
-    // call cs observer interface for each entry
-    switch(aEvent)
-        {
-        case ERead:
-            {
-            iMsgObserver->HandleReadCompleteL(iConverstationEntryList);
-            }
-            break;
-        case EUpdate:
-            {
-            iMsgObserver->HandleUpdateCompleteL(iConverstationEntryList);
-            }
-            break;
-        }
-
-    // Cleanup the conversationEntry List, as we are just sending one entry at a time
-    iConverstationEntryList->ResetAndDestroy();
-
-    PRINT ( _L("Exit CCsMsgHandler::ProcessEntryL") );
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgHandler::ExtractAddressL
-// Extracts the addresses in the to field and updates them to server
-// ----------------------------------------------------------------------------
-//
-void CCsMsgHandler::ExtractAddressesL( 
-        TMsvEntry aEntry, 
-        TEventType aEvent, 
-        RPointerArray<HBufC>& addressList )
-    {
-    PRINT ( _L("Enter CCsMsgHandler::ExtractAddressesL") );
-
-    // For SMS read the whole body.
-    // For bio type SMS read the iDescription
-    // For other message types read the iDescription
-    // Note: After the LoadMessageL() the iDescription is getting 
-    // deleted so need to make a copy before that.
-    TPtrC description;
-    HBufC* tmpBuffer = NULL;
-
-    if ( (aEntry.iBioType && 
-	      aEntry.iBioType != KUidMsgSubTypeMmsAudioMsg.iUid ) || 
-		  aEntry.iMtm == KSenduiMtmBtUid ) 
-        {
-        tmpBuffer = aEntry.iDescription.AllocL();
-        description.Set( tmpBuffer->Des() );         
-        }    
-    else if ( aEntry.iMtm == KSenduiMtmSmsUid )  
-        {
-        iSmsMtm->SwitchCurrentEntryL( aEntry.Id() );
-        iSmsMtm->LoadMessageL();
-            
-        CRichText& body = iSmsMtm->Body();
-        TInt smsLength = body.DocumentLength();      
-        tmpBuffer = HBufC::NewL(smsLength);
-        TPtr ptr(tmpBuffer->Des());
-        body.Extract(ptr, 0);
-        description.Set( tmpBuffer->Des() );  
-        }
-    else if ( aEntry.iMtm == KSenduiMtmMmsUid  || 
-	          aEntry.iMtm == KSenduiMMSNotificationUid)  
-        {
-        tmpBuffer = aEntry.iDescription.AllocL();
-        description.Set( tmpBuffer->Des() );         
-
-        iMmsMtm->SwitchCurrentEntryL( aEntry.Id() );
-        iMmsMtm->LoadMessageL();
-
-        // Handle addresses
-        if ( aEntry.Parent() == KMsvGlobalInBoxIndexEntryIdValue )
-            {
-            HBufC* address = iMmsMtm->Sender().AllocL();
-            addressList.Append(address);
-            }
-        else if ( aEntry.Parent() == KMsvSentEntryIdValue ||
-                  aEntry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue )
-            {
-            const CMsvRecipientList& addresses = iMmsMtm->AddresseeList();
-            TInt count = addresses.Count();
-
-            for( TInt i = 0; i < count; i++)
-                {
-                HBufC* address = addresses[i].AllocL();
-                TPtrC pureAddress = iMsgPluginUtility->PureAddress(*address);
-                HBufC* address1 = pureAddress.AllocL();
-                addressList.Append(address1);
-                delete address;
-                }
-            }
-        }
-    else
-        {
-        return;
-        }
-
-    if ( addressList.Count() > 0 )
-        {
-        for ( int i = 0; i < addressList.Count(); i++ )
-            {
-            HBufC* address = addressList[i];
-            ProcessEntryL(aEvent, *address, description, aEntry);
-            }
-        }
-    else
-        {
-        // Unknown
-        ProcessEntryL(aEvent, KNullDesC, description, aEntry);       
-        }
-
-    delete tmpBuffer;
-
-    PRINT ( _L("Exit CCsMsgHandler::ExtractAddressesL") );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::CompareOrder()
-// Method for determining the sorting behaviour of RArray of TMsvId's  
-// -----------------------------------------------------------------------------
-//
-static TInt CompareOrder(const TMsvId& aFirst, const TMsvId& aSecond)
-    {
-    return aSecond - aFirst;
-    }
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::UploadMsgL()
-// State machine to upload all messages 
-// -----------------------------------------------------------------------------
-//
-TInt CCsMsgHandler::UploadMsgL() 
-{
-    switch ( iState ) 
-    {
-        case EReadInbox:
-        {
-            iRootEntry = iSession->GetEntryL(KMsvGlobalInBoxIndexEntryId);
-
-            // Set sort order
-            TMsvSelectionOrdering order;
-            order.SetSorting(EMsvSortById);
-            iRootEntry->SetSortTypeL(order);
-
-            iMessages = iRootEntry->ChildrenL();
-            iMessageCount = iRootEntry->Count();
-            if(iMessageCount)
-            {
-                for(int i = 0; i < iMessageCount; i ++)
-                {
-                    iMessageArray->Append(iMessages->At(i));
-                }
-            }
-
-            iState = EReadSent;
-            CleanupL();              
-
-            return 1;
-        }
-
-        case EReadSent:
-        {
-            iRootEntry = iSession->GetEntryL(KMsvSentEntryId);
-
-            // Set sort order
-            TMsvSelectionOrdering order;
-            order.SetSorting(EMsvSortById);
-            iRootEntry->SetSortTypeL(order);
-
-            iMessages = iRootEntry->ChildrenL();    
-            iMessageCount = iRootEntry->Count();
-            if(iMessageCount)
-            {
-                for(int i = 0; i < iMessageCount; i++ )
-                {
-                    iMessageArray->Append(iMessages->At(i));
-                }
-            }
-
-            iState = EReadOutbox;
-            CleanupL();
-
-            return 1;
-        }
-
-        case EReadOutbox:
-        {
-            iRootEntry = iSession->GetEntryL(KMsvGlobalOutBoxIndexEntryId);
-
-            // Set sort order
-            TMsvSelectionOrdering order;
-            order.SetSorting(EMsvSortById);
-            iRootEntry->SetSortTypeL(order);
-
-            iMessages = iRootEntry->ChildrenL();  
-            iMessageCount = iRootEntry->Count();
-
-            if(iMessageCount)
-            {
-                for(int i = 0; i < iMessageCount; i ++)
-                {
-                    iMessageArray->Append(iMessages->At(i));
-                }
-                iMessageCount=0;
-            }
-            iState = ESortEntries;
-            CleanupL();
-
-            return 1;
-        }
-        case ESortEntries:
-        {
-             //Sort the elements in the array by descending order of TMsvId's
-            TLinearOrder<TMsvId> order(CompareOrder);
-            iMessageArray->Sort(order);
-            iState = EProcessEntries;
-            return 1;
-        }
-        
-        case EProcessEntries:
-        { 
-            //Process one entry at a time in sequence
-            //Process the first element in the array on each call, till the end
-            if(iMessageArray->Count())
-            {
-                ProcessResultsL(iSession->GetEntryL(iMessageArray->operator[](0))->Entry());
-                iMessageArray->Remove(0);
-            }
-            else
-            {
-                iMsgObserver->HandleCachingCompleted();
-                return 0; //DONE 
-            }
-
-            iState = EProcessEntries;
-            return 1; 
-        }
-    }
-    return 0;    
-}
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::UploadMsg()
-// CIdle callback 
-// -----------------------------------------------------------------------------
-//
-TInt CCsMsgHandler::UploadMsg(TAny* aArg)
-    {
-    CCsMsgHandler* handler = (CCsMsgHandler*) aArg; 
-    TInt ok = 0;
-    TRAPD(err, ok = handler->UploadMsgL());
-    return ((err == KErrNone) && ok);
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::StartL()
-// This function starts the state machine to fetch sms data from msvserver
-// -----------------------------------------------------------------------------
-//
-void CCsMsgHandler::StartL()
-    {
-    PRINT ( _L("Enter CCsMsgHandler::Start") );
-
-    iState = EReadInbox;
-    TCallBack callback = TCallBack(UploadMsg, (TAny*) this);
-    iIdle = CIdle::NewL(CActive::EPriorityLow);
-    iIdle->Start(callback);
-
-    PRINT ( _L("End CCsMsgHandler::Start") );
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::CleanupL()
-// Helper function for state machine cleanup
-// -----------------------------------------------------------------------------
-//
-void CCsMsgHandler::CleanupL()
-    {
-    if ( iRootEntry )
-        {
-        delete iRootEntry;
-        iRootEntry = NULL;
-        }
-
-    if ( iMessages )
-        {
-	    iMessages->Reset();
-        delete iMessages;
-        iMessages = NULL;
-        }
-
-    iMessageCount = 0;     
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::IsMtmSupported()
-// 
-// -----------------------------------------------------------------------------
-//
-TBool CCsMsgHandler::IsMtmSupported(long uid)	
-    {
-    if ( KSenduiMtmSmsUidValue == uid || \
-         KSenduiMtmBtUidValue == uid || \
-         KSenduiMtmMmsUidValue == uid || \
-         KSenduiMtmBioUidValue == uid  || \
-         KSenduiMMSNotificationUidValue == uid || \
-         KUidMtmWapPush ==  TUid::Uid(uid) )
-        {
-        return ETrue;
-        }	
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CCsMsgHandler::ExtractCsType()
-// Extracts the Message type based on the MTM Uid 
-// -----------------------------------------------------------------------------
-//
-TCsType CCsMsgHandler::ExtractCsType( const TMsvEntry& aEntry)
-    {
-    TCsType type = ECsUnknown;
-    switch(aEntry.iMtm.iUid)
-        {
-        case KSenduiMtmSmsUidValue:            
-            type = ECsSMS;
-            if (aEntry.iBioType == KMsgBioUidVCard.iUid)
-                {
-                type = ECsBioMsg_VCard;
-                }
-            break;
-        case KSenduiMtmBtUidValue:
-            type = ECsBlueTooth;
-            break;
-        case KSenduiMtmMmsUidValue:        
-           if(aEntry.iBioType == KUidMsgSubTypeMmsAudioMsg.iUid)
-                {
-                type = ECsAudio;
-                }
-            else
-                {
-                type = ECsMMS;
-                }
-            break;
-        case KSenduiMMSNotificationUidValue:            
-            type = ECsMmsNotification;
-            break;
-        case KSenduiMtmBioUidValue:
-            { 
-            type = ECsBioMsg; 
-            
-            // based on the biotype uid set message type
-            if(aEntry.iBioType == KMsgBioUidRingingTone.iUid)
-                {
-                type = ECsRingingTone;
-                }
-            else if(aEntry.iBioType == KMsgBioProvisioningMessage.iUid)
-                {
-                type = ECsProvisioning;
-                }
-		    else if (aEntry.iBioType == KMsgBioUidVCard.iUid)
-                {
-                type = ECsBioMsg_VCard;
-                }
-            else if (aEntry.iBioType == KMsgBioUidVCalendar.iUid)
-                {
-                type = ECsBioMsg_VCal;
-                }            
-            }
-            break;
-        default:
-            type = ECsUnknown;           
-	    	break;
-        }
-    return (type);  
-    }
-// End of file
-

--- a/messagingapp/msgappfw/plugin/src/ccsmsgpluginutility.cpp	Mon May 03 12:29:07 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,462 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CS Msg Plugin Utility class
- *
-*/
-
-
-// USER INCLUDES
-#include "ccsmsgpluginutility.h"
-#include "ccsdebug.h"
-
-//SYSTEM INCLUDES
-#include <csmsemailfields.h>
-#include <e32cmn.h>
-#include <SendUiConsts.h>
-#include <pushentry.h>
-#include <msvids.h>
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::NewL
-// Two Phase Construction
-// ----------------------------------------------------------------------------
-CCsMsgPluginUtility* CCsMsgPluginUtility::NewL( )
-    {
-    CCsMsgPluginUtility* self = new ( ELeave ) CCsMsgPluginUtility();
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::~CCsMsgPluginUtility
-// Destructor
-// ----------------------------------------------------------------------------
-CCsMsgPluginUtility::~CCsMsgPluginUtility()
-    {
-    }
-
-// ----------------------------------------------------------------------------
-// Constructor
-// ----------------------------------------------------------------------------
-CCsMsgPluginUtility::CCsMsgPluginUtility()
-    {
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::CreateConversationEntryL
-// Creates CCsConversationEntry
-// ----------------------------------------------------------------------------
-//
-CCsConversationEntry* CCsMsgPluginUtility::CreateConversationEntryL(
-        const HBufC* aContact,
-        TMsvId aEnryId,
-        TInt64 aTimeStamp,
-        TMsvId aDir,
-        const HBufC* aDescription,
-        TCsSendState aSendState,
-        TCsAttribute aMsgAttribs,
-        TCsType aCsType) const 
-    {
-    // create CCsConversationEntry
-    CCsConversationEntry *conversationEntry = CCsConversationEntry::NewL();
-    CleanupStack::PushL(conversationEntry);
-        
-    //set the values
-    conversationEntry->SetContactL( *aContact );
-    conversationEntry->SetEntryId( aEnryId );
-    conversationEntry->SetTimeStampL( aTimeStamp );
-    conversationEntry->SetDescriptionL( *aDescription );
-    conversationEntry->SetConversationDir( MapDirection( aDir ) );
-    conversationEntry->SetSendState( aSendState );
-    conversationEntry->ChangeAttributes( aMsgAttribs, ECsAttributeNone );
-    conversationEntry->SetType(aCsType);
-        
-    //pop and return
-    CleanupStack::Pop(conversationEntry);
-    return conversationEntry;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::MapDirection
-// Map the msg direction to TCsDirection
-// ----------------------------------------------------------------------------
-//
-TCsDirection CCsMsgPluginUtility::MapDirection( TMsvId aDir ) const
-    {
-    TCsDirection direction = ECsDirectionUnknown;    
-    switch(aDir)
-        {
-        case KMsvSentEntryIdValue:
-        case KMsvGlobalOutBoxIndexEntryIdValue:  // Fall-through
-        case KMsvDraftEntryIdValue:
-            {
-            direction = ECsDirectionOutgoing;
-            break;
-            }
-        case KMsvGlobalInBoxIndexEntryIdValue:
-            {
-            direction = ECsDirectionIncoming;
-            break;
-            }
-        }
-    return direction;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::GetMsgAttributes
-// Returns the message attributes as a bitmask of TCsAttribute values.
-// ----------------------------------------------------------------------------
-//
-TUint16 CCsMsgPluginUtility::GetMsgAttributes( const TMsvEntry& aEntry )
-    {
-    TUint16 msgAttributes = ECsAttributeNone;
-    TMsvId parent = aEntry.Parent();
-
-    // New
-    if( aEntry.New() )
-        {
-        msgAttributes |= ECsAttributeNew;
-        }
-
-    // Drafts
-    if( KMsvDraftEntryIdValue == parent )
-        {
-        msgAttributes |= ECsAttributeDraft;
-        }
-
-    // Attachments
-    if( aEntry.Attachment() )
-        {
-        msgAttributes |= ECsAttributeAttachment;
-        }
-
-    // Priority
-    TMsvPriority priority = aEntry.Priority();
-    if( EMsvHighPriority == priority )
-        {
-        msgAttributes |= ECsAttributeHighPriority;
-        }
-    else if( EMsvLowPriority == priority )
-        {
-        msgAttributes |= ECsAttributeLowPriority;
-        }
-
-    // Read/Unread
-    if( KMsvGlobalInBoxIndexEntryIdValue == parent )
-        {
-        if( EFalse == aEntry.Unread() )
-            {
-            // Read
-            msgAttributes &= ~ECsAttributeUnread;
-            }
-        else
-            {
-            // Unread
-            msgAttributes |= ECsAttributeUnread;
-            }
-        }
-
-    // Sent
-    if( KMsvSentEntryIdValue == parent )
-        {
-        msgAttributes |= ECsAttributeSent;
-        }
-
-    return msgAttributes;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::GetSendState
-// Returns the send status.
-// ----------------------------------------------------------------------------
-//
-TCsSendState CCsMsgPluginUtility::GetSendState( const TMsvEntry& aContext )
-    {
-    TUint sendingState = aContext.SendingState();
-    TCsSendState convSendState = ECsSendStateUnknown;
-
-    switch( sendingState )
-        {
-        case KMsvSendStateUponRequest:
-            {
-            convSendState = ECsSendStateUponRequest;
-            break;
-            }
-        case KMsvSendStateWaiting:
-            {
-            convSendState = ECsSendStateWaiting;
-            break;
-            }
-        case KMsvSendStateSending:
-            {
-            convSendState = ECsSendStateSending;
-            break;
-            }
-        case KMsvSendStateScheduled:
-            {
-            convSendState = ECsSendStateScheduled;
-            break;
-            }
-        case KMsvSendStateResend:
-            {
-            convSendState = ECsSendStateResend;
-            break;
-            }
-        case KMsvSendStateSuspended:
-            {
-            convSendState = ECsSendStateSuspended;
-            break;
-            }
-        case KMsvSendStateFailed:
-            {
-            convSendState = ECsSendStateFailed;
-            break;
-            }
-        case KMsvSendStateSent:
-            {
-            convSendState = ECsSendStateSent;
-            break;
-            }
-        case KMsvSendStateNotApplicable:
-            {
-            convSendState = ECsSendStateNotApplicable;
-            break;
-            }
-        }
-    return convSendState;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::GetContact
-// Get the Contact (From/To) of the message
-// ----------------------------------------------------------------------------
-//
-void CCsMsgPluginUtility::CreateContactL(CMsvSession* aSession,
-					const TMsvEntry& aEntry,
-					RPointerArray<HBufC>& addressList)
-	{
-    if ( aEntry.iMtm.iUid == KSenduiMtmSmsUidValue )      
-        {
-        CPlainText* nullString = CPlainText::NewL();
-        CleanupStack::PushL( nullString );
-    
-        CSmsHeader* smsHeader = NULL;
-        if ( aEntry.Parent() == KMsvGlobalInBoxIndexEntryIdValue ) 
-            {
-            smsHeader = CSmsHeader::NewL( CSmsPDU::ESmsDeliver, *nullString );
-            }
-        else if ( aEntry.Parent() == KMsvSentEntryIdValue || 
-                  aEntry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue )
-            {
-            smsHeader = CSmsHeader::NewL( CSmsPDU::ESmsSubmit, *nullString );
-            }
-        else
-            {
-            CleanupStack::PopAndDestroy(nullString);
-            return;
-            }
-        CleanupStack::PushL( smsHeader );
-    
-        CMsvEntry *cEntry = CMsvEntry::NewL(*aSession,aEntry.Id(),
-            TMsvSelectionOrdering() );
-        CleanupStack::PushL( cEntry );
-    
-        CMsvStore* store = cEntry->ReadStoreL();
-        CleanupStack::PushL(store);
-    
-        TRAPD(err, smsHeader->RestoreL( *store ));    
-        if ( err == KErrNone )
-            {
-            if ( aEntry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue ||
-                 aEntry.Parent() == KMsvSentEntryIdValue )
-                {
-                const CArrayPtrFlat<CSmsNumber>& rcpts = smsHeader->Recipients();
-                const CSmsNumber& rcpt = *rcpts.At(0);
-
-                HBufC* fromAddress = (rcpt.Address()).AllocL();
-                addressList.Append(fromAddress);
-                }
-            else
-                {
-                // Check and add if any email addresses                
-                const CSmsEmailFields& emailFields = smsHeader->EmailFields();
-                if( emailFields.HasAddress() )
-                    {                  
-                    TPtrC name;
-                    TPtrC address;
-
-                    const MDesCArray& emailRecipients = emailFields.Addresses();
-                    for( TInt id = 0; id < emailRecipients.MdcaCount(); id++ )
-                        {
-                        NameAndAddress( emailRecipients.MdcaPoint( id ), name, address);
-                        
-                        // Add address to list
-                        HBufC* addressBuf = HBufC::NewL( address.Length() );
-                        TPtr addressPtr( 0, 0 );
-                        addressPtr.Set( addressBuf->Des() );
-                        addressPtr.Copy( address );
-                        addressList.Append(addressBuf);
-                        }
-                    }
-                else
-                    { 
-                    HBufC* fromAddress = (smsHeader->FromAddress()).AllocL();   
-                    
-                    // Try iDetails if empty
-                    if ( fromAddress->Length() == 0 )
-                        fromAddress = aEntry.iDetails.AllocL();
-                    
-                    addressList.Append(fromAddress);
-                    }
-                }
-            }
-        
-        // Cleanup 
-        CleanupStack::PopAndDestroy(store);
-        CleanupStack::PopAndDestroy(cEntry);
-        CleanupStack::PopAndDestroy(smsHeader);
-        CleanupStack::PopAndDestroy(nullString);
-        }
-    else if ( aEntry.iMtm.iUid == KSenduiMtmBtUidValue  ||  
-			  aEntry.iMtm.iUid == KSenduiMtmBioUidValue ||
-			  aEntry.iMtm == KUidMtmWapPush )
-        {
-        HBufC* fromAddress = aEntry.iDetails.AllocL();
-        addressList.Append(fromAddress);
-        }
-    }
-
-// ---------------------------------------------------------
-// CCsMsgPluginUtility::CompareEntry
-//
-// ---------------------------------------------------------
-TBool CCsMsgPluginUtility::CompareEntry( const TMsvEntry& aOldContext,  
-	const TMsvEntry& aNewContext, TMsvId aDir ) const
-    {
-    if(	(aOldContext.Id() == aNewContext.Id()) 
-        &&   (aOldContext.Parent() == aNewContext.Parent())
-        &&   (0 == aOldContext.iDescription.Compare(aNewContext.iDescription)) )
-    {
-    // incase of outbox, check sending state also
-    if(aDir == KMsvGlobalOutBoxIndexEntryIdValue)
-        {
-        if(aOldContext.SendingState() == aNewContext.SendingState())
-            return ETrue;
-        else
-            return EFalse;
-        }
-    return ETrue;
-    }
-
-    return EFalse;
-    }
-
-// ----------------------------------------------------------------------------
-// CCsMsgPluginUtility::NameAndAddress
-// Extracts name and address from the aMsvAddress
-// which is of the form name<address>
-// ----------------------------------------------------------------------------
-void CCsMsgPluginUtility::NameAndAddress( const TPtrC& aMsvAddress, 
-				TPtrC& aName, 
-				TPtrC& aAddress )
-    {
-    // For address information separation (start)
-    const TUint KMsgSmsAddressStartChar         ('<');
-
-    // For address information separation (end)
-    const TUint KMsgSmsAddressEndChar           ('>');
-
-    TInt addressStart = aMsvAddress.LocateReverse( KMsgSmsAddressStartChar );
-    TInt addressEnd = aMsvAddress.LocateReverse( KMsgSmsAddressEndChar );
-
-    if ( addressStart != KErrNotFound && addressEnd != KErrNotFound
-            && addressEnd > addressStart )
-        {
-        // verified address, will be used as selected from contacts manager
-        aName.Set( aMsvAddress.Ptr(), addressStart );
-        aAddress.Set(
-                aMsvAddress.Mid( addressStart + 1 ).Ptr(),
-                ( addressEnd - addressStart ) -1 );
-        if ( !aAddress.Length())
-            {
-            aAddress.Set( aName );
-            aName.Set( KNullDesC ); // empty string
-            }
-        }
-    else
-        {
-        // unverified string, will be used as entered in the header field
-        aName.Set( KNullDesC ); // empty string
-        aAddress.Set( aMsvAddress.Ptr(), aMsvAddress.Length() ); // a whole string to address
-        }
-
-    if ( aName.CompareF( aAddress ) == 0 )
-        {
-        aName.Set( KNullDesC ); // empty string
-        }
-    }
-
-// ---------------------------------------------------------
-// CCsMsgPluginUtility::PureAddress
-// Extract the phone number for MMS
-// ---------------------------------------------------------
-//
-TPtrC CCsMsgPluginUtility::PureAddress( const TDesC& aAddress )
-    {
-    _LIT( KOpen, "<" );
-    _LIT( KClose, ">" );
-	
-    // syntax is :
-    // <alias><separator1><pure_address><separator2> |
-    // <pure_address>
-    TInt firstPos = 0;
-    TInt lastPos = 0;
-    TInt length = aAddress.Length();
-    TInt sepaLen1 = KOpen().Length();
-    TInt sepaLen2 = KClose().Length();
-    TInt firstSeparatorPosition = 0;
-
-    while( firstSeparatorPosition >= 0 )
-        {
-        firstSeparatorPosition = aAddress.Mid( firstPos ).Find( KOpen );
-        if ( firstSeparatorPosition >= 0 )
-            {
-            firstPos += firstSeparatorPosition + sepaLen1;
-            }
-        }
-    if ( firstPos <= 0 )
-        {
-        // No alias
-        return aAddress;
-        }
-
-    // Check if the second separator ends the address
-    TPtrC last = aAddress.Right( sepaLen2 );
-    lastPos = length - sepaLen2;
-
-    if ( !last.Compare( KClose ) )
-        {
-        // Alias part found
-        if ( lastPos > firstPos )
-            {
-            return aAddress.Mid( firstPos, lastPos - firstPos );
-            }
-        }
-    // No alias defined - return the original string as pure address
-    // If syntax is weird, namely 
-    // alias <>
-    // with nothing between the separators, we return the original string as is
-    return aAddress;
-    }
-
-//End of File