--- a/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -167,7 +167,12 @@
 void CImapOpFetchBody::FetchBodyL(TRequestStatus& aRequestStatus, const TMsvId aPart, const TImImap4GetPartialMailInfo& aGetPartialMailInfo)
 	{
 	__LOG_TEXT(iSession->LogId(), "CImapOpFetchBody::FetchBodyL(): fetching message");
-
+	
+	if(IsActive())
+	{
+	    Cancel();
+	}
+	
 	iRequestedPart=aPart;
 	iGetPartialMailInfo=aGetPartialMailInfo;
 	Queue(aRequestStatus);
@@ -1408,6 +1413,7 @@
 		{
 		// Set vCard flag in message
 		aMessage.SetVCard(ETrue);
+		aMessage.iType=KUidMsvEmailTextEntry;
 		}
 	// text/x-vcalendar
 	else if (aMime.ContentSubType().CompareF(KMIME_VCALENDAR)==0)
@@ -1415,6 +1421,7 @@
 		// Set vCalendar flag in message
 		aMessage.SetVCalendar(ETrue);
 		iIsVCalendar = ETrue;
+		aMessage.iType=KUidMsvEmailTextEntry;
 		}
 	// text/calendar
 	else if (aMime.ContentSubType().CompareF(KMIME_ICALENDAR)==0)
@@ -1422,6 +1429,7 @@
 		// Set iCalendar flag in message
 		aMessage.SetICalendar(ETrue);
 		iIsICalendar = ETrue;
+		aMessage.iType=KUidMsvEmailTextEntry;
 		}
 	else
 		aMessage.iType=KUidMsvEmailTextEntry;
@@ -1502,6 +1510,7 @@
 	TPtrC8 dispositionName = aBodyStructure->ExtDispositionName();
 	if (dispositionName.Size() != 0)
 		{
+		aMime.SetContentDispositionL(dispositionName);	
 		__LOG_FORMAT((iSession->LogId(), "    adding disp name: %S", &dispositionName));
 		aMime.ContentDispositionParams().AppendL(dispositionName);
 		aMime.ContentDispositionParams().AppendL(KNullDesC8);

--- a/email/imap4mtm/imapsession/inc/cimapfetchbody.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/imap4mtm/imapsession/inc/cimapfetchbody.h	Thu Jul 22 16:32:06 2010 +0100
@@ -182,6 +182,7 @@
 	TBool iSendFetch;
 	// When server responses with no body length, iUnexpectedFormat is set to ETrue.
 	TBool iUnexpectedFormat;
+	TBool iCancelled;
 	};
 
 #endif // __CIMAPFETCHBODY_H__

--- a/email/imap4mtm/imapsession/src/cimapfetchbody.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/imap4mtm/imapsession/src/cimapfetchbody.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -66,7 +66,8 @@
 	iImapMailStore(aImapMailStore),
 	iParent(aParent),
 	iFetchBodyResponse(aFetchBodyResponse),
-	iSendFetch(ETrue)
+	iSendFetch(ETrue),
+	iCancelled(EFalse)
 	{
 	}
 	
@@ -86,7 +87,7 @@
 void CImapFetchBody::Cancel()
 	{
 	__LOG_TEXT(iLogId, "CImapFetchBody::Cancel()"); // Overrides CImapCommand::Cancel()
-	
+	iCancelled = ETrue;
 	iImapMailStore.CancelRequest(*this);
 	CImapCommand::Cancel();
 	}
@@ -226,6 +227,10 @@
 	{	
 	iOutStream=&aStream;
 	
+	if(iCancelled)
+	{
+	   return; 
+	}
 #if (defined SYMBIAN_EMAIL_CAPABILITY_SUPPORT)		
 	// check for BINARY capability
 	const CImapCapabilityInfo& capabilityInfo = iParent.CapabilityInfo();

--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Thu Jul 22 16:32:06 2010 +0100
@@ -19,6 +19,7 @@
 /**
  @file
 */
+#include <platform_paths.hrh>
 
 TARGET                  imcm.dll
 TARGETPATH              /system/libs
@@ -47,10 +48,10 @@
 LIBRARY			centralrepository.lib tzclient.lib numberconversion.lib
 
 SOURCEPATH              .
-START RESOURCE	IMCM.rss
-TARGETPATH resource/messaging
+START RESOURCE  imcm.rss
 LANG	SC
 HEADER
+TARGETPATH      resource/messaging
 END
 
 #include                "../../../../../../mw/messagingmw/messagingfw/msgtests/group/msgopt.mph"
@@ -70,7 +71,7 @@
 #endif	
 
 
-
+OS_LAYER_SYSTEMINCLUDE
 
 
 

--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Thu Jul 22 16:32:06 2010 +0100
@@ -16,6 +16,8 @@
 //
 
 #include "imcm.rls"
+#include <imcm.loc>
+#include <imcm_default_charset.loc>
 
 #define PARABREAK	8233
 #define TABCHAR		9
@@ -37,12 +39,12 @@
 
 RESOURCE LBUF forward_formatting_string
 	{
-	buffer=STRING_forward_formatting_string1;
+	buffer=qtn_mail_fwd"%S";
 	}
 
 RESOURCE LBUF reply_formatting_string
 	{
-	buffer=STRING_reply_formatting_string1;
+	buffer=qtn_mail_re"%S";
 	}
 
 RESOURCE LBUF receipt_formatting_string
@@ -52,17 +54,17 @@
 
 RESOURCE LBUF email_address_formatting_string
 	{
-	buffer=STRING_email_address_formatting_string1;
+	buffer="%S <%S>";//STRING_email_address_formatting_string1;
 	}        
 
 // Headers used in Body for Forwarded/Replyed message
 
 RESOURCE LBUF forward_body_header
 	{
-	buffer=STRING_forward_body_header1
-			STRING_forward_body_header2
-			STRING_forward_body_header3
-			STRING_forward_body_header4;
+	buffer=<PARABREAK><PARABREAK>qtn_mail_forward_separator<PARABREAK>
+			qtn_mail_copy_subject" %S"<PARABREAK>
+			qtn_mail_copy_sender" %S"<PARABREAK>
+			qtn_mail_copy_date" %S"<PARABREAK>;
 	}
 
 RESOURCE LBUF forward_body_header_toonly
@@ -95,10 +97,10 @@
 
 RESOURCE LBUF reply_body_header
 	{
-	buffer=STRING_reply_body_header1
-			STRING_reply_body_header2
-			STRING_reply_body_header3
-			STRING_reply_body_header4;
+	buffer=<PARABREAK><PARABREAK>qtn_mail_reply_separator<PARABREAK>
+			qtn_mail_copy_subject" %S"<PARABREAK>
+			qtn_mail_copy_sender" %S"<PARABREAK>
+			qtn_mail_copy_date" %S"<PARABREAK>;
 	}
 
 RESOURCE LBUF reply_body_header_toonly
@@ -174,28 +176,29 @@
 	}
 
 // List of available character sets in Charconv.h
+// at some point flags should be removed and only qtn_default_charset be used for all builds.
 RESOURCE L8BUF default_system_charset
-	{
-	buffer=STRING_default_system_charset;
-	}
+    {
+    buffer = qtn_default_email_charset;
+    }
 
 // If this value is set to 1, 8 bit body text data and character set information will be stored
 // when downloaded via IMPS and POPS.  The body text will be decoded to the correct character set
 // when opened.  If this value is set to 0, the body text is decoded and stored when downloading.
 RESOURCE INT8 store_8bit_body_text
 	{
-	value = 0;
+	value = 1;
 	}
 
 // Used for localised date time formatting for email forward and reply body headers
 RESOURCE LBUF body_header_datetime_format
 	{
-	buffer=STRING_body_header_datetime_format;
+	buffer="%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:3%+B"; //STRING_body_header_datetime_format;
 	}
 
 RESOURCE LBUF partial_download_footer_message
 	{
-	buffer=STRING_partial_download_footer_message;
+	buffer=qtn_mail_rest_of_mail_not_fetched;
 	}
 
 // If this value is set to 1,body text data  will be stored when downloaded via IMPS and POPS using chunk storage option.  
@@ -203,5 +206,5 @@
 
 RESOURCE INT8 store_plain_body_text
 	{
-	value = 1;
+	value = 0;
 	}

--- a/email/pop3andsmtpmtm/clientmtms/group/bld.inf	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/group/bld.inf	Thu Jul 22 16:32:06 2010 +0100
@@ -14,6 +14,7 @@
 // bld.inf
 //
 
+#include <platform_paths.hrh>
 PRJ_EXPORTS
 
 ../inc/MIUTHDR.H 	SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(miuthdr.h)
@@ -64,6 +65,13 @@
 #endif
 
 
+//IBY exports
+../rom/gtemailmtmResources.iby  LANGUAGE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtmResources.iby)
+../rom/gtemailmtm.hby  CORE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtm.hby)
+
+// export localised loc file
+../loc/imcm.loc  OS_LAYER_LOC_EXPORT_PATH(imcm.loc)
+../loc/imcm_default_charset.loc  OS_LAYER_LOC_EXPORT_PATH(imcm_default_charset.loc)
 PRJ_MMPFILES
 
 IMCM.mmp

--- a/email/pop3andsmtpmtm/clientmtms/inc/MIUTRSLV.H	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/inc/MIUTRSLV.H	Thu Jul 22 16:32:06 2010 +0100
@@ -130,6 +130,7 @@
 private:
 	void DoRunL();
 	void DoComplete(TInt& );
+	void DoCancel();
 
 	void CheckCurrentEntryL();
 	inline TBool CheckContentDetailsL(const TDesC& aContentLocation, const TDesC& aContentId);
@@ -210,6 +211,7 @@
 
 	void DoRunL();
 	void DoComplete(TInt& );
+	void DoCancel();
 	inline void SetStartParameterL();
 private:
 	CMsvEntry& iCurrentEntry;

--- a/email/pop3andsmtpmtm/clientmtms/inc/cimfinder.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/inc/cimfinder.h	Thu Jul 22 16:32:06 2010 +0100
@@ -57,7 +57,7 @@
 
 private:
 	void DoRunL();
-
+	void DoCancel();
 	virtual void AddChildEntriesL() = 0;
 	virtual TBool IsRequiredEntryType(TUid aEntryType) const = 0;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/pop3andsmtpmtm/clientmtms/loc/imcm.loc	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2002 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 is a localisation file for imcm.dll
+*     A .loc file is the one and only place where the logical strings
+*     to be localised are defined. 
+* >>>
+* The text between >>> and <<< is just to document the syntax and
+* you can remove it if you like.
+*
+*/
+
+
+
+
+// LOCALISATION STRINGS
+
+// d: Added in the beginning of the subject line when replying
+// l: mce_header_field_pane_t1
+#define qtn_mail_re         "RE: "
+
+// d: Added in the beginning of the subject line when forwarding
+// l: mce_header_field_pane_t1
+#define qtn_mail_fwd         "FWD: "
+
+// d: Text to be inserted into a message when replying
+// d: Inerted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_reply_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_forward_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_subject "Subject:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_sender "Sender:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_date "Date:"
+
+// d: Text to be inserted into a message body if part of message body is filtered out
+// l:none
+#define qtn_mail_rest_of_mail_not_fetched "- - - Retrieve total mail selecting Retrieve from Options list. - - -"
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/pop3andsmtpmtm/clientmtms/loc/imcm_default_charset.loc	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2002 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:  
+*		!!!!!!!LOCALISATION INSTRUCTIONS, IMPORTANT!!!!!!!
+*		These default charsets are used to define correct default charsets for different builds.
+*
+*/
+
+
+
+// d: This is not visible to the user!
+// l: None
+#define qtn_default_email_charset "ISO-8859-1"
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/pop3andsmtpmtm/clientmtms/rom/gtemailmtm.hby	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,9 @@
+#ifndef __GTEMAILMTM_HBY__
+#define __GTEMAILMTM_HBY__
+
+//
+// Moved to gtemailmtmResources.iby
+//
+//data=MULTI_LINGUIFY(RSC DATAZ_\resource\messaging\imcm	resource\messaging\imcm)
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/pop3andsmtpmtm/clientmtms/rom/gtemailmtmResources.iby	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,23 @@
+/*
+* 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:  gtemailmtmResources.iby*
+*/
+
+#ifndef __GTEMAILMTM_RESOURCES_IBY__
+#define __GTEMAILMTM_RESOURCES_IBY__
+
+// Refer to gtemailmtm.hby
+data=DATAZ_\resource\messaging\imcm.rsc                                   resource\messaging\imcm.rsc
+
+#endif
\ No newline at end of file

--- a/email/pop3andsmtpmtm/clientmtms/src/CACHEMAN.CPP	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/src/CACHEMAN.CPP	Thu Jul 22 16:32:06 2010 +0100
@@ -122,6 +122,12 @@
 		}
 	}
 
+void CImFinder::DoCancel()
+    {   
+    CMsgActive::DoCancel();   
+    }
+
+
 CImFinder::CImFinder(CMsvEntry& aEntry) : CMsgActive(EPriorityStandard), 	iCurrentEntry(aEntry)
 	{
 	}

--- a/email/pop3andsmtpmtm/clientmtms/src/CIMPLAINBODYTEXT.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/src/CIMPLAINBODYTEXT.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -468,4 +468,5 @@
 void CImPlainBodyText::DoCancel()
 	{
 	iPlainTextArray[iIndex]->Cancel();
+	CMsgActive::DoCancel();
 	}

--- a/email/pop3andsmtpmtm/clientmtms/src/MIUTRSLV.CPP	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/clientmtms/src/MIUTRSLV.CPP	Thu Jul 22 16:32:06 2010 +0100
@@ -462,6 +462,12 @@
 			}
 		}
 	}
+	
+	
+void CImMhtmlChildEntrySearcher::DoCancel()
+	{
+	CMsgActive::DoCancel();
+	}	
 
 void CImMhtmlChildEntrySearcher::DoComplete(TInt& )
 	{
@@ -1043,7 +1049,10 @@
 		}
 	}
 
-
+void CImMhtmlFirstPageFinder::DoCancel()
+	{
+		CMsgActive::DoCancel();
+	}
 
 
 // The following class implements a class for parsing and combining URI's.

--- a/email/pop3andsmtpmtm/servermtmutils/src/IMCVCODC.CPP	Thu Jun 17 09:57:06 2010 +0100
+++ b/email/pop3andsmtpmtm/servermtmutils/src/IMCVCODC.CPP	Thu Jul 22 16:32:06 2010 +0100
@@ -1469,14 +1469,14 @@
 
 	// Intermediate buffer for decoding, prior to converting
 
-      HBufC8* decodeBuf8 = HBufC8::NewLC(aBufOut.MaxLength());
+    HBufC8* decodeBuf8 = HBufC8::NewLC(aBufOut.MaxLength());
 
 	decodeBuf8->Des().Copy( aBufIn.Mid(i+1, j -i-1));
 
    	// Depending on type of encoding Q or B, decode.
 
 	TPtr8 dataPtr8(dataBuf8->Des());
-
+	TPtr8 decodePtr8(decodeBuf8->Des());
 	switch (iEncodingInfo.EncodingType())
 		{
 		case TImHeaderEncodingInfo::EBase64 :
@@ -1484,14 +1484,13 @@
 			break;
 		case TImHeaderEncodingInfo::EQP :
 			// Replace all underscores in text with SPACE.
-			iQPCodec.Decode( *decodeBuf8, dataPtr8 );
-
-			i=dataPtr8.Length();
+			i=decodePtr8.Length();
 			while (i--)
 				{
-				if (dataPtr8[i] == KImcvUnderScore)
-					dataPtr8[i] = KImcvSpaceChar;	
+				if (decodePtr8[i] == KImcvUnderScore)
+				    decodePtr8[i] = KImcvSpaceChar;
 				}
+            iQPCodec.Decode( *decodeBuf8, dataPtr8 );
 			break;
 		default:
 			dataBuf8->Des().Copy(*decodeBuf8); 

--- a/inc/convergedmessage.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/inc/convergedmessage.h	Thu Jul 22 16:32:06 2010 +0100
@@ -64,7 +64,8 @@
         Provisioning = 0x01,
         VCard = 0x02,
         VCal = 0x03,
-        Audio = 0x04
+        Audio = 0x04,
+        NokiaService = 0x08        
     };
 
     /**

--- a/inc/msgbiouids.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/inc/msgbiouids.h	Thu Jul 22 16:32:06 2010 +0100
@@ -63,6 +63,10 @@
 /// UID for the Provisioning Message type for BIO database
 const TUid KMsgBioProvisioningMessage = {0x101F84D1};
 
+const TUid KMsgBioNokiaServiceMessage = {0x102832EA};
+
+const TUid KMsgBioNokiaServiceSentMessage = {0x20022FE6};
+
 //// PoC
 const TUid KMsgBioUidPoC			= {0x101FD869};
 

--- a/inc/msgcontacthandler.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/inc/msgcontacthandler.h	Thu Jul 22 16:32:06 2010 +0100
@@ -52,37 +52,57 @@
                                          QString& displayName,
                                          int& countPhoneNumber)
     {
-        QContactManager * phonebookManager;
+        QContactManager phonebookManager;
+        QVariant address(contactNumber);
+
+        // apply filter on phone number field
         QContactDetailFilter phoneFilter;
-        phonebookManager = new QContactManager("symbian");
-        phoneFilter.setDetailDefinitionName(QContactPhoneNumber::DefinitionName,
-                                            QContactPhoneNumber::FieldNumber);
+        phoneFilter.setDetailDefinitionName(
+                QContactPhoneNumber::DefinitionName,
+                QContactPhoneNumber::FieldNumber);
 
-        QVariant address(contactNumber);
         phoneFilter.setValue(address);
         phoneFilter.setMatchFlags(QContactFilter::MatchEndsWith);
-
         QList<QContact> matchingContacts =
-                phonebookManager->contacts(phoneFilter);
-
+                phonebookManager.contacts(phoneFilter);
         if (matchingContacts.count() > 0)
         {
             // Fill the contact details
             QContact match = matchingContacts.at(0);
 
             displayName = match.displayLabel();
-            QList<QContactPhoneNumber> numbers = 
+            QList<QContactPhoneNumber> numbers =
                     match.details<QContactPhoneNumber> ();
             countPhoneNumber = numbers.count();
             return match.localId();
         }
-        else // no matching contacts
+
+        // apply filter on email address field
+        QContactDetailFilter emailFilter;
+        emailFilter.setDetailDefinitionName(
+                QContactEmailAddress::DefinitionName,
+                QContactEmailAddress::FieldEmailAddress);
+
+        emailFilter.setValue(address);
+        emailFilter.setMatchFlags(QContactFilter::MatchExactly);
+        matchingContacts = phonebookManager.contacts(emailFilter);
+        if ( matchingContacts.count() > 0 )
         {
-            displayName = contactNumber;
-            return -1;
+            // Fill the contact details
+            QContact match = matchingContacts.at(0);
+
+            displayName = match.displayLabel();
+            QList<QContactEmailAddress> numbers =
+                    match.details<QContactEmailAddress> ();
+            countPhoneNumber = numbers.count();
+            return match.localId();
         }
+
+        // no matching contact
+        displayName = contactNumber;
+        return -1;
     }
-    
+
     /**
      * This shall resolve contact number with display name
      * @param contactNumber number to resolve
@@ -161,17 +181,20 @@
                 if (versitDocuments.count() > 0)
                 {
                     QVersitContactImporter importer;
-                    QList<QContact> contacts =
-                            importer.importContacts(versitDocuments);
-                    // get display-name
-                    if (contacts.count() > 0)
+                    bool import_docs = importer.importDocuments(versitDocuments);
+                    if(import_docs)
                     {
-                        //resolveSynthesizedDisplayLabel
-                        QContactManager* contactManager =
+                       QList<QContact> contacts = importer.contacts();
+                       // get display-name
+                       if (contacts.count() > 0)
+                       {
+                          //resolveSynthesizedDisplayLabel
+                          QContactManager* contactManager =
                                 new QContactManager("symbian");
-                        displayName
+                          displayName
                                 = contactManager->synthesizedDisplayLabel(contacts[0]);
-                        delete contactManager;
+                          delete contactManager;
+                       }
                     }
                 }
             }

--- a/inc/unidatamodelplugininterface.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/inc/unidatamodelplugininterface.h	Thu Jul 22 16:32:06 2010 +0100
@@ -84,6 +84,30 @@
     inline const QString& mimetype();
 
     /**
+     * isProtected
+     * @return true if DRM protected object else false.
+     */
+    inline bool isProtected() const;
+
+    /**
+     * setProtected
+     * @param isProtected true if DRM protected object else false.
+     */
+    inline void setProtected(bool isProtected);
+
+    /**
+     * isCorrupted
+     * @return true if object is corrupted else false.
+     */
+    inline bool isCorrupted() const;
+
+    /**
+     * setCorrupted
+     * @param corrupted true if object is corrupted else false.
+     */
+    inline void setCorrupted(bool corrupted);
+
+    /**
      * Serialize the data memebers into the stream.
      * @param stream data stream to which data is serialized.
      */
@@ -97,8 +121,10 @@
 
 private:
     QString mPath;
+    QString mMimeType;
     int mSize;
-    QString mMimeType;
+    bool mProtected;
+    bool mCorrupt;
 
 };
 

--- a/inc/unidatamodelplugininterface.inl	Thu Jun 17 09:57:06 2010 +0100
+++ b/inc/unidatamodelplugininterface.inl	Thu Jul 22 16:32:06 2010 +0100
@@ -18,9 +18,8 @@
 // UniMessageInfo::UniMessageInfo
 // @see header
 //----------------------------------------------------------------
- UniMessageInfo::UniMessageInfo( const QString& filepath,
-                                const int size,
-                                const QString& mimetype ) : mPath (filepath), mSize(size), mMimeType(mimetype)
+UniMessageInfo::UniMessageInfo(const QString& filepath, const int size, const QString& mimetype) :
+    mPath(filepath), mMimeType(mimetype), mSize(size), mProtected(false), mCorrupt(false)
     {
     
     
@@ -89,6 +88,42 @@
     }
 
 //----------------------------------------------------------------
+// UniMessageInfo::isProtected
+// @see header
+//----------------------------------------------------------------
+inline bool UniMessageInfo::isProtected() const
+    {
+    return mProtected;
+    }
+
+//----------------------------------------------------------------
+// UniMessageInfo::setProtected
+// @see header
+//----------------------------------------------------------------
+inline void UniMessageInfo::setProtected(bool isProtected)
+   {
+   mProtected = isProtected;
+   }
+
+//----------------------------------------------------------------
+// UniMessageInfo::isCorrupted
+// @see header
+//----------------------------------------------------------------
+inline bool UniMessageInfo::isCorrupted() const
+    {
+    return mCorrupt;
+    }
+
+//----------------------------------------------------------------
+// UniMessageInfo::setCorrupted
+// @see header
+//----------------------------------------------------------------
+inline void UniMessageInfo::setCorrupted(bool corrupted)
+    {
+    mCorrupt = corrupted;
+    }
+
+//----------------------------------------------------------------
 // UniMessageInfo::serialize
 // @see header
 //----------------------------------------------------------------

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/conf/backup_registration.xml	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="yes"?>
+<backup_registration version="1.0">
+    <proxy_data_manager sid = "0x10202BE9" />
+    <restore requires_reboot = "no"/>
+</backup_registration>

Binary file messagingapp/conf/messaging_101F87EB.crml has changed

Binary file messagingapp/conf/messaging_101F87EC.crml has changed

Binary file messagingapp/conf/messaging_101F87ED.crml has changed

Binary file messagingapp/conf/messaging_101F87EE.crml has changed

Binary file messagingapp/conf/messaging_101F87EF.crml has changed

Binary file messagingapp/conf/messaging_101F8873.crml has changed

Binary file messagingapp/conf/messaging_101F8F28.crml has changed

Binary file messagingapp/conf/messaging_102071F2.crml has changed

Binary file messagingapp/conf/messaging_102072E2.crml has changed

Binary file messagingapp/conf/messaging_102072E5.crml has changed

Binary file messagingapp/conf/messaging_102824A0.crml has changed

Binary file messagingapp/conf/messaging_1028281E.crml has changed

--- a/messagingapp/conf/messaging_conf.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/conf/messaging_conf.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -35,6 +35,7 @@
 		"messaging_102072E5.crml APP_LAYER_CRML(messaging_102072E5.crml)" \
 		"messaging_102824A0.crml APP_LAYER_CRML(messaging_102824A0.crml)" \
 		"messaging_1028281E.crml APP_LAYER_CRML(messaging_1028281E.crml)" \
-		"messaging_101F8F28.crml APP_LAYER_CRML(messaging_101F8F28.crml)"
+		"messaging_101F8F28.crml APP_LAYER_CRML(messaging_101F8F28.crml)" \
+		"backup_registration.xml z:/private/2001FE79/backup_registration.xml"
 		}
 

--- a/messagingapp/msgappfw/client/bwins/csserverclientapiu.def	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/client/bwins/csserverclientapiu.def	Thu Jul 22 16:32:06 2010 +0100
@@ -24,4 +24,5 @@
 	?GetConversationIdL@CCSRequestHandler@@QAEHH@Z @ 23 NONAME ; int CCSRequestHandler::GetConversationIdL(int)
 	?NewL@CCSRequestHandler@@SAPAV1@XZ @ 24 NONAME ; class CCSRequestHandler * CCSRequestHandler::NewL(void)
 	?GetConversationFromMessageIdL@CCSRequestHandler@@QAEPAVCCsClientConversation@@H@Z @ 25 NONAME ; class CCsClientConversation * CCSRequestHandler::GetConversationFromMessageIdL(int)
+	?GetConversationFromConversationIdL@CCSRequestHandler@@QAEPAVCCsClientConversation@@H@Z @ 26 NONAME ; class CCsClientConversation * CCSRequestHandler::GetConversationFromConversationIdL(int)
 

--- a/messagingapp/msgappfw/client/eabi/csserverclientapiu.def	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/client/eabi/csserverclientapiu.def	Thu Jul 22 16:32:06 2010 +0100
@@ -30,4 +30,5 @@
 	_ZTV17CCSRequestHandler @ 29 NONAME
 	_ZTV22CCsNotificationHandler @ 30 NONAME
 	_ZTV29CCsConversationChangeObserver @ 31 NONAME
+	_ZN17CCSRequestHandler34GetConversationFromConversationIdLEi @ 32 NONAME
 

--- a/messagingapp/msgappfw/client/src/ccsnotificationhandler.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/client/src/ccsnotificationhandler.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -126,7 +126,11 @@
         case EModifyConversationListEvent:
             iRequestHandler->HandleModifyConversationList(iNotificationBuffer);
             break;
-
+            
+        case EPartialDeleteConversationListEvent:
+            iRequestHandler->HandlePartialDeleteConversationList(iNotificationBuffer);
+            break;
+            
         case EAddConversationEvent:
             iRequestHandler->HandleAddConversation(iNotificationBuffer);
             break;

--- a/messagingapp/msgappfw/client/src/ccsrequesthandler.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/client/src/ccsrequesthandler.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -59,13 +59,13 @@
 // CCSRequestHandler::NewLC()
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
-EXPORT_C CCSRequestHandler* CCSRequestHandler::NewLC(/*CVPbkContactManager* aVPbkContactManager*/)
+EXPORT_C CCSRequestHandler* CCSRequestHandler::NewLC()
     {
     PRINT ( _L("Enter CCSRequestHandler::NewLC") );
 
     CCSRequestHandler* self = new ( ELeave ) CCSRequestHandler();
     CleanupStack::PushL( self );
-    self->ConstructL(/*aVPbkContactManager*/);
+    self->ConstructL();
 
     PRINT ( _L("End CCSRequestHandler::NewLC") );
 
@@ -178,6 +178,12 @@
         //call panic
         }
     
+    // Speed up the allocation
+    if( listCount > 0 )
+        {
+        clientConversationList.Reserve(listCount);
+        }
+
     for (TInt iloop = 0 ; iloop < listCount; iloop++)
         {
         TRAP(error,
@@ -240,7 +246,12 @@
         {
         //call panic
         }
-
+    // Speed up the allocation
+    if( conversationEntryCount > 0 )
+        {
+        ConversationEntryList.Reserve(conversationEntryCount);
+        }
+    
     PRINT1 ( _L("Number of conversation entries = %d"), conversationEntryCount );
 
     // conversation entries
@@ -319,8 +330,11 @@
     stream.Close();
 
     // Delete and recreate the results buffer
-    delete iListResultsBuffer;
-    iListResultsBuffer = NULL;
+    if ( iListResultsBuffer)
+        {
+        delete iListResultsBuffer;
+        iListResultsBuffer = NULL;
+        }
 
     // Buffer created for the new size
     TRAP(error, 
@@ -370,8 +384,11 @@
     stream.Close();
 
     // Delete and recreate the results buffer
-    delete iConvResultsBuffer;
-    iConvResultsBuffer = NULL;
+    if ( iConvResultsBuffer )
+        {
+        delete iConvResultsBuffer;
+        iConvResultsBuffer = NULL;
+        }
 
     // Buffer created for the new size
     TRAP(error, 
@@ -429,10 +446,14 @@
 EXPORT_C void CCSRequestHandler::RemoveConversationListChangeEventL(
         MCsConversationListChangeObserver* /*aObserver*/)
     {
-    iConversationListChangeObserver = NULL;
-
-    // De-register from the server           
-    iNotificationHandler->RemoveConversationListChangeEventL();   
+    // Before removing observer, make sure it was added earlier.
+    if( iConversationListChangeObserver )
+        {
+        iConversationListChangeObserver = NULL;
+    
+        // De-register from the server           
+        iNotificationHandler->RemoveConversationListChangeEventL();  
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -466,11 +487,12 @@
         {
         delete iConversationChangeObserver;
         iConversationChangeObserver = NULL;
-        }
-
-    iNotificationHandler->RemoveConversationChangeEventL(aClientConversation);
+        if(aClientConversation)
+            {
+            iNotificationHandler->RemoveConversationChangeEventL(aClientConversation);
+            }
+         }
     }
-
 // -----------------------------------------------------------------------------
 // CCSRequestHandler::RequestCachingStatusEventL()
 // Add caching status Observer
@@ -895,6 +917,50 @@
     }
 
 // -----------------------------------------------------------------------------
+// CCSRequestHandler::HandlePartialDeleteConversationList()
+// Process partial delete conversation lsit event received from server
+// -----------------------------------------------------------------------------
+
+void CCSRequestHandler::HandlePartialDeleteConversationList(HBufC8* aResultsBuffer)
+{
+    PRINT( _L("Enter CCSRequestHandler::HandlePartialDeleteConversationList") );
+
+    TInt error = KErrNone;
+
+    // perpare client conversation
+    CCsClientConversation* clientConversation = NULL;
+    RDesReadStream resultStream(aResultsBuffer->Des());
+
+    TRAP(error,
+        resultStream.PushL();
+        clientConversation = CCsClientConversation::NewL();
+        CleanupStack::PushL(clientConversation);
+        clientConversation->InternalizeL(resultStream);
+        CleanupStack::Pop(clientConversation);
+        resultStream.Pop());
+
+    if ( error != KErrNone )
+        {
+        // Ignore this conversation
+        }
+
+    // Cleanup
+    resultStream.Close();
+    
+    // Pass the results to the observer
+    if ( iConversationListChangeObserver )
+        {
+        CleanupStack::PushL( clientConversation );
+        iConversationListChangeObserver->
+        PartialDeleteConversationList(*clientConversation);
+        }
+    
+    CleanupStack::PopAndDestroy();// clientConversation*/
+
+    PRINT( _L("End CCSRequestHandler::HandlePartialDeleteConversationList") );
+}
+
+// -----------------------------------------------------------------------------
 // CCSRequestHandler::HandleModifyConversationList
 // Process modify conversation lsit event received from server
 // -----------------------------------------------------------------------------
@@ -1198,6 +1264,39 @@
     }
 	
 // -----------------------------------------------------------------------------
+// CCSRequestHandler::GetConversationFromConversationIdL()
+// -----------------------------------------------------------------------------
+EXPORT_C CCsClientConversation* CCSRequestHandler::GetConversationFromConversationIdL(TInt aConversationId)
+{
+    // Create a buffer to store the results.
+    if(iResultsBuffer)
+    {
+        delete iResultsBuffer;
+        iResultsBuffer = NULL;
+    }
+    iResultsBuffer = HBufC8::NewL(KBigIpcBuffer);
+
+    // Send the request
+    iSession.GetConversationFromConversationIdL(aConversationId, iResultsBuffer->Des());
+
+    // Parse the results
+    RDesReadStream resultStream(iResultsBuffer->Des());
+    resultStream.PushL();
+    CCsClientConversation* clientConversation = CCsClientConversation::NewL();
+    CleanupStack::PushL(clientConversation);
+    clientConversation->InternalizeL(resultStream);
+    CleanupStack::Pop(clientConversation);
+
+    // Cleanup
+    delete iResultsBuffer;
+    iResultsBuffer = NULL;
+    resultStream.Pop();
+    resultStream.Close();
+
+    return clientConversation;
+}
+
+// -----------------------------------------------------------------------------
 // CCSRequestHandler::GetConversationFromMessageIdL()
 // -----------------------------------------------------------------------------
 EXPORT_C CCsClientConversation* CCSRequestHandler::GetConversationFromMessageIdL(TInt aMessageId)        

--- a/messagingapp/msgappfw/client/src/rcssession.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/client/src/rcssession.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -397,6 +397,20 @@
     }
 	
 // ----------------------------------------------------------------------------
+// RCsSession::GetConversationFromConversationIdL
+// ----------------------------------------------------------------------------
+void RCsSession::GetConversationFromConversationIdL(TInt aConversationId, TPtr8 aResultsBuffer)
+    {
+    PRINT( _L("Enter RCsSession::GetConversationFromConversationIdL") );
+
+    TIpcArgs args(aConversationId, &aResultsBuffer);
+
+    // Initiate the request
+    User::LeaveIfError (SendReceive(EGetConversationFromConversationId, args ) );
+    PRINT( _L("End RCsSession::GetConversationFromConversationIdL") );
+    }
+
+// ----------------------------------------------------------------------------
 // RCsSession::GetConversationFromMessageIdL
 // ----------------------------------------------------------------------------
 void RCsSession::GetConversationFromMessageIdL(TInt aMessageId, TPtr8 aResultsBuffer)

--- a/messagingapp/msgappfw/msghistory/msghistory.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/msghistory.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -17,7 +17,6 @@
 TARGET = msghistory
 DEPENDPATH += . inc src
 INCLUDEPATH += .
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 DEFINES += MSGHISTORY_DLL
@@ -51,8 +50,15 @@
 				 src/msghistoryprivate.cpp \
 				 src/msgitem.cpp
 
-
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/msghistory.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/msghistory.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
 
 LIBS += -lcsserverclientapi \
         -lcsutils \
-        -ls60qconversions 
\ No newline at end of file
+        -lxqutils

--- a/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -19,7 +19,7 @@
 #include <ccsrequesthandler.h>
 #include <ccsconversationentry.h>
 #include <ccsclientconversation.h>
-#include <s60qconversions.h>
+#include <xqconversions.h>
 
 //USER INCLUDES
 #include "msghistoryprivate.h"
@@ -101,6 +101,9 @@
             conversationId = handler->GetConversationIdL(aContactId));
     CCsClientConversation* clientConversation = CCsClientConversation::NewL();
     clientConversation->SetConversationEntryId(conversationId);
+    // set the contact id, which will be used in case when the 
+    // conversation entry id is -1.
+    clientConversation->SetContactId(aContactId);
     //set dummy entry
     CCsConversationEntry *entry = CCsConversationEntry::NewL();
     clientConversation->SetConversationEntryL(entry);
@@ -125,6 +128,9 @@
             conversationId = handler->GetConversationIdL(aContactId));
     CCsClientConversation* clientConversation = CCsClientConversation::NewL();
     clientConversation->SetConversationEntryId(conversationId);
+    // set the contact id, which will be used in case when the 
+    // conversation entry id is -1.
+    clientConversation->SetContactId(aContactId);
     //set dummy entry
     CCsConversationEntry *entry = CCsConversationEntry::NewL();
     clientConversation->SetConversationEntryL(entry);
@@ -230,7 +236,7 @@
     HBufC* description = entry.Description();    
     if( description && description->Length())
         {
-        item.setBody(S60QConversions::s60DescToQString(*description)); 
+        item.setBody(XQConversions::s60DescToQString(*description)); 
         }
 
     // time stamp 
@@ -244,7 +250,7 @@
     HBufC* contact = entry.Contact();
     if( contact && contact->Length())
         {
-        item.setPhoneNumber(S60QConversions::s60DescToQString(*contact));      
+        item.setPhoneNumber(XQConversions::s60DescToQString(*contact));      
         }
 
     //sending state

--- a/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsengine.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsengine.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -26,7 +26,7 @@
 #include "debugtraces.h"
 #include <msghistory.h>
 #include <msgitem.h>
-#include "s60qconversions.h"
+#include <xqconversions.h>
 
 const int ViewableLimit = 160;
 //---------------------------------------------------------------
@@ -137,7 +137,7 @@
 
     // description
     QString descr = item.body();
-    HBufC* description = S60QConversions::qStringToS60Desc(descr);
+    HBufC* description = XQConversions::qStringToS60Desc(descr);
     entry->SetDescriptionL(description->Des());
     delete description;
 
@@ -147,7 +147,7 @@
 
     //contact details
     QString details = item.phoneNumber();
-    HBufC* d_details = S60QConversions::qStringToS60Desc(details);
+    HBufC* d_details = XQConversions::qStringToS60Desc(details);
     entry->SetContactL(d_details->Des());
     delete d_details;
 

--- a/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsengineutility.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsengineutility.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -32,7 +32,7 @@
 #include "smilxmlreader.h"
 #include "smilliterals.h"
 #include "msgmimetypes.h"
-#include "s60qconversions.h"
+#include <xqconversions.h>
 
 // CONSTANTS
 #define KForwardSlash '/'
@@ -78,7 +78,7 @@
     {
         //get smilfile's handle to parse
         RFile smilfile;
-        HBufC* path = S60QConversions::qStringToS60Desc(ismilfilepath);
+        HBufC* path = XQConversions::qStringToS60Desc(ismilfilepath);
 
         RFs fsSession;
         User::LeaveIfError(fsSession.Connect());
@@ -241,7 +241,7 @@
             qDebug() << " Exit CNativeMmsUtility::getSmilFileL";
 #endif
 
-            return S60QConversions::s60DescToQString(attachment->FilePath());
+            return XQConversions::s60DescToQString(attachment->FilePath());
         }
     }
 
@@ -285,7 +285,7 @@
                     //because media source is relative to it.
                     QString smildirpath = fileDir(ismilfilepath);
                     QString mfilename =
-                            S60QConversions::s60DescToQString(attrvalptr);
+                            XQConversions::s60DescToQString(attrvalptr);
                     filepath = smildirpath.append(mfilename);
                 }
                 readFileIntoBuffer(filepath, returnbuf);
@@ -321,7 +321,7 @@
                 == 0)
         {
             QString filepath =
-                    S60QConversions::s60DescToQString(attachment->FilePath());
+                    XQConversions::s60DescToQString(attachment->FilePath());
             readFileIntoBuffer(filepath, returnbuf);
             break;
         }
@@ -371,7 +371,7 @@
                     //because media source is relative to it.
                     QString smildirpath = fileDir(ismilfilepath);
                     QString mfilename =
-                            S60QConversions::s60DescToQString(attrvalptr);
+                            XQConversions::s60DescToQString(attrvalptr);
                     filepath = smildirpath.append(mfilename);
                 }
                 // converting directory separators from native to
@@ -409,7 +409,7 @@
         CMsvAttachment *attachment = iattachmanager->GetAttachmentInfoL(i);
         TPtrC8 mimetype = attachment->MimeType();
         QString filepath =
-                S60QConversions::s60DescToQString(attachment->FilePath());
+                XQConversions::s60DescToQString(attachment->FilePath());
         // converting directory separators from native to
         // universal (QT) format
         filepath.replace(KBackwardSlash, KForwardSlash);
@@ -476,7 +476,7 @@
         CMsvAttachment *attachment = iattachmanager->GetAttachmentInfoL(i);
         TPtrC8 mimetype = attachment->MimeType();
         QString filepath =
-                S60QConversions::s60DescToQString(attachment->FilePath());
+                XQConversions::s60DescToQString(attachment->FilePath());
         // converting directory separators from native to
         // universal (QT) format
         filepath.replace(KBackwardSlash, KForwardSlash);
@@ -577,7 +577,7 @@
         qDebug() << " Exit CNativeMmsUtility::getByUrlL";
 #endif
 
-        return S60QConversions::s60DescToQString(targetattachment->FilePath());
+        return XQConversions::s60DescToQString(targetattachment->FilePath());
     }
     else
     {

--- a/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsmodel.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationsmodel.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -19,7 +19,7 @@
 #include "conversationsenginedefines.h"
 #include "conversationmsgstorehandler.h"
 #include "convergedmessage.h"
-#include "s60qconversions.h"
+#include <xqconversions.h>
 #include "conversationsengineutility.h"
 #include <ccsconversationentry.h>
 
@@ -251,7 +251,7 @@
     QString subject("");
     if( description && description->Length())
         {
-        subject = (S60QConversions::s60DescToQString(*description));
+        subject = (XQConversions::s60DescToQString(*description));
         item.setData(subject, Subject); 
         }
     
@@ -266,7 +266,7 @@
     HBufC* contact = entry.Contact();
     if( contact && contact->Length())
         {
-        item.setData(S60QConversions::s60DescToQString(*contact), ConversationAddress);      
+        item.setData(XQConversions::s60DescToQString(*contact), ConversationAddress);      
         }
 
     // message type.        

--- a/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationssummarymodel.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/tsrc/test_appengine/src/conversationssummarymodel.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -18,7 +18,7 @@
 #include "conversationssummarymodel.h"
 #include "conversationsenginedefines.h"
 #include "conversationsengineutility.h"
-#include "s60qconversions.h"
+#include <xqconversions.h>
 #include "convergedmessage.h"
 
 #include <ccsclientconversation.h>
@@ -214,7 +214,7 @@
     HBufC* body = conEntry->Description();
     if( body && body->Length())
         {     
-        QString bodytext(S60QConversions::s60DescToQString(*body));
+        QString bodytext(XQConversions::s60DescToQString(*body));
         item.setData(bodytext, BodyText); 
         item.setData(bodytext, Subject );
         }
@@ -235,20 +235,20 @@
     //first name
     if(firstname && firstname->Length())
         {
-    displayName = S60QConversions::s60DescToQString(*firstname);
+    displayName = XQConversions::s60DescToQString(*firstname);
     item.setData(displayName,FirstName); 
         }
     //last name
     HBufC* lastname = conversation.GetLastName();
     if( lastname &&  lastname->Length())
         {          
-    item.setData(S60QConversions::s60DescToQString(*lastname),LastName);
+    item.setData(XQConversions::s60DescToQString(*lastname),LastName);
         }
     //nick name
     HBufC* nickname = conversation.GetNickName();
     if (nickname && nickname->Length())
     {
-        item.setData(S60QConversions::s60DescToQString(*nickname), NickName);
+        item.setData(XQConversions::s60DescToQString(*nickname), NickName);
     }
 
     //item.setData(displayName, NickName);
@@ -258,7 +258,7 @@
     QString contactNumber("");
     if ( contactno && contactno->Length() )
         {
-        contactNumber = S60QConversions::s60DescToQString(*contactno);                  
+        contactNumber = XQConversions::s60DescToQString(*contactno);                  
         }        
     item.setData(contactNumber, ConversationAddress);
 

--- a/messagingapp/msgappfw/msghistory/tsrc/test_appengine/test_appengine.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/tsrc/test_appengine/test_appengine.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -20,7 +20,6 @@
 DEPENDPATH += . src
 
 INCLUDEPATH += ../../../inc
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 DEFINES += BUILD_DLL
@@ -64,7 +63,7 @@
 
 LIBS += -lcsserverclientapi \
         -lcsutils \
-        -ls60qconversions \
+        -lxqutils \
         -lconvergedmessageutils \
         -lmsgs \
   	    -lInetProtUtil \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgappfw/msghistory/tsrc/tsrc.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,25 @@
+#
+# 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
+
+CONFIG += ordered
+
+#Sub .pro files
+SUBDIRS += msghistorytest/msghistorytest.pro
+
+# Platforms
+SYMBIAN_PLATFORMS = DEFAULT
\ No newline at end of file

--- a/messagingapp/msgappfw/plugins/msgplugin/inc/ccsmsghandler.h	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/plugins/msgplugin/inc/ccsmsghandler.h	Thu Jul 22 16:32:06 2010 +0100
@@ -114,7 +114,13 @@
      * Checks if the MTM type supported
      */
     TBool IsMtmSupported(long uid);
-
+    
+    /**
+     * Read all message Id in iMessageArray
+     * @aFolderId - Folder Id whose message need to be sync.
+     */
+    void UpdateMessageArrayL(const TMsvId& aFolderId);
+    
 private:
 
     /**
@@ -175,11 +181,6 @@
             RPointerArray<HBufC>& addressList);
 
     /**
-     * Cleanup
-     */
-    void CleanupL();
-
-    /**
      * Extracts the Message type based on the MTM value 
      * @param aEntry, TMsvEntry
      */
@@ -232,21 +233,6 @@
     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;

--- a/messagingapp/msgappfw/plugins/msgplugin/src/ccsmsghandler.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/plugins/msgplugin/src/ccsmsghandler.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -21,6 +21,7 @@
 // USER INCLUDES
 #include "ccsmsghandler.h"
 #include "msgbiouids.h"
+#include "ccsdefs.h"
 
 // SYSTEM INCLUDES
 #include <smsclnt.h>                   
@@ -68,7 +69,12 @@
 CCsMsgHandler::~CCsMsgHandler()
     {
     PRINT ( _L("Enter CCsMsgHandler::~CCsMsgHandler") );
-
+    if(iIdle)
+        {
+        iIdle->Cancel();
+        delete iIdle;
+        iIdle=NULL;
+        }
     if(iMsgPluginUtility)
         {
         delete iMsgPluginUtility;
@@ -107,19 +113,6 @@
         iSession = NULL;
         }
 
-    if ( iRootEntry )
-        {
-        delete iRootEntry;
-        iRootEntry = NULL;
-        }
-
-    if ( iMessages )
-        {
-	    iMessages->Reset();
-        delete iMessages;
-        iMessages = NULL;
-        }
-    
     if(iMessageArray)
     {
         iMessageArray->Reset();
@@ -146,7 +139,7 @@
 
     iMsgPluginUtility = CCsMsgPluginUtility::NewL();
 
-    iConverstationEntryList = new(ELeave)RPointerArray<CCsConversationEntry>();
+    iConverstationEntryList = new(ELeave) RPointerArray<CCsConversationEntry>(1);
 
     iMtmRegistry = CClientMtmRegistry::NewL( *iSession );
 
@@ -160,8 +153,6 @@
 
     iMessageArray = new (ELeave)RArray <TMsvId>(KMessageArrayGranularity);
 
-    iMessageCount = 0;
-
     PRINT ( _L("End CCsMsgHandler::ConstructL") );
     }
 
@@ -201,12 +192,15 @@
          entry.Parent() == KMsvSentEntryIdValue ||
          entry.Parent() == KMsvGlobalOutBoxIndexEntryIdValue )
         {
+        CleanupResetAndDestroyPushL(addressList);
+        
         iMsgPluginUtility->CreateContactL(iSession, entry, addressList);
 
         //process entry
         ExtractAddressesL(entry, ERead, addressList);
-
-        addressList.ResetAndDestroy();	
+        
+        // Cleanup addressList
+        CleanupStack::PopAndDestroy(&addressList);
         }
 
     PRINT ( _L("Exit CCsMsgHandler::ProcessResultsL") );
@@ -348,6 +342,7 @@
             if ( aParent == KMsvSentEntryIdValue ||
                  aParent == KMsvGlobalInBoxIndexEntryIdValue )
                 {
+                CleanupResetAndDestroyPushL(addressList);
                 // currently server needs number, so getting it from header
                 iMsgPluginUtility->CreateContactL(iSession, entry,
                         addressList);
@@ -356,7 +351,7 @@
                 // entry created in sent already exists, hence an update
                 ExtractAddressesL(entry, EUpdate, addressList);
 
-                addressList.ResetAndDestroy();
+                CleanupStack::PopAndDestroy(&addressList);
                 }  
                 
             //for drafts and outbox, the entry changes multiple times,
@@ -372,6 +367,7 @@
                     // as it is going to appear in sent items
                     if( ECsSendStateSent != iMsgPluginUtility->GetSendState(entry) )
                         {
+                         CleanupResetAndDestroyPushL(addressList);
                         // currently server needs number, so getting it from header
                         iMsgPluginUtility->CreateContactL(iSession, entry,
                                 addressList);
@@ -382,7 +378,7 @@
                         
                         iPrevEntry = entry;
                         
-                        addressList.ResetAndDestroy();
+                        CleanupStack::PopAndDestroy(&addressList);
                         }
                     }//end check changed entry
                 }
@@ -408,13 +404,11 @@
 
     if (aContact.Length()>0)
         {
-        contact = aContact.AllocL();
-        CleanupStack::PushL(contact);
+        contact = aContact.AllocLC();
         }
     if (aDescription.Length()>0)
         {
-        sDescription = aDescription.AllocL();
-        CleanupStack::PushL(sDescription);
+        sDescription = aDescription.AllocLC();
         }
 
     //use utility to create conversation entry
@@ -504,7 +498,7 @@
 	      aEntry.iBioType != KUidMsgSubTypeMmsAudioMsg.iUid ) || 
 		  aEntry.iMtm == KSenduiMtmBtUid ) 
         {
-        tmpBuffer = aEntry.iDescription.AllocL();
+        tmpBuffer = aEntry.iDescription.AllocLC();
         description.Set( tmpBuffer->Des() );         
         }    
     else if ( aEntry.iMtm == KSenduiMtmSmsUid )  
@@ -514,7 +508,7 @@
             
         CRichText& body = iSmsMtm->Body();
         TInt smsLength = body.DocumentLength();      
-        tmpBuffer = HBufC::NewL(smsLength);
+        tmpBuffer = HBufC::NewLC(smsLength);
         TPtr ptr(tmpBuffer->Des());
         body.Extract(ptr, 0);
         description.Set( tmpBuffer->Des() );  
@@ -522,7 +516,7 @@
     else if ( aEntry.iMtm == KSenduiMtmMmsUid  || 
 	          aEntry.iMtm == KSenduiMMSNotificationUid)  
         {
-        tmpBuffer = aEntry.iDescription.AllocL();
+        tmpBuffer = aEntry.iDescription.AllocLC();
         description.Set( tmpBuffer->Des() );         
 
         iMmsMtm->SwitchCurrentEntryL( aEntry.Id() );
@@ -568,8 +562,12 @@
         // Unknown
         ProcessEntryL(aEvent, KNullDesC, description, aEntry);       
         }
-
-    delete tmpBuffer;
+    
+    //Cleanup tmpBuffer
+    if ( tmpBuffer )
+        {
+		 CleanupStack::PopAndDestroy();
+        }
 
     PRINT ( _L("Exit CCsMsgHandler::ExtractAddressesL") );
     }
@@ -589,108 +587,59 @@
 // -----------------------------------------------------------------------------
 //
 TInt CCsMsgHandler::UploadMsgL() 
-{
+    {
+    //Release scheduler for scheduling.    
+    User::After(1);
+    
     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)
+        case EReadInbox:
             {
-                for(int i = 0; i < iMessageCount; i ++)
-                {
-                    iMessageArray->Append(iMessages->At(i));
-                }
+            UpdateMessageArrayL(KMsvGlobalInBoxIndexEntryId);
+            iState = EReadSent;
+            return 1;
             }
 
-            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));
-                }
+            UpdateMessageArrayL(KMsvSentEntryId);
+            iState = EReadOutbox;
+            return 1;
             }
 
-            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;
+            UpdateMessageArrayL(KMsvGlobalOutBoxIndexEntryId);
+            iState = ESortEntries;            
+            return 1;
             }
-            iState = ESortEntries;
-            CleanupL();
-
-            return 1;
-        }
         case ESortEntries:
-        {
-             //Sort the elements in the array by descending order of TMsvId's
+            {
+            //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());
+                {
+                CMsvEntry* msvEntry= iSession->
+                        GetEntryL(iMessageArray->operator[](0));
+                CleanupStack::PushL(msvEntry);
+                ProcessResultsL(msvEntry->Entry());
+                CleanupStack::PopAndDestroy(msvEntry);
                 iMessageArray->Remove(0);
-            }
+                }
             else
-            {
+                {
+                iMessageArray->Reset();
                 iMsgObserver->HandleCachingCompleted();
                 return 0; //DONE 
-            }
-
+                }            
             iState = EProcessEntries;
             return 1; 
         }
@@ -722,36 +671,19 @@
 
     iState = EReadInbox;
     TCallBack callback = TCallBack(UploadMsg, (TAny*) this);
-    iIdle = CIdle::NewL(CActive::EPriorityLow);
+    
+    if(iIdle)
+        {
+        delete iIdle;
+        iIdle = NULL;
+        }
+    iIdle = CIdle::NewL(CActive::EPriorityIdle);
     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()
 // 
 // -----------------------------------------------------------------------------
@@ -823,14 +755,52 @@
             else if (aEntry.iBioType == KMsgBioUidVCalendar.iUid)
                 {
                 type = ECsBioMsg_VCal;
-                }            
-            }
-            break;
-        default:
-            type = ECsUnknown;           
-	    	break;
+       		 }
+       		 else if (aEntry.iBioType == KMsgBioNokiaServiceMessage.iUid) {
+            	type = ECsBioMgs_NokiaService;
         }
-    return (type);  
+    }
+        break;
+    default:
+        type = ECsUnknown;
+        break;
+    }
+    return (type);
+}
+// -----------------------------------------------------------------------------
+// void CCsMsgHandler::UpdateMessageArrayL(const TMsvId& aFolderId)
+// Update iMessageArray with the message ID before upload message to csserver. 
+// -----------------------------------------------------------------------------
+//
+void CCsMsgHandler::UpdateMessageArrayL(const TMsvId& aFolderId)
+    {
+    CMsvEntry* msvEntry = iSession->GetEntryL(aFolderId);
+    CleanupStack::PushL(msvEntry);
+    // Set sort order
+    TMsvSelectionOrdering order;
+    order.SetSorting(EMsvSortById);
+    msvEntry->SetSortTypeL(order);
+
+    CMsvEntrySelection* messages = msvEntry->ChildrenL();  
+    // Cleanup msvEntry
+    CleanupStack::PopAndDestroy(msvEntry);
+    CleanupStack::PushL(messages);
+
+    TInt messageCount = messages->Count();
+    
+    // In case of large number of message caching
+    // to avoid multiple reallocation alloc memory
+    // one shot.
+    if( messageCount > KMessageArrayGranularity)
+        iMessageArray->Reserve(messageCount);
+    
+    for(int i = 0; i < messageCount; i ++)
+        {
+        TMsvId msgId=messages->At(i);
+        iMessageArray->Append(msgId);
+        }
+    // Cleanup messages
+    CleanupStack::PopAndDestroy(messages); 
     }
 // End of file
 

--- a/messagingapp/msgappfw/plugins/msgplugin/src/ccsmsgpluginutility.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/plugins/msgplugin/src/ccsmsgpluginutility.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -72,10 +72,13 @@
     CleanupStack::PushL(conversationEntry);
         
     //set the values
-    conversationEntry->SetContactL( *aContact );
+    if(aContact)
+        conversationEntry->SetContactL( *aContact );
     conversationEntry->SetEntryId( aEnryId );
     conversationEntry->SetTimeStampL( aTimeStamp );
+    if (aDescription) {
     conversationEntry->SetDescriptionL( *aDescription );
+    }
     conversationEntry->SetConversationDir( MapDirection( aDir ) );
     conversationEntry->SetSendState( aSendState );
     conversationEntry->ChangeAttributes( aMsgAttribs, ECsAttributeNone );

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgappfw/plugins/msgplugin/tsrc/conf/test_plugin.cfg	Thu Jul 22 16:32:06 2010 +0100
@@ -0,0 +1,72 @@
+/*
+* ==============================================================================
+*  Name        : test_plugin.cfg
+*  Part of     : plugin / test_plugin
+*  Description : plugin related test cases
+*  Version:    : % version:1 %
+*
+*  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.
+*
+* ============================================================================
+*/
+
+[Test]
+title 1. CreateCcsPluginL
+create test_plugin testplugin
+testplugin CreateCcsPluginL 
+delete testplugin
+[Endtest] 
+
+
+[Test]
+title 2. CreateCCsMsgL
+create test_plugin testplugin
+testplugin CreateCCsMsgL 
+delete testplugin 
+[Endtest]
+
+
+[Test]
+title 3. CacheFromCcsPluginL
+create  test_plugin testplugin
+testplugin CacheFromCcsPluginL
+delete testplugin
+[Endtest] 
+
+[Test]
+title 4. SmsMsgPluginValidationL
+create test_plugin testplugin
+testplugin SmsMsgPluginValidationL 
+delete testplugin 
+[Endtest] 
+
+
+[Test]
+title 5. SendCcsMessageL
+create test_plugin testplugin
+testplugin SendCcsMessageL 
+delete testplugin 
+[Endtest] 
+
+
+[Test]
+title 6. MmsMsgPluginValidationL 
+create test_plugin testplugin
+testplugin MmsMsgPluginValidationL 
+delete testplugin 
+[Endtest] 
+
+[Test]
+title 7. BioMsgPluginValidationL
+create test_plugin testplugin
+testplugin BioMsgPluginValidationL 
+delete testplugin 
+[Endtest]