--- a/email_plat/email_services_api/email_services_api.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/email_services_api/email_services_api.h	Mon May 03 12:23:15 2010 +0300
@@ -1,19 +1,22 @@
 /*
- * Copyright (c) 2010 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: Email services API to be used through Qt Highway.
- *
- */
+* Copyright (c) 2010 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: Email services API to be used through Qt Highway.
+*
+*/
+
+#ifndef EMAIL_SERVICES_API_H
+#define EMAIL_SERVICES_API_H
 
 /*!
     Keys for mail send service data.
@@ -27,7 +30,7 @@
 /*!
     Mail send service interface name.
 */
-static const QString emailInterfaceNameSend = "com.nokia.symbian.IMessage.Send";
+static const QString emailInterfaceNameSend = "com.nokia.symbian.IEmailMessageSend";
 
 
 /*!
@@ -141,5 +144,4 @@
 */
 static const QString emailOperationViewMessage = "viewMessage(QVariant,QVariant,QVariant)";
 
-
-// End of file.
+#endif // EMAIL_SERVICES_API_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_plat/nmail_client_api/nmail_client_api.metaxml	Mon May 03 12:23:15 2010 +0300
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api id="a29a769373a60df860a923a77bfef505" dataversion="2.0">
+  <name>Nmail Client API</name>
+  <description>An interface for getting email messages from message store and monitoring changes in the store.</description>
+  <type>c++</type>
+  <collection>emailservices</collection>
+  <libs>
+    <lib name="nmailclientapi.lib"/>
+  </libs>
+  <release category="platform" sinceversion="4.0"/>
+  <attributes>
+    <htmldocprovided>no</htmldocprovided>
+    <adaptation>no</adaptation>
+  </attributes>
+</api>

--- a/email_plat/nmail_client_api/nmail_client_api.pri	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmail_client_api.pri	Mon May 03 12:23:15 2010 +0300
@@ -18,7 +18,7 @@
 symbian*: {
     # Build.inf rules
     BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
-            "nmail_client_api/nmcommon_api.h           APP_LAYER_PLATFORM_EXPORT_PATH(nmcommonheader_api.h)" \
+            "nmail_client_api/nmcommon_api.h           APP_LAYER_PLATFORM_EXPORT_PATH(nmcommon_api.h)" \
             "nmail_client_api/nmapiemailaddress.h      APP_LAYER_PLATFORM_EXPORT_PATH(nmapiemailaddress.h)" \
             "nmail_client_api/nmapiemailservice.h      APP_LAYER_PLATFORM_EXPORT_PATH(nmapiemailservice.h)" \
             "nmail_client_api/nmenginedef.h            APP_LAYER_PLATFORM_EXPORT_PATH(nmenginedef.h)" \

--- a/email_plat/nmail_client_api/nmapiemailservice.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapiemailservice.h	Mon May 03 12:23:15 2010 +0300
@@ -62,12 +62,12 @@
     /*
      *gets mail message envelope by id (see also NmEventNotifier)
      */
-    bool envelope( const quint64 mailboxId, const quint64 folderId, const quint64 envelopeId, NmMessageEnvelope &envelope );
+    bool getEnvelope( const quint64 mailboxId, const quint64 folderId, const quint64 envelopeId, NmMessageEnvelope &envelope );
 
     /*
      *  gets mailbox info by id (see also NmEventNotifier)
      */
-    bool mailbox( const quint64 mailboxId, NmMailbox &mailboxInfo );
+    bool getMailbox( const quint64 mailboxId, NmMailbox &mailboxInfo );
 
     /*
      * returns isrunning flag value

--- a/email_plat/nmail_client_api/nmapienvelopelisting.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapienvelopelisting.h	Mon May 03 12:23:15 2010 +0300
@@ -57,7 +57,7 @@
      *  
      *  \arg envelopes 
      */
-    bool envelopes( QList<EmailClientApi::NmMessageEnvelope> &envelopes );
+    bool getEnvelopes( QList<EmailClientApi::NmMessageEnvelope> &envelopes );
 
     /*!
      * \brief Return info if listing is running

--- a/email_plat/nmail_client_api/nmapifolder.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapifolder.h	Mon May 03 12:23:15 2010 +0300
@@ -108,7 +108,7 @@
      * returns child folder ids.
      * to be implemented later when nmail functionality is available
      */
-    void childFolderIds(QList<quint64> &childFolderIds);
+    void getChildFolderIds(QList<quint64> &childFolderIds);
 
     /*
      * returns parent folder id.

--- a/email_plat/nmail_client_api/nmapifolderlisting.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapifolderlisting.h	Mon May 03 12:23:15 2010 +0300
@@ -57,7 +57,7 @@
      *  It clears list of folders after be called.
      *  It also at start clear inputlist of NmFolder.
      */
-    bool folders(QList<EmailClientApi::NmFolder> &folders);
+    bool getFolders(QList<EmailClientApi::NmFolder> &folders);
 
     /*!
      * \brief Return info if listing is running

--- a/email_plat/nmail_client_api/nmapimailboxlisting.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimailboxlisting.h	Mon May 03 12:23:15 2010 +0300
@@ -56,7 +56,7 @@
      *  \return Return true if results were avaible
      *  \arg List of mailboxes to filled. On start is cleared. 
      */
-    bool mailboxes(QList<EmailClientApi::NmMailbox> &mailboxes);
+    bool getMailboxes(QList<EmailClientApi::NmMailbox> &mailboxes);
 
     /*!
      * \brief Return info if listing is running

--- a/email_plat/nmail_client_api/nmapimessageenvelope.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimessageenvelope.h	Mon May 03 12:23:15 2010 +0300
@@ -93,12 +93,12 @@
     /*
      * getter for to recipients
      */
-    void toRecipients( QList<EmailClientApi::NmEmailAddress> &toRecipients );
+    void getToRecipients( QList<EmailClientApi::NmEmailAddress> &toRecipients );
 
     /*
      * getter for cc recipients
      */
-    void ccRecipients( QList<EmailClientApi::NmEmailAddress> &ccRecipients );
+    void getCcRecipients( QList<EmailClientApi::NmEmailAddress> &ccRecipients );
 
     /*
      * getter for sent time
@@ -133,7 +133,7 @@
     /*
      * getter for plaintext body
      */
-    void plainTextBody( EmailClientApi::NmMessageBody &body );
+    void getPlainTextBody( EmailClientApi::NmMessageBody &body );
 
     /*
      * getter for plaintext body
@@ -173,12 +173,12 @@
     /*
      * setter for to recipients 
      */
-    void setGetToRecipients(const QList<EmailClientApi::NmEmailAddress>& toRecipients);
+    void setToRecipients(const QList<EmailClientApi::NmEmailAddress>& toRecipients);
 
     /*
      * setter for cc recipients 
      */
-    void setGetCcRecipients(const QList<EmailClientApi::NmEmailAddress> &ccRecipients);
+    void setCcRecipients(const QList<EmailClientApi::NmEmailAddress> &ccRecipients);
 
     /*
      * setter for sent time 

--- a/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Mon May 03 12:23:15 2010 +0300
@@ -1,232 +1,260 @@
 EXPORTS
-	?GetTempDirL@CFSMailRequestHandler@@QAEAAVTDesC16@@XZ @ 1 NONAME ; class TDesC16 & CFSMailRequestHandler::GetTempDirL(void)
+	??1CEmailExtension@@UAE@XZ @ 1 NONAME ; CEmailExtension::~CEmailExtension(void)
 	?CancelAllRequestsL@CFSMailRequestHandler@@QAEXXZ @ 2 NONAME ; void CFSMailRequestHandler::CancelAllRequestsL(void)
 	?SaveL@CFSMailMessagePart@@QAEXXZ @ 3 NONAME ; void CFSMailMessagePart::SaveL(void)
 	?CreateMessageToSend@CFSMailBox@@QAEPAVCFSMailMessage@@XZ @ 4 NONAME ; class CFSMailMessage * CFSMailBox::CreateMessageToSend(void)
-	?ClearBccRecipients@CFSMailMessageBase@@QAEXXZ @ 5 NONAME ; void CFSMailMessageBase::ClearBccRecipients(void)
+	?FindExtension@TEmailExtensions@@QBEHABVTUid@@@Z @ 5 NONAME ; int TEmailExtensions::FindExtension(class TUid const &) const
 	?SendMessageL@CFSMailBox@@QAEXAAVCFSMailMessage@@@Z @ 6 NONAME ; void CFSMailBox::SendMessageL(class CFSMailMessage &)
 	?GetStandardFolderId@CFSMailBox@@QAE?AVTFSMailMsgId@@W4TFSFolderType@@@Z @ 7 NONAME ; class TFSMailMsgId CFSMailBox::GetStandardFolderId(enum TFSFolderType)
-	?CancelSearch@CFSMailBox@@QAEXXZ @ 8 NONAME ; void CFSMailBox::CancelSearch(void)
-	?ResetFlag@CFSMailMessageBase@@QAEXH@Z @ 9 NONAME ; void CFSMailMessageBase::ResetFlag(int)
-	?ListMrusL@CFSMailBox@@QBEPAVMDesC16Array@@XZ @ 10 NONAME ; class MDesC16Array * CFSMailBox::ListMrusL(void) const
-	?IsMRInfoProcessorSet@CFSMailBoxBase@@QAEHXZ @ 11 NONAME ; int CFSMailBoxBase::IsMRInfoProcessorSet(void)
-	??1CFSMailFolderBase@@UAE@XZ @ 12 NONAME ; CFSMailFolderBase::~CFSMailFolderBase(void)
+	?ResetFlag@CFSMailMessageBase@@QAEXH@Z @ 8 NONAME ; void CFSMailMessageBase::ResetFlag(int)
+	?ListMrusL@CFSMailBox@@QBEPAVMDesC16Array@@XZ @ 9 NONAME ; class MDesC16Array * CFSMailBox::ListMrusL(void) const
+	?IsMRInfoProcessorSet@CFSMailBoxBase@@QAEHXZ @ 10 NONAME ; int CFSMailBoxBase::IsMRInfoProcessorSet(void)
+	??1CFSMailFolderBase@@UAE@XZ @ 11 NONAME ; CFSMailFolderBase::~CFSMailFolderBase(void)
+	??0TEmailExtensions@@QAE@XZ @ 12 NONAME ; TEmailExtensions::TEmailExtensions(void)
 	?SetFolderType@CFSMailFolderBase@@QAEXW4TFSFolderType@@@Z @ 13 NONAME ; void CFSMailFolderBase::SetFolderType(enum TFSFolderType)
-	?SetUnseenCount@CFSMailFolderBase@@QAEXI@Z @ 14 NONAME ; void CFSMailFolderBase::SetUnseenCount(unsigned int)
-	?GetNmMessageEnvelope@CFSMailMessageBase@@QAEPAVNmMessageEnvelope@@XZ @ 15 NONAME ; class NmMessageEnvelope * CFSMailMessageBase::GetNmMessageEnvelope(void)
-	?GetName@CFSMailBoxBase@@QBEAAVTDesC16@@XZ @ 16 NONAME ; class TDesC16 & CFSMailBoxBase::GetName(void) const
-	?SaveMessageL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 17 NONAME ; int CFSMailMessage::SaveMessageL(class MFSMailRequestObserver &)
-	?GetMailBoxStatus@CFSMailBox@@QAE?AW4TFSMailBoxStatus@@XZ @ 18 NONAME ; enum TFSMailBoxStatus CFSMailBox::GetMailBoxStatus(void)
-	?AttachmentListL@CFSMailMessage@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 19 NONAME ; void CFSMailMessage::AttachmentListL(class RPointerArray<class CFSMailMessagePart> &)
-	?SaveMessageL@CFSMailMessage@@QAEXXZ @ 20 NONAME ; void CFSMailMessage::SaveMessageL(void)
-	?NewL@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 21 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewL(class TFSMailMsgId)
-	?FetchMessagesPartsL@CFSMailMessagePart@@QAEHABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@I@Z @ 22 NONAME ; int CFSMailMessagePart::FetchMessagesPartsL(class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, unsigned int)
-	?SetReplyToAddress@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 23 NONAME ; void CFSMailMessageBase::SetReplyToAddress(class CFSMailAddress *)
-	?IsFlagSet@CFSMailMessageBase@@QBEHH@Z @ 24 NONAME ; int CFSMailMessageBase::IsFlagSet(int) const
-	?NewL@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 25 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewL(class TFSMailMsgId)
-	?GetBCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 26 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetBCCRecipients(void)
-	?AddPluginL@CFSMailRequestHandler@@QAEXVTUid@@PAVCFSMailPlugin@@@Z @ 27 NONAME ; void CFSMailRequestHandler::AddPluginL(class TUid, class CFSMailPlugin *)
-	?SetContentDisposition@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 28 NONAME ; void CFSMailMessagePart::SetContentDisposition(class TDesC16 const &)
-	??1CFSMailMessageBase@@UAE@XZ @ 29 NONAME ; CFSMailMessageBase::~CFSMailMessageBase(void)
-	?CurrentSyncState@CFSMailBox@@QBE?AW4TSSMailSyncState@@XZ @ 30 NONAME ; enum TSSMailSyncState CFSMailBox::CurrentSyncState(void) const
-	?NewL@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 31 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewL(class TFSMailMsgId)
-	?SetAttachmentNameL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 32 NONAME ; void CFSMailMessagePart::SetAttachmentNameL(class TDesC16 const &)
-	?GetMessageCount@CFSMailFolderBase@@QBEIXZ @ 33 NONAME ; unsigned int CFSMailFolderBase::GetMessageCount(void) const
-	?RemoveChildPartL@CFSMailMessagePart@@QAEXVTFSMailMsgId@@@Z @ 34 NONAME ; void CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId)
-	?SaveMessagePartsL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 35 NONAME ; int CFSMailMessage::SaveMessagePartsL(class MFSMailRequestObserver &)
-	?MoveMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@1@Z @ 36 NONAME ; void CFSMailBox::MoveMessagesL(class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
-	?GetFolderName@CFSMailFolderBase@@QBEAAVTDesC16@@XZ @ 37 NONAME ; class TDesC16 & CFSMailFolderBase::GetFolderName(void) const
-	?GetDisplayName@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 38 NONAME ; class TDesC16 & CFSMailAddress::GetDisplayName(void) const
-	?ConstructL@CFSMailFolderBase@@IAEXVTFSMailMsgId@@@Z @ 39 NONAME ; void CFSMailFolderBase::ConstructL(class TFSMailMsgId)
-	?SetSubject@CFSMailMessageBase@@QAEXABVTDesC16@@@Z @ 40 NONAME ; void CFSMailMessageBase::SetSubject(class TDesC16 const &)
-	?CreateReplyMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@HABVTDesC16@@@Z @ 41 NONAME ; class CFSMailMessage * CFSMailBox::CreateReplyMessage(class TFSMailMsgId, int, class TDesC16 const &)
-	?CopyContentFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 42 NONAME ; void CFSMailMessagePart::CopyContentFileL(class TDesC16 const &)
-	??1CFSMailBoxBase@@UAE@XZ @ 43 NONAME ; CFSMailBoxBase::~CFSMailBoxBase(void)
-	?RemoveContentL@CFSMailMessagePart@@QAEXXZ @ 44 NONAME ; void CFSMailMessagePart::RemoveContentL(void)
-	?NewLC@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 45 NONAME ; class CFSMailBox * CFSMailBox::NewLC(class TFSMailMsgId)
-	?GetParentFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 46 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetParentFolderId(void) const
-	??_ECFSMailRequestHandler@@UAE@I@Z @ 47 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(unsigned int)
-	?NewLC@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 48 NONAME ; class CFSMailFolder * CFSMailFolder::NewLC(class TFSMailMsgId)
-	?NewL@CFSMailAddress@@SAPAV1@XZ @ 49 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(void)
-	?IsMessageL@CFSMailMessagePart@@UBEHXZ @ 50 NONAME ; int CFSMailMessagePart::IsMessageL(void) const
-	?GetNmMessage@CFSMailMessage@@QAEPAVNmMessage@@XZ @ 51 NONAME ; class NmMessage * CFSMailMessage::GetNmMessage(void)
-	?GetContentToBufferL@CFSMailMessagePart@@QAEXAAVTDes16@@I@Z @ 52 NONAME ; void CFSMailMessagePart::GetContentToBufferL(class TDes16 &, unsigned int)
-	?AddNewAttachmentL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@VTFSMailMsgId@@0@Z @ 53 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId, class TDesC16 const &)
-	?BlockCopyFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 54 NONAME ; void CFSMailFolderBase::BlockCopyFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?GetSender@CFSMailMessageBase@@QBEPAVCFSMailAddress@@XZ @ 55 NONAME ; class CFSMailAddress * CFSMailMessageBase::GetSender(void) const
-	?ClearSearchResultCache@CFSMailBox@@QAEXXZ @ 56 NONAME ; void CFSMailBox::ClearSearchResultCache(void)
-	?CancelRequestL@CFSMailRequestHandler@@QAEXH@Z @ 57 NONAME ; void CFSMailRequestHandler::CancelRequestL(int)
-	?GetMailBoxId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 58 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMailBoxId(void) const
-	?ListFolders@CFSMailBox@@QAEXVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 59 NONAME ; void CFSMailBox::ListFolders(class TFSMailMsgId, class RPointerArray<class CFSMailFolder> &)
-	?NewL@CFSMailMessage@@SAPAV1@ABVNmMessage@@@Z @ 60 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class NmMessage const &)
-	?HtmlBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 61 NONAME ; class CFSMailMessagePart * CFSMailMessage::HtmlBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?ContentDescription@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 62 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDescription(void)
-	?SendMessageL@CFSMailBox@@QAEHAAVCFSMailMessage@@AAVMFSMailRequestObserver@@@Z @ 63 NONAME ; int CFSMailBox::SendMessageL(class CFSMailMessage &, class MFSMailRequestObserver &)
-	?GetFolderType@CFSMailFolderBase@@QBE?AW4TFSFolderType@@XZ @ 64 NONAME ; enum TFSFolderType CFSMailFolderBase::GetFolderType(void) const
-	?GetEmailAddress@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 65 NONAME ; class TDesC16 & CFSMailAddress::GetEmailAddress(void) const
-	?FSMailSortCriteria2NM@NmConverter@@SA?AVNmMailSortCriteria@@VTFSMailSortCriteria@@@Z @ 66 NONAME ; class NmMailSortCriteria NmConverter::FSMailSortCriteria2NM(class TFSMailSortCriteria)
-	?NewL@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 67 NONAME ; class CFSMailBox * CFSMailBox::NewL(class TFSMailMsgId)
-	?CreateMessageToSendL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 68 NONAME ; int CFSMailBox::CreateMessageToSendL(class MFSMailRequestObserver &)
-	?ContentID@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 69 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentID(void)
-	?FetchMessagesL@CFSMailFolder@@QAEHABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@@Z @ 70 NONAME ; int CFSMailFolder::FetchMessagesL(class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &)
-	?RequestHandler@CFSMailMessagePart@@QAEAAVCFSMailRequestHandler@@XZ @ 71 NONAME ; class CFSMailRequestHandler & CFSMailMessagePart::RequestHandler(void)
-	??1CFSMailFolder@@UAE@XZ @ 72 NONAME ; CFSMailFolder::~CFSMailFolder(void)
-	?toQDateTime@NmConverter@@SA?AVQDateTime@@ABVTTime@@@Z @ 73 NONAME ; class QDateTime NmConverter::toQDateTime(class TTime const &)
-	?IsRelatedTo@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 74 NONAME ; class TFSMailMsgId CFSMailMessageBase::IsRelatedTo(void) const
-	?GetContentFileL@CFSMailMessagePart@@QAE?AVRFile@@XZ @ 75 NONAME ; class RFile CFSMailMessagePart::GetContentFileL(void)
-	?AppendBCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 76 NONAME ; void CFSMailMessageBase::AppendBCCRecipient(class CFSMailAddress *)
-	?IsMRInfoSet@CFSMailMessagePart@@QAEHXZ @ 77 NONAME ; int CFSMailMessagePart::IsMRInfoSet(void)
-	??1CFSMailIterator@@UAE@XZ @ 78 NONAME ; CFSMailIterator::~CFSMailIterator(void)
-	?RemoveDownLoadedAttachmentsL@CFSMailMessagePart@@QAEXXZ @ 79 NONAME ; void CFSMailMessagePart::RemoveDownLoadedAttachmentsL(void)
-	?IsMessageL@CFSMailMessage@@UBEHXZ @ 80 NONAME ; int CFSMailMessage::IsMessageL(void) const
-	?GetNmMailbox@CFSMailBoxBase@@QAEPAVNmMailbox@@XZ @ 81 NONAME ; class NmMailbox * CFSMailBoxBase::GetNmMailbox(void)
-	?SetContentClass@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 82 NONAME ; void CFSMailMessagePart::SetContentClass(class TDesC16 const &)
-	?GetNmFolder@CFSMailFolderBase@@QAEPAVNmFolder@@XZ @ 83 NONAME ; class NmFolder * CFSMailFolderBase::GetNmFolder(void)
-	?GetFolderId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 84 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetFolderId(void) const
-	?ReadOnlyPartSize@CFSMailMessagePart@@QBEIXZ @ 85 NONAME ; unsigned int CFSMailMessagePart::ReadOnlyPartSize(void) const
-	?GetConnectionId@CFSMailBox@@QAEHAAK@Z @ 86 NONAME ; int CFSMailBox::GetConnectionId(unsigned long &)
-	?BlockMoveFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 87 NONAME ; void CFSMailFolderBase::BlockMoveFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?ContentDisposition@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 88 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDisposition(void)
-	?RemoveDownLoadedAttachmentsL@CFSMailFolder@@QAEXXZ @ 89 NONAME ; void CFSMailFolder::RemoveDownLoadedAttachmentsL(void)
-	?CreateReplyMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@HAAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 90 NONAME ; int CFSMailBox::CreateReplyMessageL(class TFSMailMsgId, int, class MFSMailRequestObserver &, class TDesC16 const &)
-	?NewLC@CFSMailAddress@@SAPAV1@XZ @ 91 NONAME ; class CFSMailAddress * CFSMailAddress::NewLC(void)
-	?NewL@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 92 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewL(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
-	?ChildPartsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@W4TFSMailMessagePartDataSource@1@@Z @ 93 NONAME ; void CFSMailMessagePart::ChildPartsL(class RPointerArray<class CFSMailMessagePart> &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?FetchLoadState@CFSMailMessagePart@@QBE?AW4TFSPartFetchState@@XZ @ 94 NONAME ; enum TFSPartFetchState CFSMailMessagePart::FetchLoadState(void) const
-	?SetDisplayName@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 95 NONAME ; void CFSMailAddress::SetDisplayName(class TDesC16 const &)
-	?toTTime@NmConverter@@SA?AVTTime@@ABVQDateTime@@@Z @ 96 NONAME ; class TTime NmConverter::toTTime(class QDateTime const &)
-	?SetMailBoxId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 97 NONAME ; void CFSMailMessageBase::SetMailBoxId(class TFSMailMsgId)
-	?GetFlags@CFSMailMessageBase@@QBEHXZ @ 98 NONAME ; int CFSMailMessageBase::GetFlags(void) const
-	?nmIdToMailMsgId@NmConverter@@SA?AVTFSMailMsgId@@VNmId@@@Z @ 99 NONAME ; class TFSMailMsgId NmConverter::nmIdToMailMsgId(class NmId)
-	?CopyMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@AAV2@VTFSMailMsgId@@2@Z @ 100 NONAME ; void CFSMailBox::CopyMessagesL(class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId, class TFSMailMsgId)
-	?IsConnectionAllowedWhenRoaming@CFSMailBox@@QAEHAAH@Z @ 101 NONAME ; int CFSMailBox::IsConnectionAllowedWhenRoaming(int &)
-	?ClearToRecipients@CFSMailMessageBase@@QAEXXZ @ 102 NONAME ; void CFSMailMessageBase::ClearToRecipients(void)
-	?CopyMessageAsChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@PAVCFSMailMessage@@@Z @ 103 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::CopyMessageAsChildPartL(class TFSMailMsgId, class CFSMailMessage *)
-	?ChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@@Z @ 104 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::ChildPartL(class TFSMailMsgId)
-	?GetId@CFSMailBoxBase@@QBE?AVTFSMailMsgId@@XZ @ 105 NONAME ; class TFSMailMsgId CFSMailBoxBase::GetId(void) const
-	?PreviousL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 106 NONAME ; int CFSMailIterator::PreviousL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?RefreshNowL@CFSMailBox@@QAEHXZ @ 107 NONAME ; int CFSMailBox::RefreshNowL(void)
-	?CancelSyncL@CFSMailBox@@QAEXXZ @ 108 NONAME ; void CFSMailBox::CancelSyncL(void)
-	?ContentDispositionParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 109 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentDispositionParameters(void)
-	?ListFolders@CFSMailBox@@QAEAAV?$RPointerArray@VCFSMailFolder@@@@XZ @ 110 NONAME ; class RPointerArray<class CFSMailFolder> & CFSMailBox::ListFolders(void)
-	?GetSettingsUid@CFSMailBoxBase@@QAE?BVTUid@@XZ @ 111 NONAME ; class TUid const CFSMailBoxBase::GetSettingsUid(void)
-	??1CFSMailMessage@@UAE@XZ @ 112 NONAME ; CFSMailMessage::~CFSMailMessage(void)
-	?PlainTextBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 113 NONAME ; class CFSMailMessagePart * CFSMailMessage::PlainTextBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?GetStatus@CFSMailBoxBase@@QBE?AW4TFSMailBoxStatus@@XZ @ 114 NONAME ; enum TFSMailBoxStatus CFSMailBoxBase::GetStatus(void) const
-	?SetName@CFSMailBoxBase@@QAEXABVTDesC16@@@Z @ 115 NONAME ; void CFSMailBoxBase::SetName(class TDesC16 const &)
-	?GoOfflineL@CFSMailBox@@QAEXXZ @ 116 NONAME ; void CFSMailBox::GoOfflineL(void)
-	?CleanTempDirL@CFSMailRequestHandler@@QAEXXZ @ 117 NONAME ; void CFSMailRequestHandler::CleanTempDirL(void)
-	?SupportsMoveFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 118 NONAME ; int CFSMailFolder::SupportsMoveFromL(enum TFSFolderType)
-	?NewChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@ABVTDesC16@@@Z @ 119 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewChildPartL(class TFSMailMsgId, class TDesC16 const &)
-	?toRPointerArray@NmConverter@@SA?AV?$RPointerArray@VCFSMailAddress@@@@ABV?$QList@VNmAddress@@@@@Z @ 120 NONAME ; class RPointerArray<class CFSMailAddress> NmConverter::toRPointerArray(class QList<class NmAddress> const &)
-	?UpdateMessageFlagsL@CFSMailBox@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@@Z @ 121 NONAME ; int CFSMailBox::UpdateMessageFlagsL(class TFSMailMsgId, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &)
-	?SetFolderId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 122 NONAME ; void CFSMailMessageBase::SetFolderId(class TFSMailMsgId)
-	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@AAVRFile@@ABVTDesC8@@@Z @ 123 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class RFile &, class TDesC8 const &)
-	?ConstructL@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 124 NONAME ; void CFSMailMessageBase::ConstructL(class TFSMailMsgId)
-	?GetLocalTextContentLC@CFSMailMessagePart@@QAEPAVHBufC16@@XZ @ 125 NONAME ; class HBufC16 * CFSMailMessagePart::GetLocalTextContentLC(void)
-	?GetMRInfo@CFSMailMessagePart@@QAEAAVMMRInfoObject@@XZ @ 126 NONAME ; class MMRInfoObject & CFSMailMessagePart::GetMRInfo(void)
-	?GetDate@CFSMailMessageBase@@QBE?AVTTime@@XZ @ 127 NONAME ; class TTime CFSMailMessageBase::GetDate(void) const
-	?SetRelatedTo@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 128 NONAME ; void CFSMailMessageBase::SetRelatedTo(class TFSMailMsgId)
-	?PreviousL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 129 NONAME ; int CFSMailIterator::PreviousL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?CreateForwardMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@ABVTDesC16@@@Z @ 130 NONAME ; class CFSMailMessage * CFSMailBox::CreateForwardMessage(class TFSMailMsgId, class TDesC16 const &)
-	?SetStatus@CFSMailBoxBase@@QAEXW4TFSMailBoxStatus@@@Z @ 131 NONAME ; void CFSMailBoxBase::SetStatus(enum TFSMailBoxStatus)
-	?SetContentIDL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 132 NONAME ; void CFSMailMessagePart::SetContentIDL(class TDesC16 const &)
-	?NewLC@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 133 NONAME ; class CFSMailMessage * CFSMailMessage::NewLC(class TFSMailMsgId)
-	?GetRCLInfo@CFSMailBoxBase@@QAEXAAVTUid@@AAI@Z @ 134 NONAME ; void CFSMailBoxBase::GetRCLInfo(class TUid &, unsigned int &)
-	?MRInfoProcessorL@CFSMailBoxBase@@QAEAAVMMRInfoProcessor@@XZ @ 135 NONAME ; class MMRInfoProcessor & CFSMailBoxBase::MRInfoProcessorL(void)
-	?NewL@CFSMailAddress@@SAPAV1@ABVNmAddress@@@Z @ 136 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(class NmAddress const &)
-	?GetUnreadCount@CFSMailFolderBase@@QBEIXZ @ 137 NONAME ; unsigned int CFSMailFolderBase::GetUnreadCount(void) const
-	?SetSender@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 138 NONAME ; void CFSMailMessageBase::SetSender(class CFSMailAddress *)
-	?FindBodyPartL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@W4TFSMailMessagePartDataSource@1@@Z @ 139 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::FindBodyPartL(class TDesC16 const &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?CreateForwardMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 140 NONAME ; int CFSMailBox::CreateForwardMessageL(class TFSMailMsgId, class MFSMailRequestObserver &, class TDesC16 const &)
-	?GetTempFileL@CFSMailRequestHandler@@QAE?AVRFile@@VTFSMailMsgId@@V?$TBuf@$0BAA@@@@Z @ 141 NONAME ; class RFile CFSMailRequestHandler::GetTempFileL(class TFSMailMsgId, class TBuf<256>)
-	?SetMailBoxId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 142 NONAME ; void CFSMailFolderBase::SetMailBoxId(class TFSMailMsgId)
-	?OwnMailAddress@CFSMailBoxBase@@QAEAAVCFSMailAddress@@XZ @ 143 NONAME ; class CFSMailAddress & CFSMailBoxBase::OwnMailAddress(void)
-	?SetCredentialsL@CFSMailBox@@QAEXABVTDesC16@@0@Z @ 144 NONAME ; void CFSMailBox::SetCredentialsL(class TDesC16 const &, class TDesC16 const &)
-	?SetContent@CFSMailMessagePart@@QAEXAAVTDes16@@@Z @ 145 NONAME ; void CFSMailMessagePart::SetContent(class TDes16 &)
-	?RemoveMessageL@CFSMailFolder@@QAEXVTFSMailMsgId@@@Z @ 146 NONAME ; void CFSMailFolder::RemoveMessageL(class TFSMailMsgId)
-	?NewLC@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 147 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewLC(class TFSMailMsgId)
-	?CompleteRequest@CFSMailRequestHandler@@QAEXH@Z @ 148 NONAME ; void CFSMailRequestHandler::CompleteRequest(int)
-	?GetFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 149 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetFolderId(void) const
-	?SetMRInfo@CFSMailMessagePart@@QAEXPAVMMRInfoObject@@@Z @ 150 NONAME ; void CFSMailMessagePart::SetMRInfo(class MMRInfoObject *)
-	??0CFSMailRequestHandler@@IAE@XZ @ 151 NONAME ; CFSMailRequestHandler::CFSMailRequestHandler(void)
-	?GoOnlineL@CFSMailBox@@QAEXXZ @ 152 NONAME ; void CFSMailBox::GoOnlineL(void)
-	?SetMessageCount@CFSMailFolderBase@@QAEXI@Z @ 153 NONAME ; void CFSMailFolderBase::SetMessageCount(unsigned int)
-	?NewLC@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 154 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class TFSMailMsgId, class TFSMailMsgId)
-	??1CFSMailMessagePart@@UAE@XZ @ 155 NONAME ; CFSMailMessagePart::~CFSMailMessagePart(void)
-	?NewLC@CFSMailMessagePart@@SAPAV1@ABVNmId@@ABVNmMessagePart@@@Z @ 156 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class NmId const &, class NmMessagePart const &)
-	?ContentTypeParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 157 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentTypeParameters(void)
-	?GetNmMessagePart@CFSMailMessagePart@@QAEPAVNmMessagePart@@XZ @ 158 NONAME ; class NmMessagePart * CFSMailMessagePart::GetNmMessagePart(void)
-	??1CFSMailAddress@@UAE@XZ @ 159 NONAME ; CFSMailAddress::~CFSMailAddress(void)
-	?SetParentFolderId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 160 NONAME ; void CFSMailFolderBase::SetParentFolderId(class TFSMailMsgId)
-	?AttachmentNameL@CFSMailMessagePart@@QAEAAVTDesC16@@XZ @ 161 NONAME ; class TDesC16 & CFSMailMessagePart::AttachmentNameL(void)
-	?GetToRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 162 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetToRecipients(void)
-	?SetContentDescription@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 163 NONAME ; void CFSMailMessagePart::SetContentDescription(class TDesC16 const &)
-	?NMMailSortCriteria2FS@NmConverter@@SA?AVTFSMailSortCriteria@@VNmMailSortCriteria@@@Z @ 164 NONAME ; class TFSMailSortCriteria NmConverter::NMMailSortCriteria2FS(class NmMailSortCriteria)
-	?GetContentClass@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 165 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentClass(void)
-	?GetContentType@CFSMailMessagePart@@QBEABVTDesC16@@XZ @ 166 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentType(void) const
-	?SetOwnMailAddressL@CFSMailBoxBase@@QAEXPAVCFSMailAddress@@@Z @ 167 NONAME ; void CFSMailBoxBase::SetOwnMailAddressL(class CFSMailAddress *)
-	?GetPluginByUid@CFSMailRequestHandler@@QAEPAVCFSMailPlugin@@VTFSMailMsgId@@@Z @ 168 NONAME ; class CFSMailPlugin * CFSMailRequestHandler::GetPluginByUid(class TFSMailMsgId)
-	?GetSubFolderCount@CFSMailFolderBase@@QBEIXZ @ 169 NONAME ; unsigned int CFSMailFolderBase::GetSubFolderCount(void) const
-	?SetMRInfoProcessorL@CFSMailBoxBase@@QAEXPAVMMRInfoProcessor@@@Z @ 170 NONAME ; void CFSMailBoxBase::SetMRInfoProcessorL(class MMRInfoProcessor *)
-	?FetchMessagePartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@I@Z @ 171 NONAME ; int CFSMailMessagePart::FetchMessagePartL(class TFSMailMsgId, class MFSMailRequestObserver &, unsigned int)
-	?ContentSize@CFSMailMessagePart@@QBEIXZ @ 172 NONAME ; unsigned int CFSMailMessagePart::ContentSize(void) const
-	?InitAsyncRequestL@CFSMailRequestHandler@@QAE?AVTFSPendingRequest@@VTUid@@AAVMFSMailRequestObserver@@@Z @ 173 NONAME ; class TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL(class TUid, class MFSMailRequestObserver &)
-	?toQString@NmConverter@@SA?AVQString@@ABVTDesC16@@@Z @ 174 NONAME ; class QString NmConverter::toQString(class TDesC16 const &)
-	?SetContentFromFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 175 NONAME ; void CFSMailMessagePart::SetContentFromFileL(class TDesC16 const &)
-	?GetNmAddress@CFSMailAddress@@QAE?AVNmAddress@@XZ @ 176 NONAME ; class NmAddress CFSMailAddress::GetNmAddress(void)
-	?GetBrandingIdL@CFSMailBox@@QAEAAVTDesC16@@XZ @ 177 NONAME ; class TDesC16 & CFSMailBox::GetBrandingIdL(void)
-	?NewLC@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 178 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewLC(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
-	?NewL@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 179 NONAME ; class CFSMailFolder * CFSMailFolder::NewL(class TFSMailMsgId)
-	?SetFetchedContentSize@CFSMailMessagePart@@QAEXI@Z @ 180 NONAME ; void CFSMailMessagePart::SetFetchedContentSize(unsigned int)
-	?RemoveAllRequests@CFSMailRequestHandler@@AAEXXZ @ 181 NONAME ; void CFSMailRequestHandler::RemoveAllRequests(void)
-	?SetMessagePartsStatus@CFSMailMessagePart@@QAEXW4TFSPartFetchState@@@Z @ 182 NONAME ; void CFSMailMessagePart::SetMessagePartsStatus(enum TFSPartFetchState)
-	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 183 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
-	?SetMessageId@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 184 NONAME ; void CFSMailMessageBase::SetMessageId(class TFSMailMsgId)
-	?SetContentType@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 185 NONAME ; void CFSMailMessagePart::SetContentType(class TDesC16 const &)
-	?NextL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 186 NONAME ; int CFSMailIterator::NextL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?ListMessagesL@CFSMailFolder@@QAEPAVMFSMailIterator@@W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 187 NONAME ; class MFSMailIterator * CFSMailFolder::ListMessagesL(enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
-	?NewLC@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 188 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewLC(class TFSMailMsgId)
-	?AppendAttachmentsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 189 NONAME ; void CFSMailMessagePart::AppendAttachmentsL(class RPointerArray<class CFSMailMessagePart> &)
-	?SetFolderName@CFSMailFolderBase@@QAEXABVTDesC16@@@Z @ 190 NONAME ; void CFSMailFolderBase::SetFolderName(class TDesC16 const &)
-	?AppendToRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 191 NONAME ; void CFSMailMessageBase::AppendToRecipient(class CFSMailAddress *)
-	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@ABVTDesC16@@VTFSMailMsgId@@@Z @ 192 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId)
-	?SupportsCopyFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 193 NONAME ; int CFSMailFolder::SupportsCopyFromL(enum TFSFolderType)
-	?SetSettingsUid@CFSMailBoxBase@@QAEXVTUid@@@Z @ 194 NONAME ; void CFSMailBoxBase::SetSettingsUid(class TUid)
-	?GetUnseenCount@CFSMailFolderBase@@QBEIXZ @ 195 NONAME ; unsigned int CFSMailFolderBase::GetUnseenCount(void) const
-	?SetReadOnlyPartSize@CFSMailMessagePart@@QAEXI@Z @ 196 NONAME ; void CFSMailMessagePart::SetReadOnlyPartSize(unsigned int)
-	?SetDate@CFSMailMessageBase@@QAEXVTTime@@@Z @ 197 NONAME ; void CFSMailMessageBase::SetDate(class TTime)
-	?NewL@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 198 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class TFSMailMsgId)
-	?mailMsgIdToNmId@NmConverter@@SA?AVNmId@@VTFSMailMsgId@@@Z @ 199 NONAME ; class NmId NmConverter::mailMsgIdToNmId(class TFSMailMsgId)
-	?SetEmailAddress@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 200 NONAME ; void CFSMailAddress::SetEmailAddress(class TDesC16 const &)
-	?GetLastSyncStatusL@CFSMailBox@@QAE?AVTFSProgress@@XZ @ 201 NONAME ; class TFSProgress CFSMailBox::GetLastSyncStatusL(void)
-	?NextL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 202 NONAME ; int CFSMailIterator::NextL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?SetUnreadCount@CFSMailFolderBase@@QAEXI@Z @ 203 NONAME ; void CFSMailFolderBase::SetUnreadCount(unsigned int)
-	?SetRCLInfo@CFSMailBoxBase@@QAEXVTUid@@I@Z @ 204 NONAME ; void CFSMailBoxBase::SetRCLInfo(class TUid, unsigned int)
-	?qstringToHBufCLC@NmConverter@@SAPAVHBufC16@@ABVQString@@@Z @ 205 NONAME ; class HBufC16 * NmConverter::qstringToHBufCLC(class QString const &)
-	?NewLC@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 206 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewLC(class TFSMailMsgId)
-	?AppendCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 207 NONAME ; void CFSMailMessageBase::AppendCCRecipient(class CFSMailAddress *)
-	?HasCapability@CFSMailBox@@QBEHW4TFSMailBoxCapabilities@@@Z @ 208 NONAME ; int CFSMailBox::HasCapability(enum TFSMailBoxCapabilities) const
-	?GetMessageId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 209 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMessageId(void) const
-	?GetSubject@CFSMailMessageBase@@QBEAAVTDesC16@@XZ @ 210 NONAME ; class TDesC16 & CFSMailMessageBase::GetSubject(void) const
-	?NewL@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 211 NONAME ; class CFSMailIterator * CFSMailIterator::NewL(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?RefreshNowL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 212 NONAME ; int CFSMailBox::RefreshNowL(class MFSMailRequestObserver &)
-	??1CFSMailRequestHandler@@UAE@XZ @ 213 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(void)
-	?SetSubFolderCount@CFSMailFolderBase@@QAEXI@Z @ 214 NONAME ; void CFSMailFolderBase::SetSubFolderCount(unsigned int)
-	?ClearCcRecipients@CFSMailMessageBase@@QAEXXZ @ 215 NONAME ; void CFSMailMessageBase::ClearCcRecipients(void)
-	?GetPartId@CFSMailMessagePart@@QBE?AVTFSMailMsgId@@XZ @ 216 NONAME ; class TFSMailMsgId CFSMailMessagePart::GetPartId(void) const
-	?RemoveDownLoadedAttachmentsL@CFSMailBox@@QAEXXZ @ 217 NONAME ; void CFSMailBox::RemoveDownLoadedAttachmentsL(void)
-	?GetReplyToAddress@CFSMailMessageBase@@QAEABVCFSMailAddress@@XZ @ 218 NONAME ; class CFSMailAddress const & CFSMailMessageBase::GetReplyToAddress(void)
-	?GetMailBoxId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 219 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetMailBoxId(void) const
-	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@V?$RArray@VTFSMailMsgId@@@@@Z @ 220 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &, class RArray<class TFSMailMsgId>)
-	?FetchedContentSize@CFSMailMessagePart@@QBEIXZ @ 221 NONAME ; unsigned int CFSMailMessagePart::FetchedContentSize(void) const
-	??1CFSMailBox@@UAE@XZ @ 222 NONAME ; CFSMailBox::~CFSMailBox(void)
-	?GetSubFoldersL@CFSMailFolder@@QAEXAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 223 NONAME ; void CFSMailFolder::GetSubFoldersL(class RPointerArray<class CFSMailFolder> &)
-	?SetFlag@CFSMailMessageBase@@QAEXH@Z @ 224 NONAME ; void CFSMailMessageBase::SetFlag(int)
-	?ConstructL@CFSMailRequestHandler@@IAEXV?$RPointerArray@VCImplementationInformation@@@@V?$RPointerArray@VCFSMailPlugin@@@@@Z @ 225 NONAME ; void CFSMailRequestHandler::ConstructL(class RPointerArray<class CImplementationInformation>, class RPointerArray<class CFSMailPlugin>)
-	?NewLC@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 226 NONAME ; class CFSMailIterator * CFSMailIterator::NewLC(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?SetContentSize@CFSMailMessagePart@@QAEXI@Z @ 227 NONAME ; void CFSMailMessagePart::SetContentSize(unsigned int)
-	?GetCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 228 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetCCRecipients(void)
-	?NewL@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 229 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewL(class TFSMailMsgId, class TFSMailMsgId)
-	?AddNewAttachmentL@CFSMailMessage@@QAEHABVTDesC16@@AAVMFSMailRequestObserver@@@Z @ 230 NONAME ; int CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class MFSMailRequestObserver &)
+	?GetNmMessageEnvelope@CFSMailMessageBase@@QAEPAVNmMessageEnvelope@@XZ @ 14 NONAME ; class NmMessageEnvelope * CFSMailMessageBase::GetNmMessageEnvelope(void)
+	?GetName@CFSMailBoxBase@@QBEAAVTDesC16@@XZ @ 15 NONAME ; class TDesC16 & CFSMailBoxBase::GetName(void) const
+	?SaveMessageL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 16 NONAME ; int CFSMailMessage::SaveMessageL(class MFSMailRequestObserver &)
+	?AttachmentListL@CFSMailMessage@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 17 NONAME ; void CFSMailMessage::AttachmentListL(class RPointerArray<class CFSMailMessagePart> &)
+	?NewL@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 18 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewL(class TFSMailMsgId)
+	?FetchMessagesPartsL@CFSMailMessagePart@@QAEHABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@I@Z @ 19 NONAME ; int CFSMailMessagePart::FetchMessagesPartsL(class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, unsigned int)
+	?AddPluginL@CFSMailRequestHandler@@QAEXVTUid@@PAVCFSMailPlugin@@@Z @ 20 NONAME ; void CFSMailRequestHandler::AddPluginL(class TUid, class CFSMailPlugin *)
+	?CurrentSyncState@CFSMailBox@@QBE?AW4TSSMailSyncState@@XZ @ 21 NONAME ; enum TSSMailSyncState CFSMailBox::CurrentSyncState(void) const
+	?SetAttachmentNameL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CFSMailMessagePart::SetAttachmentNameL(class TDesC16 const &)
+	?SaveMessagePartsL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 23 NONAME ; int CFSMailMessage::SaveMessagePartsL(class MFSMailRequestObserver &)
+	?MoveMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@1@Z @ 24 NONAME ; void CFSMailBox::MoveMessagesL(class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
+	?GetFolderName@CFSMailFolderBase@@QBEAAVTDesC16@@XZ @ 25 NONAME ; class TDesC16 & CFSMailFolderBase::GetFolderName(void) const
+	?GetDisplayName@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 26 NONAME ; class TDesC16 & CFSMailAddress::GetDisplayName(void) const
+	?SetSubject@CFSMailMessageBase@@QAEXABVTDesC16@@@Z @ 27 NONAME ; void CFSMailMessageBase::SetSubject(class TDesC16 const &)
+	?CreateReplyMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@HABVTDesC16@@@Z @ 28 NONAME ; class CFSMailMessage * CFSMailBox::CreateReplyMessage(class TFSMailMsgId, int, class TDesC16 const &)
+	??1CFSMailBoxBase@@UAE@XZ @ 29 NONAME ; CFSMailBoxBase::~CFSMailBoxBase(void)
+	?NewLC@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 30 NONAME ; class CFSMailBox * CFSMailBox::NewLC(class TFSMailMsgId)
+	?ConstructL@CFSMailMessageBase@@IAEXABVNmMessageEnvelope@@@Z @ 31 NONAME ; void CFSMailMessageBase::ConstructL(class NmMessageEnvelope const &)
+	?NewLC@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 32 NONAME ; class CFSMailFolder * CFSMailFolder::NewLC(class TFSMailMsgId)
+	?Uid@CEmailExtension@@QBE?AVTUid@@XZ @ 33 NONAME ; class TUid CEmailExtension::Uid(void) const
+	?GetNmMessage@CFSMailMessage@@QAEPAVNmMessage@@XZ @ 34 NONAME ; class NmMessage * CFSMailMessage::GetNmMessage(void)
+	?GetContentToBufferL@CFSMailMessagePart@@QAEXAAVTDes16@@I@Z @ 35 NONAME ; void CFSMailMessagePart::GetContentToBufferL(class TDes16 &, unsigned int)
+	?BlockCopyFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 36 NONAME ; void CFSMailFolderBase::BlockCopyFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
+	?ClearSearchResultCache@CFSMailBox@@QAEXXZ @ 37 NONAME ; void CFSMailBox::ClearSearchResultCache(void)
+	?CancelRequestL@CFSMailRequestHandler@@QAEXH@Z @ 38 NONAME ; void CFSMailRequestHandler::CancelRequestL(int)
+	?ExtensionL@CExtendableEmail@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 39 NONAME ; class CEmailExtension * CExtendableEmail::ExtensionL(class TUid const &)
+	?ListFolders@CFSMailBox@@QAEXVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 40 NONAME ; void CFSMailBox::ListFolders(class TFSMailMsgId, class RPointerArray<class CFSMailFolder> &)
+	?NewL@CFSMailMessage@@SAPAV1@ABVNmMessage@@@Z @ 41 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class NmMessage const &)
+	?HtmlBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 42 NONAME ; class CFSMailMessagePart * CFSMailMessage::HtmlBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	?GetEmailAddress@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 43 NONAME ; class TDesC16 & CFSMailAddress::GetEmailAddress(void) const
+	?FSMailSortCriteria2NM@NmConverter@@SA?AVNmMailSortCriteria@@VTFSMailSortCriteria@@@Z @ 44 NONAME ; class NmMailSortCriteria NmConverter::FSMailSortCriteria2NM(class TFSMailSortCriteria)
+	?NewL@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 45 NONAME ; class CFSMailBox * CFSMailBox::NewL(class TFSMailMsgId)
+	?CreateMessageToSendL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 46 NONAME ; int CFSMailBox::CreateMessageToSendL(class MFSMailRequestObserver &)
+	?ContentID@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 47 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentID(void)
+	?RemoveChildPartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 48 NONAME ; int CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId, class MFSMailRequestObserver &)
+	??1CFSMailFolder@@UAE@XZ @ 49 NONAME ; CFSMailFolder::~CFSMailFolder(void)
+	?IsRelatedTo@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 50 NONAME ; class TFSMailMsgId CFSMailMessageBase::IsRelatedTo(void) const
+	?GetContentFileL@CFSMailMessagePart@@QAE?AVRFile@@XZ @ 51 NONAME ; class RFile CFSMailMessagePart::GetContentFileL(void)
+	?AppendBCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 52 NONAME ; void CFSMailMessageBase::AppendBCCRecipient(class CFSMailAddress *)
+	?ExtensionL@CFSMailFolder@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 53 NONAME ; class CEmailExtension * CFSMailFolder::ExtensionL(class TUid const &)
+	??1CFSMailIterator@@UAE@XZ @ 54 NONAME ; CFSMailIterator::~CFSMailIterator(void)
+	?RemoveDownLoadedAttachmentsL@CFSMailMessagePart@@QAEXXZ @ 55 NONAME ; void CFSMailMessagePart::RemoveDownLoadedAttachmentsL(void)
+	?IsMessageL@CFSMailMessage@@UBEHXZ @ 56 NONAME ; int CFSMailMessage::IsMessageL(void) const
+	?GetNmMailbox@CFSMailBoxBase@@QAEPAVNmMailbox@@XZ @ 57 NONAME ; class NmMailbox * CFSMailBoxBase::GetNmMailbox(void)
+	?CreateReplyMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@HAAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 58 NONAME ; int CFSMailBox::CreateReplyMessageL(class TFSMailMsgId, int, class MFSMailRequestObserver &, class TDesC16 const &)
+	?NewL@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 59 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewL(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
+	?FetchLoadState@CFSMailMessagePart@@QBE?AW4TFSPartFetchState@@XZ @ 60 NONAME ; enum TFSPartFetchState CFSMailMessagePart::FetchLoadState(void) const
+	?toTTime@NmConverter@@SA?AVTTime@@ABVQDateTime@@@Z @ 61 NONAME ; class TTime NmConverter::toTTime(class QDateTime const &)
+	?RequestHandler@CFSMailMessageBase@@QAEAAVCFSMailRequestHandler@@XZ @ 62 NONAME ; class CFSMailRequestHandler & CFSMailMessageBase::RequestHandler(void)
+	?ContentTypeMatches@CFSMailMessagePart@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CFSMailMessagePart::ContentTypeMatches(class TDesC16 const &)
+	?ReleaseExtension@CFSMailFolder@@UAEXPAVCEmailExtension@@@Z @ 64 NONAME ; void CFSMailFolder::ReleaseExtension(class CEmailExtension *)
+	?nmIdToMailMsgId@NmConverter@@SA?AVTFSMailMsgId@@VNmId@@@Z @ 65 NONAME ; class TFSMailMsgId NmConverter::nmIdToMailMsgId(class NmId)
+	?ReleaseExtension@CExtendableEmail@@UAEXPAVCEmailExtension@@@Z @ 66 NONAME ; void CExtendableEmail::ReleaseExtension(class CEmailExtension *)
+	?ChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@@Z @ 67 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::ChildPartL(class TFSMailMsgId)
+	?GetId@CFSMailBoxBase@@QBE?AVTFSMailMsgId@@XZ @ 68 NONAME ; class TFSMailMsgId CFSMailBoxBase::GetId(void) const
+	?RefreshNowL@CFSMailBox@@QAEHXZ @ 69 NONAME ; int CFSMailBox::RefreshNowL(void)
+	?ContentDispositionParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 70 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentDispositionParameters(void)
+	?GetSettingsUid@CFSMailBoxBase@@QAE?BVTUid@@XZ @ 71 NONAME ; class TUid const CFSMailBoxBase::GetSettingsUid(void)
+	??1CFSMailMessage@@UAE@XZ @ 72 NONAME ; CFSMailMessage::~CFSMailMessage(void)
+	?GetStatus@CFSMailBoxBase@@QBE?AW4TFSMailBoxStatus@@XZ @ 73 NONAME ; enum TFSMailBoxStatus CFSMailBoxBase::GetStatus(void) const
+	?GoOfflineL@CFSMailBox@@QAEXXZ @ 74 NONAME ; void CFSMailBox::GoOfflineL(void)
+	?NewChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@ABVTDesC16@@@Z @ 75 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewChildPartL(class TFSMailMsgId, class TDesC16 const &)
+	?SetFolderId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 76 NONAME ; void CFSMailMessageBase::SetFolderId(class TFSMailMsgId)
+	?Remove@TEmailExtensions@@QAEXPBVCEmailExtension@@@Z @ 77 NONAME ; void TEmailExtensions::Remove(class CEmailExtension const *)
+	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@AAVRFile@@ABVTDesC8@@@Z @ 78 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class RFile &, class TDesC8 const &)
+	?ConstructL@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 79 NONAME ; void CFSMailMessageBase::ConstructL(class TFSMailMsgId)
+	?GetLocalTextContentLC@CFSMailMessagePart@@QAEPAVHBufC16@@XZ @ 80 NONAME ; class HBufC16 * CFSMailMessagePart::GetLocalTextContentLC(void)
+	?GetMRInfo@CFSMailMessagePart@@QAEAAVMMRInfoObject@@XZ @ 81 NONAME ; class MMRInfoObject & CFSMailMessagePart::GetMRInfo(void)
+	?SetRelatedTo@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 82 NONAME ; void CFSMailMessageBase::SetRelatedTo(class TFSMailMsgId)
+	?CreateForwardMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@ABVTDesC16@@@Z @ 83 NONAME ; class CFSMailMessage * CFSMailBox::CreateForwardMessage(class TFSMailMsgId, class TDesC16 const &)
+	?SetStatus@CFSMailBoxBase@@QAEXW4TFSMailBoxStatus@@@Z @ 84 NONAME ; void CFSMailBoxBase::SetStatus(enum TFSMailBoxStatus)
+	?SetContentIDL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 85 NONAME ; void CFSMailMessagePart::SetContentIDL(class TDesC16 const &)
+	?NewL@CFSMailAddress@@SAPAV1@ABVNmAddress@@@Z @ 86 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(class NmAddress const &)
+	?SetSender@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 87 NONAME ; void CFSMailMessageBase::SetSender(class CFSMailAddress *)
+	?SetCredentialsL@CFSMailBox@@QAEXABVTDesC16@@0@Z @ 88 NONAME ; void CFSMailBox::SetCredentialsL(class TDesC16 const &, class TDesC16 const &)
+	?NewLC@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 89 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewLC(class TFSMailMsgId)
+	??0CFSMailRequestHandler@@IAE@XZ @ 90 NONAME ; CFSMailRequestHandler::CFSMailRequestHandler(void)
+	??1CFSMailAddress@@UAE@XZ @ 91 NONAME ; CFSMailAddress::~CFSMailAddress(void)
+	?SetParentFolderId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 92 NONAME ; void CFSMailFolderBase::SetParentFolderId(class TFSMailMsgId)
+	?AttachmentNameL@CFSMailMessagePart@@QAEAAVTDesC16@@XZ @ 93 NONAME ; class TDesC16 & CFSMailMessagePart::AttachmentNameL(void)
+	?GetToRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 94 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetToRecipients(void)
+	?GetContentClass@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 95 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentClass(void)
+	?GetContentType@CFSMailMessagePart@@QBEABVTDesC16@@XZ @ 96 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentType(void) const
+	?SetOwnMailAddressL@CFSMailBoxBase@@QAEXPAVCFSMailAddress@@@Z @ 97 NONAME ; void CFSMailBoxBase::SetOwnMailAddressL(class CFSMailAddress *)
+	?GetSubFolderCount@CFSMailFolderBase@@QBEIXZ @ 98 NONAME ; unsigned int CFSMailFolderBase::GetSubFolderCount(void) const
+	?SetMRInfoProcessorL@CFSMailBoxBase@@QAEXPAVMMRInfoProcessor@@@Z @ 99 NONAME ; void CFSMailBoxBase::SetMRInfoProcessorL(class MMRInfoProcessor *)
+	?ContentSize@CFSMailMessagePart@@QBEIXZ @ 100 NONAME ; unsigned int CFSMailMessagePart::ContentSize(void) const
+	?toQString@NmConverter@@SA?AVQString@@ABVTDesC16@@@Z @ 101 NONAME ; class QString NmConverter::toQString(class TDesC16 const &)
+	?NewLC@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 102 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewLC(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
+	?SetMessagePartsStatus@CFSMailMessagePart@@QAEXW4TFSPartFetchState@@@Z @ 103 NONAME ; void CFSMailMessagePart::SetMessagePartsStatus(enum TFSPartFetchState)
+	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 104 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
+	?SetContentType@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 105 NONAME ; void CFSMailMessagePart::SetContentType(class TDesC16 const &)
+	??_ECExtendableEmail@@UAE@I@Z @ 106 NONAME ; CExtendableEmail::~CExtendableEmail(unsigned int)
+	?NewLC@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 107 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewLC(class TFSMailMsgId)
+	?AppendAttachmentsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 108 NONAME ; void CFSMailMessagePart::AppendAttachmentsL(class RPointerArray<class CFSMailMessagePart> &)
+	?AppendToRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 109 NONAME ; void CFSMailMessageBase::AppendToRecipient(class CFSMailAddress *)
+	?SupportsCopyFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 110 NONAME ; int CFSMailFolder::SupportsCopyFromL(enum TFSFolderType)
+	?NewL@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 111 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class TFSMailMsgId)
+	?GetLastSyncStatusL@CFSMailBox@@QAE?AVTFSProgress@@XZ @ 112 NONAME ; class TFSProgress CFSMailBox::GetLastSyncStatusL(void)
+	?NextL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 113 NONAME ; int CFSMailIterator::NextL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?NewLC@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 114 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewLC(class TFSMailMsgId)
+	?SetSubFolderCount@CFSMailFolderBase@@QAEXI@Z @ 115 NONAME ; void CFSMailFolderBase::SetSubFolderCount(unsigned int)
+	?RemoveDownLoadedAttachmentsL@CFSMailBox@@QAEXXZ @ 116 NONAME ; void CFSMailBox::RemoveDownLoadedAttachmentsL(void)
+	?GetMailBoxId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 117 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetMailBoxId(void) const
+	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@V?$RArray@VTFSMailMsgId@@@@@Z @ 118 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &, class RArray<class TFSMailMsgId>)
+	?FetchedContentSize@CFSMailMessagePart@@QBEIXZ @ 119 NONAME ; unsigned int CFSMailMessagePart::FetchedContentSize(void) const
+	?GetSubFoldersL@CFSMailFolder@@QAEXAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 120 NONAME ; void CFSMailFolder::GetSubFoldersL(class RPointerArray<class CFSMailFolder> &)
+	?ConstructL@CFSMailRequestHandler@@IAEXV?$RPointerArray@VCImplementationInformation@@@@V?$RPointerArray@VCFSMailPlugin@@@@@Z @ 121 NONAME ; void CFSMailRequestHandler::ConstructL(class RPointerArray<class CImplementationInformation>, class RPointerArray<class CFSMailPlugin>)
+	?NewLC@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 122 NONAME ; class CFSMailIterator * CFSMailIterator::NewLC(class MFSMailIterator &, class CFSMailRequestHandler *)
+	?SetContentSize@CFSMailMessagePart@@QAEXI@Z @ 123 NONAME ; void CFSMailMessagePart::SetContentSize(unsigned int)
+	?GetTempDirL@CFSMailRequestHandler@@QAEAAVTDesC16@@XZ @ 124 NONAME ; class TDesC16 & CFSMailRequestHandler::GetTempDirL(void)
+	?ClearBccRecipients@CFSMailMessageBase@@QAEXXZ @ 125 NONAME ; void CFSMailMessageBase::ClearBccRecipients(void)
+	?CancelSearch@CFSMailBox@@QAEXXZ @ 126 NONAME ; void CFSMailBox::CancelSearch(void)
+	?SetUnseenCount@CFSMailFolderBase@@QAEXI@Z @ 127 NONAME ; void CFSMailFolderBase::SetUnseenCount(unsigned int)
+	?GetMailBoxStatus@CFSMailBox@@QAE?AW4TFSMailBoxStatus@@XZ @ 128 NONAME ; enum TFSMailBoxStatus CFSMailBox::GetMailBoxStatus(void)
+	?SaveMessageL@CFSMailMessage@@QAEXXZ @ 129 NONAME ; void CFSMailMessage::SaveMessageL(void)
+	?IsFlagSet@CFSMailMessageBase@@QBEHH@Z @ 130 NONAME ; int CFSMailMessageBase::IsFlagSet(int) const
+	?SetReplyToAddress@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 131 NONAME ; void CFSMailMessageBase::SetReplyToAddress(class CFSMailAddress *)
+	?GetBCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 132 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetBCCRecipients(void)
+	?NewL@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 133 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewL(class TFSMailMsgId)
+	??1CFSMailMessageBase@@UAE@XZ @ 134 NONAME ; CFSMailMessageBase::~CFSMailMessageBase(void)
+	?SetContentDisposition@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 135 NONAME ; void CFSMailMessagePart::SetContentDisposition(class TDesC16 const &)
+	?NewL@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 136 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewL(class TFSMailMsgId)
+	?GetMessageCount@CFSMailFolderBase@@QBEIXZ @ 137 NONAME ; unsigned int CFSMailFolderBase::GetMessageCount(void) const
+	?RemoveChildPartL@CFSMailMessagePart@@QAEXVTFSMailMsgId@@@Z @ 138 NONAME ; void CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId)
+	?ConstructL@CFSMailFolderBase@@IAEXVTFSMailMsgId@@@Z @ 139 NONAME ; void CFSMailFolderBase::ConstructL(class TFSMailMsgId)
+	?CopyContentFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 140 NONAME ; void CFSMailMessagePart::CopyContentFileL(class TDesC16 const &)
+	?GetParentFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 141 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetParentFolderId(void) const
+	?RemoveContentL@CFSMailMessagePart@@QAEXXZ @ 142 NONAME ; void CFSMailMessagePart::RemoveContentL(void)
+	?ReleaseExtension@CFSMailMessageBase@@UAEXPAVCEmailExtension@@@Z @ 143 NONAME ; void CFSMailMessageBase::ReleaseExtension(class CEmailExtension *)
+	??_ECFSMailRequestHandler@@UAE@I@Z @ 144 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(unsigned int)
+	?IsMessageL@CFSMailMessagePart@@UBEHXZ @ 145 NONAME ; int CFSMailMessagePart::IsMessageL(void) const
+	?NewL@CFSMailAddress@@SAPAV1@XZ @ 146 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(void)
+	?AddNewAttachmentL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@VTFSMailMsgId@@0@Z @ 147 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId, class TDesC16 const &)
+	?GetSender@CFSMailMessageBase@@QBEPAVCFSMailAddress@@XZ @ 148 NONAME ; class CFSMailAddress * CFSMailMessageBase::GetSender(void) const
+	?ExtensionL@CFSMailBox@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 149 NONAME ; class CEmailExtension * CFSMailBox::ExtensionL(class TUid const &)
+	?GetMailBoxId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 150 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMailBoxId(void) const
+	?ContentDescription@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 151 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDescription(void)
+	?SendMessageL@CFSMailBox@@QAEHAAVCFSMailMessage@@AAVMFSMailRequestObserver@@@Z @ 152 NONAME ; int CFSMailBox::SendMessageL(class CFSMailMessage &, class MFSMailRequestObserver &)
+	?GetFolderType@CFSMailFolderBase@@QBE?AW4TFSFolderType@@XZ @ 153 NONAME ; enum TFSFolderType CFSMailFolderBase::GetFolderType(void) const
+	?FetchMessagesL@CFSMailFolder@@QAEHABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@@Z @ 154 NONAME ; int CFSMailFolder::FetchMessagesL(class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &)
+	?AddNewAttachmentL@CFSMailMessage@@QAEHABVTDesC16@@AAVMFSMailRequestObserver@@@Z @ 155 NONAME ; int CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class MFSMailRequestObserver &)
+	?toQDateTime@NmConverter@@SA?AVQDateTime@@ABVTTime@@@Z @ 156 NONAME ; class QDateTime NmConverter::toQDateTime(class TTime const &)
+	?IsMRInfoSet@CFSMailMessagePart@@QAEHXZ @ 157 NONAME ; int CFSMailMessagePart::IsMRInfoSet(void)
+	?SetContentClass@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 158 NONAME ; void CFSMailMessagePart::SetContentClass(class TDesC16 const &)
+	?GetNmFolder@CFSMailFolderBase@@QAEPAVNmFolder@@XZ @ 159 NONAME ; class NmFolder * CFSMailFolderBase::GetNmFolder(void)
+	?GetFolderId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 160 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetFolderId(void) const
+	?ContentDisposition@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 161 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDisposition(void)
+	?BlockMoveFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 162 NONAME ; void CFSMailFolderBase::BlockMoveFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
+	?GetConnectionId@CFSMailBox@@QAEHAAK@Z @ 163 NONAME ; int CFSMailBox::GetConnectionId(unsigned long &)
+	?ReadOnlyPartSize@CFSMailMessagePart@@QBEIXZ @ 164 NONAME ; unsigned int CFSMailMessagePart::ReadOnlyPartSize(void) const
+	?RemoveDownLoadedAttachmentsL@CFSMailFolder@@QAEXXZ @ 165 NONAME ; void CFSMailFolder::RemoveDownLoadedAttachmentsL(void)
+	?NewLC@CFSMailAddress@@SAPAV1@XZ @ 166 NONAME ; class CFSMailAddress * CFSMailAddress::NewLC(void)
+	?ChildPartsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@W4TFSMailMessagePartDataSource@1@@Z @ 167 NONAME ; void CFSMailMessagePart::ChildPartsL(class RPointerArray<class CFSMailMessagePart> &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	?SetDisplayName@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 168 NONAME ; void CFSMailAddress::SetDisplayName(class TDesC16 const &)
+	?SetMailBoxId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 169 NONAME ; void CFSMailMessageBase::SetMailBoxId(class TFSMailMsgId)
+	?GetFlags@CFSMailMessageBase@@QBEHXZ @ 170 NONAME ; int CFSMailMessageBase::GetFlags(void) const
+	?CopyMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@AAV2@VTFSMailMsgId@@2@Z @ 171 NONAME ; void CFSMailBox::CopyMessagesL(class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId, class TFSMailMsgId)
+	?ClearToRecipients@CFSMailMessageBase@@QAEXXZ @ 172 NONAME ; void CFSMailMessageBase::ClearToRecipients(void)
+	?IsConnectionAllowedWhenRoaming@CFSMailBox@@QAEHAAH@Z @ 173 NONAME ; int CFSMailBox::IsConnectionAllowedWhenRoaming(int &)
+	?CopyMessageAsChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@PAVCFSMailMessage@@@Z @ 174 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::CopyMessageAsChildPartL(class TFSMailMsgId, class CFSMailMessage *)
+	?PreviousL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 175 NONAME ; int CFSMailIterator::PreviousL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?CancelSyncL@CFSMailBox@@QAEXXZ @ 176 NONAME ; void CFSMailBox::CancelSyncL(void)
+	?ListFolders@CFSMailBox@@QAEAAV?$RPointerArray@VCFSMailFolder@@@@XZ @ 177 NONAME ; class RPointerArray<class CFSMailFolder> & CFSMailBox::ListFolders(void)
+	?PlainTextBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 178 NONAME ; class CFSMailMessagePart * CFSMailMessage::PlainTextBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	??0CExtendableEmail@@IAE@XZ @ 179 NONAME ; CExtendableEmail::CExtendableEmail(void)
+	?SetName@CFSMailBoxBase@@QAEXABVTDesC16@@@Z @ 180 NONAME ; void CFSMailBoxBase::SetName(class TDesC16 const &)
+	?CleanTempDirL@CFSMailRequestHandler@@QAEXXZ @ 181 NONAME ; void CFSMailRequestHandler::CleanTempDirL(void)
+	?SupportsMoveFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 182 NONAME ; int CFSMailFolder::SupportsMoveFromL(enum TFSFolderType)
+	?toRPointerArray@NmConverter@@SA?AV?$RPointerArray@VCFSMailAddress@@@@ABV?$QList@VNmAddress@@@@@Z @ 183 NONAME ; class RPointerArray<class CFSMailAddress> NmConverter::toRPointerArray(class QList<class NmAddress> const &)
+	?UpdateMessageFlagsL@CFSMailBox@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@@Z @ 184 NONAME ; int CFSMailBox::UpdateMessageFlagsL(class TFSMailMsgId, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &)
+	?GetDate@CFSMailMessageBase@@QBE?AVTTime@@XZ @ 185 NONAME ; class TTime CFSMailMessageBase::GetDate(void) const
+	?PreviousL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 186 NONAME ; int CFSMailIterator::PreviousL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?ReleaseExtension@CFSMailBox@@UAEXPAVCEmailExtension@@@Z @ 187 NONAME ; void CFSMailBox::ReleaseExtension(class CEmailExtension *)
+	?NewLC@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 188 NONAME ; class CFSMailMessage * CFSMailMessage::NewLC(class TFSMailMsgId)
+	?GetRCLInfo@CFSMailBoxBase@@QAEXAAVTUid@@AAI@Z @ 189 NONAME ; void CFSMailBoxBase::GetRCLInfo(class TUid &, unsigned int &)
+	?MRInfoProcessorL@CFSMailBoxBase@@QAEAAVMMRInfoProcessor@@XZ @ 190 NONAME ; class MMRInfoProcessor & CFSMailBoxBase::MRInfoProcessorL(void)
+	?GetUnreadCount@CFSMailFolderBase@@QBEIXZ @ 191 NONAME ; unsigned int CFSMailFolderBase::GetUnreadCount(void) const
+	?FindBodyPartL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@W4TFSMailMessagePartDataSource@1@@Z @ 192 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::FindBodyPartL(class TDesC16 const &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	?GetTempFileL@CFSMailRequestHandler@@QAE?AVRFile@@VTFSMailMsgId@@V?$TBuf@$0BAA@@@@Z @ 193 NONAME ; class RFile CFSMailRequestHandler::GetTempFileL(class TFSMailMsgId, class TBuf<256>)
+	?CreateForwardMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 194 NONAME ; int CFSMailBox::CreateForwardMessageL(class TFSMailMsgId, class MFSMailRequestObserver &, class TDesC16 const &)
+	?OwnMailAddress@CFSMailBoxBase@@QAEAAVCFSMailAddress@@XZ @ 195 NONAME ; class CFSMailAddress & CFSMailBoxBase::OwnMailAddress(void)
+	?SetMailBoxId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 196 NONAME ; void CFSMailFolderBase::SetMailBoxId(class TFSMailMsgId)
+	?SetContent@CFSMailMessagePart@@QAEXAAVTDes16@@@Z @ 197 NONAME ; void CFSMailMessagePart::SetContent(class TDes16 &)
+	?RemoveMessageL@CFSMailFolder@@QAEXVTFSMailMsgId@@@Z @ 198 NONAME ; void CFSMailFolder::RemoveMessageL(class TFSMailMsgId)
+	?CreateMessageFromFileL@CFSMailBox@@QAEPAVCFSMailMessage@@ABVRFile@@@Z @ 199 NONAME ; class CFSMailMessage * CFSMailBox::CreateMessageFromFileL(class RFile const &)
+	?CompleteRequest@CFSMailRequestHandler@@QAEXH@Z @ 200 NONAME ; void CFSMailRequestHandler::CompleteRequest(int)
+	?GetFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 201 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetFolderId(void) const
+	?SetMRInfo@CFSMailMessagePart@@QAEXPAVMMRInfoObject@@@Z @ 202 NONAME ; void CFSMailMessagePart::SetMRInfo(class MMRInfoObject *)
+	?GoOnlineL@CFSMailBox@@QAEXXZ @ 203 NONAME ; void CFSMailBox::GoOnlineL(void)
+	?SetMessageCount@CFSMailFolderBase@@QAEXI@Z @ 204 NONAME ; void CFSMailFolderBase::SetMessageCount(unsigned int)
+	??1CFSMailMessagePart@@UAE@XZ @ 205 NONAME ; CFSMailMessagePart::~CFSMailMessagePart(void)
+	?NewLC@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 206 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class TFSMailMsgId, class TFSMailMsgId)
+	?NewLC@CFSMailMessagePart@@SAPAV1@ABVNmId@@ABVNmMessagePart@@@Z @ 207 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class NmId const &, class NmMessagePart const &)
+	??1TEmailExtensions@@QAE@XZ @ 208 NONAME ; TEmailExtensions::~TEmailExtensions(void)
+	?ContentTypeParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 209 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentTypeParameters(void)
+	?GetNmMessagePart@CFSMailMessagePart@@QAEPAVNmMessagePart@@XZ @ 210 NONAME ; class NmMessagePart * CFSMailMessagePart::GetNmMessagePart(void)
+	?NMMailSortCriteria2FS@NmConverter@@SA?AVTFSMailSortCriteria@@VNmMailSortCriteria@@@Z @ 211 NONAME ; class TFSMailSortCriteria NmConverter::NMMailSortCriteria2FS(class NmMailSortCriteria)
+	?SetContentDescription@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 212 NONAME ; void CFSMailMessagePart::SetContentDescription(class TDesC16 const &)
+	?GetPluginByUid@CFSMailRequestHandler@@QAEPAVCFSMailPlugin@@VTFSMailMsgId@@@Z @ 213 NONAME ; class CFSMailPlugin * CFSMailRequestHandler::GetPluginByUid(class TFSMailMsgId)
+	?FetchMessagePartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@I@Z @ 214 NONAME ; int CFSMailMessagePart::FetchMessagePartL(class TFSMailMsgId, class MFSMailRequestObserver &, unsigned int)
+	?InitAsyncRequestL@CFSMailRequestHandler@@QAE?AVTFSPendingRequest@@VTUid@@AAVMFSMailRequestObserver@@@Z @ 215 NONAME ; class TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL(class TUid, class MFSMailRequestObserver &)
+	?SetContentFromFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 216 NONAME ; void CFSMailMessagePart::SetContentFromFileL(class TDesC16 const &)
+	?GetNmAddress@CFSMailAddress@@QAE?AVNmAddress@@XZ @ 217 NONAME ; class NmAddress CFSMailAddress::GetNmAddress(void)
+	?GetBrandingIdL@CFSMailBox@@QAEAAVTDesC16@@XZ @ 218 NONAME ; class TDesC16 & CFSMailBox::GetBrandingIdL(void)
+	?NewL@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 219 NONAME ; class CFSMailFolder * CFSMailFolder::NewL(class TFSMailMsgId)
+	?RemoveAllRequests@CFSMailRequestHandler@@AAEXXZ @ 220 NONAME ; void CFSMailRequestHandler::RemoveAllRequests(void)
+	?SetFetchedContentSize@CFSMailMessagePart@@QAEXI@Z @ 221 NONAME ; void CFSMailMessagePart::SetFetchedContentSize(unsigned int)
+	?SetMessageId@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 222 NONAME ; void CFSMailMessageBase::SetMessageId(class TFSMailMsgId)
+	?ListMessagesL@CFSMailFolder@@QAEPAVMFSMailIterator@@W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 223 NONAME ; class MFSMailIterator * CFSMailFolder::ListMessagesL(enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
+	?NextL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 224 NONAME ; int CFSMailIterator::NextL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?SetFolderName@CFSMailFolderBase@@QAEXABVTDesC16@@@Z @ 225 NONAME ; void CFSMailFolderBase::SetFolderName(class TDesC16 const &)
+	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@ABVTDesC16@@VTFSMailMsgId@@@Z @ 226 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId)
+	?SetSettingsUid@CFSMailBoxBase@@QAEXVTUid@@@Z @ 227 NONAME ; void CFSMailBoxBase::SetSettingsUid(class TUid)
+	??0CEmailExtension@@IAE@ABVTUid@@@Z @ 228 NONAME ; CEmailExtension::CEmailExtension(class TUid const &)
+	?GetUnseenCount@CFSMailFolderBase@@QBEIXZ @ 229 NONAME ; unsigned int CFSMailFolderBase::GetUnseenCount(void) const
+	?SetDate@CFSMailMessageBase@@QAEXVTTime@@@Z @ 230 NONAME ; void CFSMailMessageBase::SetDate(class TTime)
+	?SetReadOnlyPartSize@CFSMailMessagePart@@QAEXI@Z @ 231 NONAME ; void CFSMailMessagePart::SetReadOnlyPartSize(unsigned int)
+	?mailMsgIdToNmId@NmConverter@@SA?AVNmId@@VTFSMailMsgId@@@Z @ 232 NONAME ; class NmId NmConverter::mailMsgIdToNmId(class TFSMailMsgId)
+	?SetEmailAddress@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 233 NONAME ; void CFSMailAddress::SetEmailAddress(class TDesC16 const &)
+	?SetUnreadCount@CFSMailFolderBase@@QAEXI@Z @ 234 NONAME ; void CFSMailFolderBase::SetUnreadCount(unsigned int)
+	?SetRCLInfo@CFSMailBoxBase@@QAEXVTUid@@I@Z @ 235 NONAME ; void CFSMailBoxBase::SetRCLInfo(class TUid, unsigned int)
+	??1CExtendableEmail@@UAE@XZ @ 236 NONAME ; CExtendableEmail::~CExtendableEmail(void)
+	?qstringToHBufCLC@NmConverter@@SAPAVHBufC16@@ABVQString@@@Z @ 237 NONAME ; class HBufC16 * NmConverter::qstringToHBufCLC(class QString const &)
+	?AppendCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 238 NONAME ; void CFSMailMessageBase::AppendCCRecipient(class CFSMailAddress *)
+	?HasCapability@CFSMailBox@@QBEHW4TFSMailBoxCapabilities@@@Z @ 239 NONAME ; int CFSMailBox::HasCapability(enum TFSMailBoxCapabilities) const
+	?GetSubject@CFSMailMessageBase@@QBEAAVTDesC16@@XZ @ 240 NONAME ; class TDesC16 & CFSMailMessageBase::GetSubject(void) const
+	?GetMessageId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 241 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMessageId(void) const
+	?NewL@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 242 NONAME ; class CFSMailIterator * CFSMailIterator::NewL(class MFSMailIterator &, class CFSMailRequestHandler *)
+	?RefreshNowL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 243 NONAME ; int CFSMailBox::RefreshNowL(class MFSMailRequestObserver &)
+	?Extension@TEmailExtensions@@QBEPAVCEmailExtension@@H@Z @ 244 NONAME ; class CEmailExtension * TEmailExtensions::Extension(int) const
+	??1CFSMailRequestHandler@@UAE@XZ @ 245 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(void)
+	?DecRef@CEmailExtension@@QAEIXZ @ 246 NONAME ; unsigned int CEmailExtension::DecRef(void)
+	?AddL@TEmailExtensions@@QAEXPAVCEmailExtension@@@Z @ 247 NONAME ; void TEmailExtensions::AddL(class CEmailExtension *)
+	?GetPartId@CFSMailMessagePart@@QBE?AVTFSMailMsgId@@XZ @ 248 NONAME ; class TFSMailMsgId CFSMailMessagePart::GetPartId(void) const
+	?ClearCcRecipients@CFSMailMessageBase@@QAEXXZ @ 249 NONAME ; void CFSMailMessageBase::ClearCcRecipients(void)
+	?ExtensionL@CFSMailMessageBase@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 250 NONAME ; class CEmailExtension * CFSMailMessageBase::ExtensionL(class TUid const &)
+	?GetReplyToAddress@CFSMailMessageBase@@QAEABVCFSMailAddress@@XZ @ 251 NONAME ; class CFSMailAddress const & CFSMailMessageBase::GetReplyToAddress(void)
+	?IncRef@CEmailExtension@@QAEXXZ @ 252 NONAME ; void CEmailExtension::IncRef(void)
+	??1CFSMailBox@@UAE@XZ @ 253 NONAME ; CFSMailBox::~CFSMailBox(void)
+	?SetFlag@CFSMailMessageBase@@QAEXH@Z @ 254 NONAME ; void CFSMailMessageBase::SetFlag(int)
+	?MoveMessagesL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@ABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@2@Z @ 255 NONAME ; int CFSMailBox::MoveMessagesL(class MFSMailRequestObserver &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
+	??_ECEmailExtension@@UAE@I@Z @ 256 NONAME ; CEmailExtension::~CEmailExtension(unsigned int)
+	?GetCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 257 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetCCRecipients(void)
+	?NewL@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 258 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewL(class TFSMailMsgId, class TFSMailMsgId)
 

--- a/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Mon May 03 12:23:15 2010 +0300
@@ -1,260 +1,295 @@
 EXPORTS
-	_ZN10CFSMailBox10GoOfflineLEv @ 1 NONAME
-	_ZN10CFSMailBox11CancelSyncLEv @ 2 NONAME
-	_ZN10CFSMailBox11ListFoldersE12TFSMailMsgIdR13RPointerArrayI13CFSMailFolderE @ 3 NONAME
-	_ZN10CFSMailBox11ListFoldersEv @ 4 NONAME
-	_ZN10CFSMailBox11RefreshNowLER22MFSMailRequestObserver @ 5 NONAME
-	_ZN10CFSMailBox11RefreshNowLEv @ 6 NONAME
-	_ZN10CFSMailBox12CancelSearchEv @ 7 NONAME
-	_ZN10CFSMailBox12SendMessageLER14CFSMailMessage @ 8 NONAME
-	_ZN10CFSMailBox12SendMessageLER14CFSMailMessageR22MFSMailRequestObserver @ 9 NONAME
-	_ZN10CFSMailBox13CopyMessagesLERK6RArrayI12TFSMailMsgIdERS2_S1_S1_ @ 10 NONAME
-	_ZN10CFSMailBox13MoveMessagesLERK6RArrayI12TFSMailMsgIdES1_S1_ @ 11 NONAME
-	_ZN10CFSMailBox14GetBrandingIdLEv @ 12 NONAME
-	_ZN10CFSMailBox15GetConnectionIdERm @ 13 NONAME
-	_ZN10CFSMailBox15SetCredentialsLERK7TDesC16S2_ @ 14 NONAME
-	_ZN10CFSMailBox16GetMailBoxStatusEv @ 15 NONAME
-	_ZN10CFSMailBox18CreateReplyMessageE12TFSMailMsgIdiRK7TDesC16 @ 16 NONAME
-	_ZN10CFSMailBox18GetLastSyncStatusLEv @ 17 NONAME
-	_ZN10CFSMailBox19CreateMessageToSendEv @ 18 NONAME
-	_ZN10CFSMailBox19CreateReplyMessageLE12TFSMailMsgIdiR22MFSMailRequestObserverRK7TDesC16 @ 19 NONAME
-	_ZN10CFSMailBox19GetStandardFolderIdE13TFSFolderType @ 20 NONAME
-	_ZN10CFSMailBox19UpdateMessageFlagsLE12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserver @ 21 NONAME
-	_ZN10CFSMailBox20CreateForwardMessageE12TFSMailMsgIdRK7TDesC16 @ 22 NONAME
-	_ZN10CFSMailBox20CreateMessageToSendLER22MFSMailRequestObserver @ 23 NONAME
-	_ZN10CFSMailBox21CreateForwardMessageLE12TFSMailMsgIdR22MFSMailRequestObserverRK7TDesC16 @ 24 NONAME
-	_ZN10CFSMailBox22ClearSearchResultCacheEv @ 25 NONAME
-	_ZN10CFSMailBox28RemoveDownLoadedAttachmentsLEv @ 26 NONAME
-	_ZN10CFSMailBox30IsConnectionAllowedWhenRoamingERi @ 27 NONAME
-	_ZN10CFSMailBox4NewLE12TFSMailMsgId @ 28 NONAME
-	_ZN10CFSMailBox5NewLCE12TFSMailMsgId @ 29 NONAME
-	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 30 NONAME
-	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver6RArrayI12TFSMailMsgIdE @ 31 NONAME
-	_ZN10CFSMailBox9GoOnlineLEv @ 32 NONAME
-	_ZN10CFSMailBoxD0Ev @ 33 NONAME
-	_ZN10CFSMailBoxD1Ev @ 34 NONAME
-	_ZN10CFSMailBoxD2Ev @ 35 NONAME
-	_ZN11NmConverter11toQDateTimeERK5TTime @ 36 NONAME
-	_ZN11NmConverter15mailMsgIdToNmIdE12TFSMailMsgId @ 37 NONAME
-	_ZN11NmConverter15nmIdToMailMsgIdE4NmId @ 38 NONAME
-	_ZN11NmConverter15toRPointerArrayERK5QListI9NmAddressE @ 39 NONAME
-	_ZN11NmConverter16qstringToHBufCLCERK7QString @ 40 NONAME
-	_ZN11NmConverter21FSMailSortCriteria2NME19TFSMailSortCriteria @ 41 NONAME
-	_ZN11NmConverter21NMMailSortCriteria2FSE18NmMailSortCriteria @ 42 NONAME
-	_ZN11NmConverter7toTTimeERK9QDateTime @ 43 NONAME
-	_ZN11NmConverter9toQStringERK7TDesC16 @ 44 NONAME
-	_ZN13CFSMailFolder13ListMessagesLE14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 45 NONAME
-	_ZN13CFSMailFolder14FetchMessagesLERK6RArrayI12TFSMailMsgIdE14TFSMailDetailsR22MFSMailRequestObserver @ 46 NONAME
-	_ZN13CFSMailFolder14GetSubFoldersLER13RPointerArrayIS_E @ 47 NONAME
-	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgId @ 48 NONAME
-	_ZN13CFSMailFolder17SupportsCopyFromLE13TFSFolderType @ 49 NONAME
-	_ZN13CFSMailFolder17SupportsMoveFromLE13TFSFolderType @ 50 NONAME
-	_ZN13CFSMailFolder28RemoveDownLoadedAttachmentsLEv @ 51 NONAME
-	_ZN13CFSMailFolder4NewLE12TFSMailMsgId @ 52 NONAME
-	_ZN13CFSMailFolder5NewLCE12TFSMailMsgId @ 53 NONAME
-	_ZN13CFSMailFolderD0Ev @ 54 NONAME
-	_ZN13CFSMailFolderD1Ev @ 55 NONAME
-	_ZN13CFSMailFolderD2Ev @ 56 NONAME
-	_ZN14CFSMailAddress12GetNmAddressEv @ 57 NONAME
-	_ZN14CFSMailAddress14SetDisplayNameERK7TDesC16 @ 58 NONAME
-	_ZN14CFSMailAddress15SetEmailAddressERK7TDesC16 @ 59 NONAME
-	_ZN14CFSMailAddress4NewLERK9NmAddress @ 60 NONAME
-	_ZN14CFSMailAddress4NewLEv @ 61 NONAME
-	_ZN14CFSMailAddress5NewLCEv @ 62 NONAME
-	_ZN14CFSMailAddressD0Ev @ 63 NONAME
-	_ZN14CFSMailAddressD1Ev @ 64 NONAME
-	_ZN14CFSMailAddressD2Ev @ 65 NONAME
-	_ZN14CFSMailBoxBase10GetRCLInfoER4TUidRj @ 66 NONAME
-	_ZN14CFSMailBoxBase10SetRCLInfoE4TUidj @ 67 NONAME
-	_ZN14CFSMailBoxBase12GetNmMailboxEv @ 68 NONAME
-	_ZN14CFSMailBoxBase14GetSettingsUidEv @ 69 NONAME
-	_ZN14CFSMailBoxBase14OwnMailAddressEv @ 70 NONAME
-	_ZN14CFSMailBoxBase14SetSettingsUidE4TUid @ 71 NONAME
-	_ZN14CFSMailBoxBase16MRInfoProcessorLEv @ 72 NONAME
-	_ZN14CFSMailBoxBase18SetOwnMailAddressLEP14CFSMailAddress @ 73 NONAME
-	_ZN14CFSMailBoxBase19SetMRInfoProcessorLEP16MMRInfoProcessor @ 74 NONAME
-	_ZN14CFSMailBoxBase20IsMRInfoProcessorSetEv @ 75 NONAME
-	_ZN14CFSMailBoxBase4NewLE12TFSMailMsgId @ 76 NONAME
-	_ZN14CFSMailBoxBase5NewLCE12TFSMailMsgId @ 77 NONAME
-	_ZN14CFSMailBoxBase7SetNameERK7TDesC16 @ 78 NONAME
-	_ZN14CFSMailBoxBase9SetStatusE16TFSMailBoxStatus @ 79 NONAME
-	_ZN14CFSMailBoxBaseD0Ev @ 80 NONAME
-	_ZN14CFSMailBoxBaseD1Ev @ 81 NONAME
-	_ZN14CFSMailBoxBaseD2Ev @ 82 NONAME
-	_ZN14CFSMailMessage12GetNmMessageEv @ 83 NONAME
-	_ZN14CFSMailMessage12SaveMessageLER22MFSMailRequestObserver @ 84 NONAME
-	_ZN14CFSMailMessage12SaveMessageLEv @ 85 NONAME
-	_ZN14CFSMailMessage13HtmlBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 86 NONAME
-	_ZN14CFSMailMessage15AttachmentListLER13RPointerArrayI18CFSMailMessagePartE @ 87 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLER5RFileRK6TDesC8 @ 88 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC1612TFSMailMsgId @ 89 NONAME
-	_ZN14CFSMailMessage17SaveMessagePartsLER22MFSMailRequestObserver @ 90 NONAME
-	_ZN14CFSMailMessage18PlainTextBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 91 NONAME
-	_ZN14CFSMailMessage4NewLE12TFSMailMsgId @ 92 NONAME
-	_ZN14CFSMailMessage4NewLERK9NmMessage @ 93 NONAME
-	_ZN14CFSMailMessage5NewLCE12TFSMailMsgId @ 94 NONAME
-	_ZN14CFSMailMessageD0Ev @ 95 NONAME
-	_ZN14CFSMailMessageD1Ev @ 96 NONAME
-	_ZN14CFSMailMessageD2Ev @ 97 NONAME
-	_ZN15CFSMailIterator4NewLER15MFSMailIteratorP21CFSMailRequestHandler @ 98 NONAME
-	_ZN15CFSMailIterator5NewLCER15MFSMailIteratorP21CFSMailRequestHandler @ 99 NONAME
-	_ZN15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 100 NONAME
-	_ZN15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 101 NONAME
-	_ZN15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 102 NONAME
-	_ZN15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 103 NONAME
-	_ZN15CFSMailIteratorD0Ev @ 104 NONAME
-	_ZN15CFSMailIteratorD1Ev @ 105 NONAME
-	_ZN15CFSMailIteratorD2Ev @ 106 NONAME
-	_ZN17CFSMailFolderBase10ConstructLE12TFSMailMsgId @ 107 NONAME
-	_ZN17CFSMailFolderBase11GetNmFolderEv @ 108 NONAME
-	_ZN17CFSMailFolderBase12SetMailBoxIdE12TFSMailMsgId @ 109 NONAME
-	_ZN17CFSMailFolderBase13SetFolderNameERK7TDesC16 @ 110 NONAME
-	_ZN17CFSMailFolderBase13SetFolderTypeE13TFSFolderType @ 111 NONAME
-	_ZN17CFSMailFolderBase14BlockCopyFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 112 NONAME
-	_ZN17CFSMailFolderBase14BlockMoveFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 113 NONAME
-	_ZN17CFSMailFolderBase14SetUnreadCountEj @ 114 NONAME
-	_ZN17CFSMailFolderBase14SetUnseenCountEj @ 115 NONAME
-	_ZN17CFSMailFolderBase15SetMessageCountEj @ 116 NONAME
-	_ZN17CFSMailFolderBase17SetParentFolderIdE12TFSMailMsgId @ 117 NONAME
-	_ZN17CFSMailFolderBase17SetSubFolderCountEj @ 118 NONAME
-	_ZN17CFSMailFolderBase4NewLE12TFSMailMsgId @ 119 NONAME
-	_ZN17CFSMailFolderBase5NewLCE12TFSMailMsgId @ 120 NONAME
-	_ZN17CFSMailFolderBaseD0Ev @ 121 NONAME
-	_ZN17CFSMailFolderBaseD1Ev @ 122 NONAME
-	_ZN17CFSMailFolderBaseD2Ev @ 123 NONAME
-	_ZN18CFSMailMessageBase10ConstructLE12TFSMailMsgId @ 124 NONAME
-	_ZN18CFSMailMessageBase10SetSubjectERK7TDesC16 @ 125 NONAME
-	_ZN18CFSMailMessageBase11SetFolderIdE12TFSMailMsgId @ 126 NONAME
-	_ZN18CFSMailMessageBase12SetMailBoxIdE12TFSMailMsgId @ 127 NONAME
-	_ZN18CFSMailMessageBase12SetMessageIdE12TFSMailMsgId @ 128 NONAME
-	_ZN18CFSMailMessageBase12SetRelatedToE12TFSMailMsgId @ 129 NONAME
-	_ZN18CFSMailMessageBase15GetCCRecipientsEv @ 130 NONAME
-	_ZN18CFSMailMessageBase15GetToRecipientsEv @ 131 NONAME
-	_ZN18CFSMailMessageBase16GetBCCRecipientsEv @ 132 NONAME
-	_ZN18CFSMailMessageBase17AppendCCRecipientEP14CFSMailAddress @ 133 NONAME
-	_ZN18CFSMailMessageBase17AppendToRecipientEP14CFSMailAddress @ 134 NONAME
-	_ZN18CFSMailMessageBase17ClearCcRecipientsEv @ 135 NONAME
-	_ZN18CFSMailMessageBase17ClearToRecipientsEv @ 136 NONAME
-	_ZN18CFSMailMessageBase17GetReplyToAddressEv @ 137 NONAME
-	_ZN18CFSMailMessageBase17SetReplyToAddressEP14CFSMailAddress @ 138 NONAME
-	_ZN18CFSMailMessageBase18AppendBCCRecipientEP14CFSMailAddress @ 139 NONAME
-	_ZN18CFSMailMessageBase18ClearBccRecipientsEv @ 140 NONAME
-	_ZN18CFSMailMessageBase20GetNmMessageEnvelopeEv @ 141 NONAME
-	_ZN18CFSMailMessageBase4NewLE12TFSMailMsgId @ 142 NONAME
-	_ZN18CFSMailMessageBase5NewLCE12TFSMailMsgId @ 143 NONAME
-	_ZN18CFSMailMessageBase7SetDateE5TTime @ 144 NONAME
-	_ZN18CFSMailMessageBase7SetFlagEi @ 145 NONAME
-	_ZN18CFSMailMessageBase9ResetFlagEi @ 146 NONAME
-	_ZN18CFSMailMessageBase9SetSenderEP14CFSMailAddress @ 147 NONAME
-	_ZN18CFSMailMessageBaseD0Ev @ 148 NONAME
-	_ZN18CFSMailMessageBaseD1Ev @ 149 NONAME
-	_ZN18CFSMailMessageBaseD2Ev @ 150 NONAME
-	_ZN18CFSMailMessagePart10ChildPartLE12TFSMailMsgId @ 151 NONAME
-	_ZN18CFSMailMessagePart10SetContentER6TDes16 @ 152 NONAME
-	_ZN18CFSMailMessagePart11ChildPartsLER13RPointerArrayIS_ENS_28TFSMailMessagePartDataSourceE @ 153 NONAME
-	_ZN18CFSMailMessagePart11IsMRInfoSetEv @ 154 NONAME
-	_ZN18CFSMailMessagePart13FindBodyPartLERK7TDesC16NS_28TFSMailMessagePartDataSourceE @ 155 NONAME
-	_ZN18CFSMailMessagePart13NewChildPartLE12TFSMailMsgIdRK7TDesC16 @ 156 NONAME
-	_ZN18CFSMailMessagePart13SetContentIDLERK7TDesC16 @ 157 NONAME
-	_ZN18CFSMailMessagePart14RemoveContentLEv @ 158 NONAME
-	_ZN18CFSMailMessagePart14RequestHandlerEv @ 159 NONAME
-	_ZN18CFSMailMessagePart14SetContentSizeEj @ 160 NONAME
-	_ZN18CFSMailMessagePart14SetContentTypeERK7TDesC16 @ 161 NONAME
-	_ZN18CFSMailMessagePart15AttachmentNameLEv @ 162 NONAME
-	_ZN18CFSMailMessagePart15GetContentClassEv @ 163 NONAME
-	_ZN18CFSMailMessagePart15GetContentFileLEv @ 164 NONAME
-	_ZN18CFSMailMessagePart15SetContentClassERK7TDesC16 @ 165 NONAME
-	_ZN18CFSMailMessagePart16CopyContentFileLERK7TDesC16 @ 166 NONAME
-	_ZN18CFSMailMessagePart16GetNmMessagePartEv @ 167 NONAME
-	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgId @ 168 NONAME
-	_ZN18CFSMailMessagePart17AddNewAttachmentLERK7TDesC1612TFSMailMsgIdS2_ @ 169 NONAME
-	_ZN18CFSMailMessagePart17FetchMessagePartLE12TFSMailMsgIdR22MFSMailRequestObserverj @ 170 NONAME
-	_ZN18CFSMailMessagePart18AppendAttachmentsLER13RPointerArrayIS_E @ 171 NONAME
-	_ZN18CFSMailMessagePart18ContentDescriptionEv @ 172 NONAME
-	_ZN18CFSMailMessagePart18ContentDispositionEv @ 173 NONAME
-	_ZN18CFSMailMessagePart18SetAttachmentNameLERK7TDesC16 @ 174 NONAME
-	_ZN18CFSMailMessagePart19FetchMessagesPartsLERK6RArrayI12TFSMailMsgIdER22MFSMailRequestObserverj @ 175 NONAME
-	_ZN18CFSMailMessagePart19GetContentToBufferLER6TDes16j @ 176 NONAME
-	_ZN18CFSMailMessagePart19SetContentFromFileLERK7TDesC16 @ 177 NONAME
-	_ZN18CFSMailMessagePart19SetReadOnlyPartSizeEj @ 178 NONAME
-	_ZN18CFSMailMessagePart21ContentTypeParametersEv @ 179 NONAME
-	_ZN18CFSMailMessagePart21GetLocalTextContentLCEv @ 180 NONAME
-	_ZN18CFSMailMessagePart21SetContentDescriptionERK7TDesC16 @ 181 NONAME
-	_ZN18CFSMailMessagePart21SetContentDispositionERK7TDesC16 @ 182 NONAME
-	_ZN18CFSMailMessagePart21SetFetchedContentSizeEj @ 183 NONAME
-	_ZN18CFSMailMessagePart21SetMessagePartsStatusE17TFSPartFetchState @ 184 NONAME
-	_ZN18CFSMailMessagePart23CopyMessageAsChildPartLE12TFSMailMsgIdP14CFSMailMessage @ 185 NONAME
-	_ZN18CFSMailMessagePart28ContentDispositionParametersEv @ 186 NONAME
-	_ZN18CFSMailMessagePart28RemoveDownLoadedAttachmentsLEv @ 187 NONAME
-	_ZN18CFSMailMessagePart4NewLE12TFSMailMsgIdS0_ @ 188 NONAME
-	_ZN18CFSMailMessagePart5NewLCE12TFSMailMsgIdS0_ @ 189 NONAME
-	_ZN18CFSMailMessagePart5NewLCERK4NmIdRK13NmMessagePart @ 190 NONAME
-	_ZN18CFSMailMessagePart5SaveLEv @ 191 NONAME
-	_ZN18CFSMailMessagePart9ContentIDEv @ 192 NONAME
-	_ZN18CFSMailMessagePart9GetMRInfoEv @ 193 NONAME
-	_ZN18CFSMailMessagePart9SetMRInfoEP13MMRInfoObject @ 194 NONAME
-	_ZN18CFSMailMessagePartD0Ev @ 195 NONAME
-	_ZN18CFSMailMessagePartD1Ev @ 196 NONAME
-	_ZN18CFSMailMessagePartD2Ev @ 197 NONAME
-	_ZN21CFSMailRequestHandler10AddPluginLE4TUidP13CFSMailPlugin @ 198 NONAME
-	_ZN21CFSMailRequestHandler10ConstructLE13RPointerArrayI26CImplementationInformationES0_I13CFSMailPluginE @ 199 NONAME
-	_ZN21CFSMailRequestHandler11GetTempDirLEv @ 200 NONAME
-	_ZN21CFSMailRequestHandler12GetTempFileLE12TFSMailMsgId4TBufILi256EE @ 201 NONAME
-	_ZN21CFSMailRequestHandler13CleanTempDirLEv @ 202 NONAME
-	_ZN21CFSMailRequestHandler14CancelRequestLEi @ 203 NONAME
-	_ZN21CFSMailRequestHandler14GetPluginByUidE12TFSMailMsgId @ 204 NONAME
-	_ZN21CFSMailRequestHandler15CompleteRequestEi @ 205 NONAME
-	_ZN21CFSMailRequestHandler17InitAsyncRequestLE4TUidR22MFSMailRequestObserver @ 206 NONAME
-	_ZN21CFSMailRequestHandler17RemoveAllRequestsEv @ 207 NONAME
-	_ZN21CFSMailRequestHandler18CancelAllRequestsLEv @ 208 NONAME
-	_ZN21CFSMailRequestHandler4NewLER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 209 NONAME
-	_ZN21CFSMailRequestHandler5NewLCER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 210 NONAME
-	_ZN21CFSMailRequestHandlerC1Ev @ 211 NONAME
-	_ZN21CFSMailRequestHandlerC2Ev @ 212 NONAME
-	_ZN21CFSMailRequestHandlerD0Ev @ 213 NONAME
-	_ZN21CFSMailRequestHandlerD1Ev @ 214 NONAME
-	_ZN21CFSMailRequestHandlerD2Ev @ 215 NONAME
-	_ZNK10CFSMailBox13HasCapabilityE22TFSMailBoxCapabilities @ 216 NONAME
-	_ZNK10CFSMailBox16CurrentSyncStateEv @ 217 NONAME
-	_ZNK10CFSMailBox9ListMrusLEv @ 218 NONAME
-	_ZNK14CFSMailAddress14GetDisplayNameEv @ 219 NONAME
-	_ZNK14CFSMailAddress15GetEmailAddressEv @ 220 NONAME
-	_ZNK14CFSMailBoxBase5GetIdEv @ 221 NONAME
-	_ZNK14CFSMailBoxBase7GetNameEv @ 222 NONAME
-	_ZNK14CFSMailBoxBase9GetStatusEv @ 223 NONAME
-	_ZNK14CFSMailMessage10IsMessageLEv @ 224 NONAME
-	_ZNK17CFSMailFolderBase11GetFolderIdEv @ 225 NONAME
-	_ZNK17CFSMailFolderBase12GetMailBoxIdEv @ 226 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderNameEv @ 227 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderTypeEv @ 228 NONAME
-	_ZNK17CFSMailFolderBase14GetUnreadCountEv @ 229 NONAME
-	_ZNK17CFSMailFolderBase14GetUnseenCountEv @ 230 NONAME
-	_ZNK17CFSMailFolderBase15GetMessageCountEv @ 231 NONAME
-	_ZNK17CFSMailFolderBase17GetParentFolderIdEv @ 232 NONAME
-	_ZNK17CFSMailFolderBase17GetSubFolderCountEv @ 233 NONAME
-	_ZNK18CFSMailMessageBase10GetSubjectEv @ 234 NONAME
-	_ZNK18CFSMailMessageBase11GetFolderIdEv @ 235 NONAME
-	_ZNK18CFSMailMessageBase11IsRelatedToEv @ 236 NONAME
-	_ZNK18CFSMailMessageBase12GetMailBoxIdEv @ 237 NONAME
-	_ZNK18CFSMailMessageBase12GetMessageIdEv @ 238 NONAME
-	_ZNK18CFSMailMessageBase7GetDateEv @ 239 NONAME
-	_ZNK18CFSMailMessageBase8GetFlagsEv @ 240 NONAME
-	_ZNK18CFSMailMessageBase9GetSenderEv @ 241 NONAME
-	_ZNK18CFSMailMessageBase9IsFlagSetEi @ 242 NONAME
-	_ZNK18CFSMailMessagePart10IsMessageLEv @ 243 NONAME
-	_ZNK18CFSMailMessagePart11ContentSizeEv @ 244 NONAME
-	_ZNK18CFSMailMessagePart14FetchLoadStateEv @ 245 NONAME
-	_ZNK18CFSMailMessagePart14GetContentTypeEv @ 246 NONAME
-	_ZNK18CFSMailMessagePart16ReadOnlyPartSizeEv @ 247 NONAME
-	_ZNK18CFSMailMessagePart18FetchedContentSizeEv @ 248 NONAME
-	_ZNK18CFSMailMessagePart9GetPartIdEv @ 249 NONAME
-	_ZTI21CFSMailRequestHandler @ 250 NONAME
-	_ZTV21CFSMailRequestHandler @ 251 NONAME
-	_ZThn4_N15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 252 NONAME
-	_ZThn4_N15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 253 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 254 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 255 NONAME
-	_ZThn4_N15CFSMailIteratorD0Ev @ 256 NONAME
-	_ZThn4_N15CFSMailIteratorD1Ev @ 257 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC16R22MFSMailRequestObserver @ 258 NONAME
+	_ZN10CFSMailBox10ExtensionLERK4TUid @ 1 NONAME
+	_ZN10CFSMailBox10GoOfflineLEv @ 2 NONAME
+	_ZN10CFSMailBox11CancelSyncLEv @ 3 NONAME
+	_ZN10CFSMailBox11ListFoldersE12TFSMailMsgIdR13RPointerArrayI13CFSMailFolderE @ 4 NONAME
+	_ZN10CFSMailBox11ListFoldersEv @ 5 NONAME
+	_ZN10CFSMailBox11RefreshNowLER22MFSMailRequestObserver @ 6 NONAME
+	_ZN10CFSMailBox11RefreshNowLEv @ 7 NONAME
+	_ZN10CFSMailBox12CancelSearchEv @ 8 NONAME
+	_ZN10CFSMailBox12SendMessageLER14CFSMailMessage @ 9 NONAME
+	_ZN10CFSMailBox12SendMessageLER14CFSMailMessageR22MFSMailRequestObserver @ 10 NONAME
+	_ZN10CFSMailBox13CopyMessagesLERK6RArrayI12TFSMailMsgIdERS2_S1_S1_ @ 11 NONAME
+	_ZN10CFSMailBox13MoveMessagesLER22MFSMailRequestObserverRK6RArrayI12TFSMailMsgIdES3_S3_ @ 12 NONAME
+	_ZN10CFSMailBox13MoveMessagesLERK6RArrayI12TFSMailMsgIdES1_S1_ @ 13 NONAME
+	_ZN10CFSMailBox14GetBrandingIdLEv @ 14 NONAME
+	_ZN10CFSMailBox15GetConnectionIdERm @ 15 NONAME
+	_ZN10CFSMailBox15SetCredentialsLERK7TDesC16S2_ @ 16 NONAME
+	_ZN10CFSMailBox16GetMailBoxStatusEv @ 17 NONAME
+	_ZN10CFSMailBox16ReleaseExtensionEP15CEmailExtension @ 18 NONAME
+	_ZN10CFSMailBox18CreateReplyMessageE12TFSMailMsgIdiRK7TDesC16 @ 19 NONAME
+	_ZN10CFSMailBox18GetLastSyncStatusLEv @ 20 NONAME
+	_ZN10CFSMailBox19CreateMessageToSendEv @ 21 NONAME
+	_ZN10CFSMailBox19CreateReplyMessageLE12TFSMailMsgIdiR22MFSMailRequestObserverRK7TDesC16 @ 22 NONAME
+	_ZN10CFSMailBox19GetStandardFolderIdE13TFSFolderType @ 23 NONAME
+	_ZN10CFSMailBox19UpdateMessageFlagsLE12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserver @ 24 NONAME
+	_ZN10CFSMailBox20CreateForwardMessageE12TFSMailMsgIdRK7TDesC16 @ 25 NONAME
+	_ZN10CFSMailBox20CreateMessageToSendLER22MFSMailRequestObserver @ 26 NONAME
+	_ZN10CFSMailBox21CreateForwardMessageLE12TFSMailMsgIdR22MFSMailRequestObserverRK7TDesC16 @ 27 NONAME
+	_ZN10CFSMailBox22ClearSearchResultCacheEv @ 28 NONAME
+	_ZN10CFSMailBox22CreateMessageFromFileLERK5RFile @ 29 NONAME
+	_ZN10CFSMailBox28RemoveDownLoadedAttachmentsLEv @ 30 NONAME
+	_ZN10CFSMailBox30IsConnectionAllowedWhenRoamingERi @ 31 NONAME
+	_ZN10CFSMailBox4NewLE12TFSMailMsgId @ 32 NONAME
+	_ZN10CFSMailBox5NewLCE12TFSMailMsgId @ 33 NONAME
+	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 34 NONAME
+	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver6RArrayI12TFSMailMsgIdE @ 35 NONAME
+	_ZN10CFSMailBox9GoOnlineLEv @ 36 NONAME
+	_ZN10CFSMailBoxD0Ev @ 37 NONAME
+	_ZN10CFSMailBoxD1Ev @ 38 NONAME
+	_ZN10CFSMailBoxD2Ev @ 39 NONAME
+	_ZN11NmConverter11toQDateTimeERK5TTime @ 40 NONAME
+	_ZN11NmConverter15mailMsgIdToNmIdE12TFSMailMsgId @ 41 NONAME
+	_ZN11NmConverter15nmIdToMailMsgIdE4NmId @ 42 NONAME
+	_ZN11NmConverter15toRPointerArrayERK5QListI9NmAddressE @ 43 NONAME
+	_ZN11NmConverter16qstringToHBufCLCERK7QString @ 44 NONAME
+	_ZN11NmConverter21FSMailSortCriteria2NME19TFSMailSortCriteria @ 45 NONAME
+	_ZN11NmConverter21NMMailSortCriteria2FSE18NmMailSortCriteria @ 46 NONAME
+	_ZN11NmConverter7toTTimeERK9QDateTime @ 47 NONAME
+	_ZN11NmConverter9toQStringERK7TDesC16 @ 48 NONAME
+	_ZN13CFSMailFolder10ExtensionLERK4TUid @ 49 NONAME
+	_ZN13CFSMailFolder13ListMessagesLE14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 50 NONAME
+	_ZN13CFSMailFolder14FetchMessagesLERK6RArrayI12TFSMailMsgIdE14TFSMailDetailsR22MFSMailRequestObserver @ 51 NONAME
+	_ZN13CFSMailFolder14GetSubFoldersLER13RPointerArrayIS_E @ 52 NONAME
+	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgId @ 53 NONAME
+	_ZN13CFSMailFolder16ReleaseExtensionEP15CEmailExtension @ 54 NONAME
+	_ZN13CFSMailFolder17SupportsCopyFromLE13TFSFolderType @ 55 NONAME
+	_ZN13CFSMailFolder17SupportsMoveFromLE13TFSFolderType @ 56 NONAME
+	_ZN13CFSMailFolder28RemoveDownLoadedAttachmentsLEv @ 57 NONAME
+	_ZN13CFSMailFolder4NewLE12TFSMailMsgId @ 58 NONAME
+	_ZN13CFSMailFolder5NewLCE12TFSMailMsgId @ 59 NONAME
+	_ZN13CFSMailFolderD0Ev @ 60 NONAME
+	_ZN13CFSMailFolderD1Ev @ 61 NONAME
+	_ZN13CFSMailFolderD2Ev @ 62 NONAME
+	_ZN14CFSMailAddress12GetNmAddressEv @ 63 NONAME
+	_ZN14CFSMailAddress14SetDisplayNameERK7TDesC16 @ 64 NONAME
+	_ZN14CFSMailAddress15SetEmailAddressERK7TDesC16 @ 65 NONAME
+	_ZN14CFSMailAddress4NewLERK9NmAddress @ 66 NONAME
+	_ZN14CFSMailAddress4NewLEv @ 67 NONAME
+	_ZN14CFSMailAddress5NewLCEv @ 68 NONAME
+	_ZN14CFSMailAddressD0Ev @ 69 NONAME
+	_ZN14CFSMailAddressD1Ev @ 70 NONAME
+	_ZN14CFSMailAddressD2Ev @ 71 NONAME
+	_ZN14CFSMailBoxBase10GetRCLInfoER4TUidRj @ 72 NONAME
+	_ZN14CFSMailBoxBase10SetRCLInfoE4TUidj @ 73 NONAME
+	_ZN14CFSMailBoxBase12GetNmMailboxEv @ 74 NONAME
+	_ZN14CFSMailBoxBase14GetSettingsUidEv @ 75 NONAME
+	_ZN14CFSMailBoxBase14OwnMailAddressEv @ 76 NONAME
+	_ZN14CFSMailBoxBase14SetSettingsUidE4TUid @ 77 NONAME
+	_ZN14CFSMailBoxBase16MRInfoProcessorLEv @ 78 NONAME
+	_ZN14CFSMailBoxBase18SetOwnMailAddressLEP14CFSMailAddress @ 79 NONAME
+	_ZN14CFSMailBoxBase19SetMRInfoProcessorLEP16MMRInfoProcessor @ 80 NONAME
+	_ZN14CFSMailBoxBase20IsMRInfoProcessorSetEv @ 81 NONAME
+	_ZN14CFSMailBoxBase4NewLE12TFSMailMsgId @ 82 NONAME
+	_ZN14CFSMailBoxBase5NewLCE12TFSMailMsgId @ 83 NONAME
+	_ZN14CFSMailBoxBase7SetNameERK7TDesC16 @ 84 NONAME
+	_ZN14CFSMailBoxBase9SetStatusE16TFSMailBoxStatus @ 85 NONAME
+	_ZN14CFSMailBoxBaseD0Ev @ 86 NONAME
+	_ZN14CFSMailBoxBaseD1Ev @ 87 NONAME
+	_ZN14CFSMailBoxBaseD2Ev @ 88 NONAME
+	_ZN14CFSMailMessage12GetNmMessageEv @ 89 NONAME
+	_ZN14CFSMailMessage12SaveMessageLER22MFSMailRequestObserver @ 90 NONAME
+	_ZN14CFSMailMessage12SaveMessageLEv @ 91 NONAME
+	_ZN14CFSMailMessage13HtmlBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 92 NONAME
+	_ZN14CFSMailMessage15AttachmentListLER13RPointerArrayI18CFSMailMessagePartE @ 93 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLER5RFileRK6TDesC8 @ 94 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC1612TFSMailMsgId @ 95 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC16R22MFSMailRequestObserver @ 96 NONAME
+	_ZN14CFSMailMessage17SaveMessagePartsLER22MFSMailRequestObserver @ 97 NONAME
+	_ZN14CFSMailMessage18PlainTextBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 98 NONAME
+	_ZN14CFSMailMessage4NewLE12TFSMailMsgId @ 99 NONAME
+	_ZN14CFSMailMessage4NewLERK9NmMessage @ 100 NONAME
+	_ZN14CFSMailMessage5NewLCE12TFSMailMsgId @ 101 NONAME
+	_ZN14CFSMailMessageD0Ev @ 102 NONAME
+	_ZN14CFSMailMessageD1Ev @ 103 NONAME
+	_ZN14CFSMailMessageD2Ev @ 104 NONAME
+	_ZN15CEmailExtension6DecRefEv @ 105 NONAME
+	_ZN15CEmailExtension6IncRefEv @ 106 NONAME
+	_ZN15CEmailExtensionC1ERK4TUid @ 107 NONAME
+	_ZN15CEmailExtensionC2ERK4TUid @ 108 NONAME
+	_ZN15CEmailExtensionD0Ev @ 109 NONAME
+	_ZN15CEmailExtensionD1Ev @ 110 NONAME
+	_ZN15CEmailExtensionD2Ev @ 111 NONAME
+	_ZN15CFSMailIterator4NewLER15MFSMailIteratorP21CFSMailRequestHandler @ 112 NONAME
+	_ZN15CFSMailIterator5NewLCER15MFSMailIteratorP21CFSMailRequestHandler @ 113 NONAME
+	_ZN15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 114 NONAME
+	_ZN15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 115 NONAME
+	_ZN15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 116 NONAME
+	_ZN15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 117 NONAME
+	_ZN15CFSMailIteratorD0Ev @ 118 NONAME
+	_ZN15CFSMailIteratorD1Ev @ 119 NONAME
+	_ZN15CFSMailIteratorD2Ev @ 120 NONAME
+	_ZN16CExtendableEmail10ExtensionLERK4TUid @ 121 NONAME
+	_ZN16CExtendableEmail16ReleaseExtensionEP15CEmailExtension @ 122 NONAME
+	_ZN16CExtendableEmailC1Ev @ 123 NONAME
+	_ZN16CExtendableEmailC2Ev @ 124 NONAME
+	_ZN16TEmailExtensions4AddLEP15CEmailExtension @ 125 NONAME
+	_ZN16TEmailExtensions6RemoveEPK15CEmailExtension @ 126 NONAME
+	_ZN16TEmailExtensionsC1Ev @ 127 NONAME
+	_ZN16TEmailExtensionsC2Ev @ 128 NONAME
+	_ZN16TEmailExtensionsD1Ev @ 129 NONAME
+	_ZN16TEmailExtensionsD2Ev @ 130 NONAME
+	_ZN17CFSMailFolderBase10ConstructLE12TFSMailMsgId @ 131 NONAME
+	_ZN17CFSMailFolderBase11GetNmFolderEv @ 132 NONAME
+	_ZN17CFSMailFolderBase12SetMailBoxIdE12TFSMailMsgId @ 133 NONAME
+	_ZN17CFSMailFolderBase13SetFolderNameERK7TDesC16 @ 134 NONAME
+	_ZN17CFSMailFolderBase13SetFolderTypeE13TFSFolderType @ 135 NONAME
+	_ZN17CFSMailFolderBase14BlockCopyFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 136 NONAME
+	_ZN17CFSMailFolderBase14BlockMoveFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 137 NONAME
+	_ZN17CFSMailFolderBase14SetUnreadCountEj @ 138 NONAME
+	_ZN17CFSMailFolderBase14SetUnseenCountEj @ 139 NONAME
+	_ZN17CFSMailFolderBase15SetMessageCountEj @ 140 NONAME
+	_ZN17CFSMailFolderBase17SetParentFolderIdE12TFSMailMsgId @ 141 NONAME
+	_ZN17CFSMailFolderBase17SetSubFolderCountEj @ 142 NONAME
+	_ZN17CFSMailFolderBase4NewLE12TFSMailMsgId @ 143 NONAME
+	_ZN17CFSMailFolderBase5NewLCE12TFSMailMsgId @ 144 NONAME
+	_ZN17CFSMailFolderBaseD0Ev @ 145 NONAME
+	_ZN17CFSMailFolderBaseD1Ev @ 146 NONAME
+	_ZN17CFSMailFolderBaseD2Ev @ 147 NONAME
+	_ZN18CFSMailMessageBase10ConstructLE12TFSMailMsgId @ 148 NONAME
+	_ZN18CFSMailMessageBase10ConstructLERK17NmMessageEnvelope @ 149 NONAME
+	_ZN18CFSMailMessageBase10ExtensionLERK4TUid @ 150 NONAME
+	_ZN18CFSMailMessageBase10SetSubjectERK7TDesC16 @ 151 NONAME
+	_ZN18CFSMailMessageBase11SetFolderIdE12TFSMailMsgId @ 152 NONAME
+	_ZN18CFSMailMessageBase12SetMailBoxIdE12TFSMailMsgId @ 153 NONAME
+	_ZN18CFSMailMessageBase12SetMessageIdE12TFSMailMsgId @ 154 NONAME
+	_ZN18CFSMailMessageBase12SetRelatedToE12TFSMailMsgId @ 155 NONAME
+	_ZN18CFSMailMessageBase14RequestHandlerEv @ 156 NONAME
+	_ZN18CFSMailMessageBase15GetCCRecipientsEv @ 157 NONAME
+	_ZN18CFSMailMessageBase15GetToRecipientsEv @ 158 NONAME
+	_ZN18CFSMailMessageBase16GetBCCRecipientsEv @ 159 NONAME
+	_ZN18CFSMailMessageBase16ReleaseExtensionEP15CEmailExtension @ 160 NONAME
+	_ZN18CFSMailMessageBase17AppendCCRecipientEP14CFSMailAddress @ 161 NONAME
+	_ZN18CFSMailMessageBase17AppendToRecipientEP14CFSMailAddress @ 162 NONAME
+	_ZN18CFSMailMessageBase17ClearCcRecipientsEv @ 163 NONAME
+	_ZN18CFSMailMessageBase17ClearToRecipientsEv @ 164 NONAME
+	_ZN18CFSMailMessageBase17GetReplyToAddressEv @ 165 NONAME
+	_ZN18CFSMailMessageBase17SetReplyToAddressEP14CFSMailAddress @ 166 NONAME
+	_ZN18CFSMailMessageBase18AppendBCCRecipientEP14CFSMailAddress @ 167 NONAME
+	_ZN18CFSMailMessageBase18ClearBccRecipientsEv @ 168 NONAME
+	_ZN18CFSMailMessageBase20GetNmMessageEnvelopeEv @ 169 NONAME
+	_ZN18CFSMailMessageBase4NewLE12TFSMailMsgId @ 170 NONAME
+	_ZN18CFSMailMessageBase5NewLCE12TFSMailMsgId @ 171 NONAME
+	_ZN18CFSMailMessageBase7SetDateE5TTime @ 172 NONAME
+	_ZN18CFSMailMessageBase7SetFlagEi @ 173 NONAME
+	_ZN18CFSMailMessageBase9ResetFlagEi @ 174 NONAME
+	_ZN18CFSMailMessageBase9SetSenderEP14CFSMailAddress @ 175 NONAME
+	_ZN18CFSMailMessageBaseD0Ev @ 176 NONAME
+	_ZN18CFSMailMessageBaseD1Ev @ 177 NONAME
+	_ZN18CFSMailMessageBaseD2Ev @ 178 NONAME
+	_ZN18CFSMailMessagePart10ChildPartLE12TFSMailMsgId @ 179 NONAME
+	_ZN18CFSMailMessagePart10SetContentER6TDes16 @ 180 NONAME
+	_ZN18CFSMailMessagePart11ChildPartsLER13RPointerArrayIS_ENS_28TFSMailMessagePartDataSourceE @ 181 NONAME
+	_ZN18CFSMailMessagePart11IsMRInfoSetEv @ 182 NONAME
+	_ZN18CFSMailMessagePart13FindBodyPartLERK7TDesC16NS_28TFSMailMessagePartDataSourceE @ 183 NONAME
+	_ZN18CFSMailMessagePart13NewChildPartLE12TFSMailMsgIdRK7TDesC16 @ 184 NONAME
+	_ZN18CFSMailMessagePart13SetContentIDLERK7TDesC16 @ 185 NONAME
+	_ZN18CFSMailMessagePart14RemoveContentLEv @ 186 NONAME
+	_ZN18CFSMailMessagePart14SetContentSizeEj @ 187 NONAME
+	_ZN18CFSMailMessagePart14SetContentTypeERK7TDesC16 @ 188 NONAME
+	_ZN18CFSMailMessagePart15AttachmentNameLEv @ 189 NONAME
+	_ZN18CFSMailMessagePart15GetContentClassEv @ 190 NONAME
+	_ZN18CFSMailMessagePart15GetContentFileLEv @ 191 NONAME
+	_ZN18CFSMailMessagePart15SetContentClassERK7TDesC16 @ 192 NONAME
+	_ZN18CFSMailMessagePart16CopyContentFileLERK7TDesC16 @ 193 NONAME
+	_ZN18CFSMailMessagePart16GetNmMessagePartEv @ 194 NONAME
+	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgId @ 195 NONAME
+	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgIdR22MFSMailRequestObserver @ 196 NONAME
+	_ZN18CFSMailMessagePart17AddNewAttachmentLERK7TDesC1612TFSMailMsgIdS2_ @ 197 NONAME
+	_ZN18CFSMailMessagePart17FetchMessagePartLE12TFSMailMsgIdR22MFSMailRequestObserverj @ 198 NONAME
+	_ZN18CFSMailMessagePart18AppendAttachmentsLER13RPointerArrayIS_E @ 199 NONAME
+	_ZN18CFSMailMessagePart18ContentDescriptionEv @ 200 NONAME
+	_ZN18CFSMailMessagePart18ContentDispositionEv @ 201 NONAME
+	_ZN18CFSMailMessagePart18ContentTypeMatchesERK7TDesC16 @ 202 NONAME
+	_ZN18CFSMailMessagePart18SetAttachmentNameLERK7TDesC16 @ 203 NONAME
+	_ZN18CFSMailMessagePart19FetchMessagesPartsLERK6RArrayI12TFSMailMsgIdER22MFSMailRequestObserverj @ 204 NONAME
+	_ZN18CFSMailMessagePart19GetContentToBufferLER6TDes16j @ 205 NONAME
+	_ZN18CFSMailMessagePart19SetContentFromFileLERK7TDesC16 @ 206 NONAME
+	_ZN18CFSMailMessagePart19SetReadOnlyPartSizeEj @ 207 NONAME
+	_ZN18CFSMailMessagePart21ContentTypeParametersEv @ 208 NONAME
+	_ZN18CFSMailMessagePart21GetLocalTextContentLCEv @ 209 NONAME
+	_ZN18CFSMailMessagePart21SetContentDescriptionERK7TDesC16 @ 210 NONAME
+	_ZN18CFSMailMessagePart21SetContentDispositionERK7TDesC16 @ 211 NONAME
+	_ZN18CFSMailMessagePart21SetFetchedContentSizeEj @ 212 NONAME
+	_ZN18CFSMailMessagePart21SetMessagePartsStatusE17TFSPartFetchState @ 213 NONAME
+	_ZN18CFSMailMessagePart23CopyMessageAsChildPartLE12TFSMailMsgIdP14CFSMailMessage @ 214 NONAME
+	_ZN18CFSMailMessagePart28ContentDispositionParametersEv @ 215 NONAME
+	_ZN18CFSMailMessagePart28RemoveDownLoadedAttachmentsLEv @ 216 NONAME
+	_ZN18CFSMailMessagePart4NewLE12TFSMailMsgIdS0_ @ 217 NONAME
+	_ZN18CFSMailMessagePart5NewLCE12TFSMailMsgIdS0_ @ 218 NONAME
+	_ZN18CFSMailMessagePart5NewLCERK4NmIdRK13NmMessagePart @ 219 NONAME
+	_ZN18CFSMailMessagePart5SaveLEv @ 220 NONAME
+	_ZN18CFSMailMessagePart9ContentIDEv @ 221 NONAME
+	_ZN18CFSMailMessagePart9GetMRInfoEv @ 222 NONAME
+	_ZN18CFSMailMessagePart9SetMRInfoEP13MMRInfoObject @ 223 NONAME
+	_ZN18CFSMailMessagePartD0Ev @ 224 NONAME
+	_ZN18CFSMailMessagePartD1Ev @ 225 NONAME
+	_ZN18CFSMailMessagePartD2Ev @ 226 NONAME
+	_ZN21CFSMailRequestHandler10AddPluginLE4TUidP13CFSMailPlugin @ 227 NONAME
+	_ZN21CFSMailRequestHandler10ConstructLE13RPointerArrayI26CImplementationInformationES0_I13CFSMailPluginE @ 228 NONAME
+	_ZN21CFSMailRequestHandler11GetTempDirLEv @ 229 NONAME
+	_ZN21CFSMailRequestHandler12GetTempFileLE12TFSMailMsgId4TBufILi256EE @ 230 NONAME
+	_ZN21CFSMailRequestHandler13CleanTempDirLEv @ 231 NONAME
+	_ZN21CFSMailRequestHandler14CancelRequestLEi @ 232 NONAME
+	_ZN21CFSMailRequestHandler14GetPluginByUidE12TFSMailMsgId @ 233 NONAME
+	_ZN21CFSMailRequestHandler15CompleteRequestEi @ 234 NONAME
+	_ZN21CFSMailRequestHandler17InitAsyncRequestLE4TUidR22MFSMailRequestObserver @ 235 NONAME
+	_ZN21CFSMailRequestHandler17RemoveAllRequestsEv @ 236 NONAME
+	_ZN21CFSMailRequestHandler18CancelAllRequestsLEv @ 237 NONAME
+	_ZN21CFSMailRequestHandler4NewLER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 238 NONAME
+	_ZN21CFSMailRequestHandler5NewLCER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 239 NONAME
+	_ZN21CFSMailRequestHandlerC1Ev @ 240 NONAME
+	_ZN21CFSMailRequestHandlerC2Ev @ 241 NONAME
+	_ZN21CFSMailRequestHandlerD0Ev @ 242 NONAME
+	_ZN21CFSMailRequestHandlerD1Ev @ 243 NONAME
+	_ZN21CFSMailRequestHandlerD2Ev @ 244 NONAME
+	_ZNK10CFSMailBox13HasCapabilityE22TFSMailBoxCapabilities @ 245 NONAME
+	_ZNK10CFSMailBox16CurrentSyncStateEv @ 246 NONAME
+	_ZNK10CFSMailBox9ListMrusLEv @ 247 NONAME
+	_ZNK14CFSMailAddress14GetDisplayNameEv @ 248 NONAME
+	_ZNK14CFSMailAddress15GetEmailAddressEv @ 249 NONAME
+	_ZNK14CFSMailBoxBase5GetIdEv @ 250 NONAME
+	_ZNK14CFSMailBoxBase7GetNameEv @ 251 NONAME
+	_ZNK14CFSMailBoxBase9GetStatusEv @ 252 NONAME
+	_ZNK14CFSMailMessage10IsMessageLEv @ 253 NONAME
+	_ZNK15CEmailExtension3UidEv @ 254 NONAME
+	_ZNK16TEmailExtensions13FindExtensionERK4TUid @ 255 NONAME
+	_ZNK16TEmailExtensions9ExtensionEi @ 256 NONAME
+	_ZNK17CFSMailFolderBase11GetFolderIdEv @ 257 NONAME
+	_ZNK17CFSMailFolderBase12GetMailBoxIdEv @ 258 NONAME
+	_ZNK17CFSMailFolderBase13GetFolderNameEv @ 259 NONAME
+	_ZNK17CFSMailFolderBase13GetFolderTypeEv @ 260 NONAME
+	_ZNK17CFSMailFolderBase14GetUnreadCountEv @ 261 NONAME
+	_ZNK17CFSMailFolderBase14GetUnseenCountEv @ 262 NONAME
+	_ZNK17CFSMailFolderBase15GetMessageCountEv @ 263 NONAME
+	_ZNK17CFSMailFolderBase17GetParentFolderIdEv @ 264 NONAME
+	_ZNK17CFSMailFolderBase17GetSubFolderCountEv @ 265 NONAME
+	_ZNK18CFSMailMessageBase10GetSubjectEv @ 266 NONAME
+	_ZNK18CFSMailMessageBase11GetFolderIdEv @ 267 NONAME
+	_ZNK18CFSMailMessageBase11IsRelatedToEv @ 268 NONAME
+	_ZNK18CFSMailMessageBase12GetMailBoxIdEv @ 269 NONAME
+	_ZNK18CFSMailMessageBase12GetMessageIdEv @ 270 NONAME
+	_ZNK18CFSMailMessageBase7GetDateEv @ 271 NONAME
+	_ZNK18CFSMailMessageBase8GetFlagsEv @ 272 NONAME
+	_ZNK18CFSMailMessageBase9GetSenderEv @ 273 NONAME
+	_ZNK18CFSMailMessageBase9IsFlagSetEi @ 274 NONAME
+	_ZNK18CFSMailMessagePart10IsMessageLEv @ 275 NONAME
+	_ZNK18CFSMailMessagePart11ContentSizeEv @ 276 NONAME
+	_ZNK18CFSMailMessagePart14FetchLoadStateEv @ 277 NONAME
+	_ZNK18CFSMailMessagePart14GetContentTypeEv @ 278 NONAME
+	_ZNK18CFSMailMessagePart16ReadOnlyPartSizeEv @ 279 NONAME
+	_ZNK18CFSMailMessagePart18FetchedContentSizeEv @ 280 NONAME
+	_ZNK18CFSMailMessagePart9GetPartIdEv @ 281 NONAME
+	_ZTI15CEmailExtension @ 282 NONAME
+	_ZTI16CExtendableEmail @ 283 NONAME
+	_ZTI21CFSMailRequestHandler @ 284 NONAME
+	_ZTV15CEmailExtension @ 285 NONAME
+	_ZTV16CExtendableEmail @ 286 NONAME
+	_ZTV21CFSMailRequestHandler @ 287 NONAME
+	_ZThn4_N15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 288 NONAME
+	_ZThn4_N15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 289 NONAME
+	_ZThn4_N15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 290 NONAME
+	_ZThn4_N15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 291 NONAME
+	_ZThn4_N15CFSMailIteratorD0Ev @ 292 NONAME
+	_ZThn4_N15CFSMailIteratorD1Ev @ 293 NONAME
 

--- a/emailservices/emailcommon/emailcommon.pro	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/emailcommon.pro	Mon May 03 12:23:15 2010 +0300
@@ -26,7 +26,8 @@
 ../inc \
 /epoc32/include/ecom 
 
-HEADERS   += inc/CFSMailBox.h \
+HEADERS   += inc/cemailextensionbase.h \ 
+    inc/CFSMailBox.h \
     inc/CFSMailBoxBase.h \
     inc/CFSMailFolder.h \
     inc/CFSMailFolderBase.h \
@@ -39,9 +40,14 @@
     inc/CFSMailRequestHandler.h \
     inc/CFSMailPluginData.h \
     inc/CFSMailCommon.h \
-    inc/nmconverter.h
+    inc/nmconverter.h \
+    inc/cmailboxstateext.h \
+    inc/cmailmessageext.h \
+    inc/cmrcalendarinfo.h \
+    inc/cmrcalendarinfoimpl.h
     
-SOURCES   += src/CFSMailBox.cpp \
+SOURCES   += src/cemailextensionbase.cpp \
+    src/CFSMailBox.cpp \
     src/CFSMailBoxBase.cpp \
     src/CFSMailFolder.cpp \
     src/CFSMailFolderBase.cpp \
@@ -53,7 +59,8 @@
     src/CFSMailIterator.cpp \
     src/CFSMailRequestHandler.cpp \
     src/CFSMailPluginData.cpp \
-    src/nmconverter.cpp
+    src/nmconverter.cpp \
+    src/emailcalendarinfoimpl.cpp
 
 symbian*: { 
     TARGET.EPOCALLOWDLLDATA = 1

--- a/emailservices/emailcommon/inc/CFSMailAddress.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailAddress.h	Mon May 03 12:23:15 2010 +0300
@@ -49,7 +49,7 @@
      * Two-phased constructor.
      *
      */
-    IMPORT_C static CFSMailAddress* NewL();
+   	 IMPORT_C static CFSMailAddress* NewL();
 
     /**
      * Two-phased constructor.
@@ -63,40 +63,40 @@
      * Two-phased constructor.
      *
      */
-    IMPORT_C static CFSMailAddress* NewLC();
+  	 IMPORT_C static CFSMailAddress* NewLC();
 
     /**
      * destructor
      */
-    IMPORT_C ~CFSMailAddress();
-        
+  	 IMPORT_C ~CFSMailAddress();
+      	
     /**
      * email address accessor
      *
      * @return email address owned by class
      */
-    IMPORT_C TDesC& GetEmailAddress() const;
+  	 IMPORT_C TDesC& GetEmailAddress() const;
         
     /**
      * email address mutator
      *
      * @param aAddress email address to be stored
      */
-    IMPORT_C void SetEmailAddress( const TDesC& aAddress );
-     
+  	 IMPORT_C void SetEmailAddress(const TDesC& aAddress);
+  	 
     /**
      * display name accessor
      *
      * @return stored display name owned by class
      */
-    IMPORT_C TDesC& GetDisplayName() const;
+  	 IMPORT_C TDesC& GetDisplayName() const;
         
     /**
      * display name mutator
      *
      * @param aDisplayName display name to be stored
      */
-    IMPORT_C void SetDisplayName( const TDesC& aDisplayName );
+  	 IMPORT_C void SetDisplayName(const TDesC& aDisplayName);
 
     /**
      * returns the NmAddress object
@@ -115,10 +115,11 @@
      CFSMailAddress();
     // </qmail> 
  
-  /**
+
+ 	/**
      * Two-phased constructor
      */
-     void ConstructL();
+  	 void ConstructL();
 
     /**
      * Two-phased constructor
@@ -129,12 +130,13 @@
 
  private: // data
 
-    /**
+	// <qmail>
+  	/**
      * email address - pointer descriptor to access QString object
      */
     mutable TPtrC  iEmailAddressPtr;
 
-    /**
+  	/**
      * display name - pointer descriptor to access QString object
      */
     mutable TPtrC  iDisplayNamePtr;
@@ -142,7 +144,6 @@
     /**
      * Reference to QT side of the address data object.
      */
-    // <qmail>
     QExplicitlySharedDataPointer<NmAddressPrivate> iNmPrivateAddress;
     // </qmail>
 };

--- a/emailservices/emailcommon/inc/CFSMailBox.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBox.h	Mon May 03 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -41,7 +41,6 @@
  *  mailbox data handling
  *
  *  @lib FSFWCommonLib
- *  @since S60 v3.1
  */
 NONSHARABLE_CLASS ( CFSMailBox ) : public CFSMailBoxBase
 {
@@ -57,15 +56,15 @@
      *
      * @param aMailBoxId mailbox id in plugin containing mailbox
      */
-    IMPORT_C static CFSMailBox* NewL( TFSMailMsgId aMailBoxId );
-    
+  	 IMPORT_C static CFSMailBox* NewL( TFSMailMsgId aMailBoxId	);
+  	
     /**
      * two based constructor
      *
      * @param aMailBoxId mailbox id in plugin containing mailbox
      */
-     IMPORT_C static CFSMailBox* NewLC( TFSMailMsgId aMailBoxId );
-    
+  	 IMPORT_C static CFSMailBox* NewLC( TFSMailMsgId aMailBoxId );
+  	
     /**
      * Enables synchronization of the mailbox. This means
      * that the framework can connect to server to do synchronization
@@ -84,8 +83,8 @@
      * for this purpose. There are also other reasons for ending up
      * in offline state like network error or scheduling.
      * 
-     */
-    IMPORT_C void GoOnlineL();
+	 */
+     IMPORT_C void GoOnlineL();
 
     /**
      * Disables mailbox synchronization. Connection to server
@@ -96,16 +95,16 @@
      * same connection then this function has effect on those
      * mailboxes also.
      * 
-     */
-    IMPORT_C void GoOfflineL();
+	 */
+     IMPORT_C void GoOfflineL();
 
     /**
      * Returns last synchronizing operation progress status.
      *
      * @return last sync operation progress status
      * 
-     */
-    IMPORT_C TFSProgress GetLastSyncStatusL();
+	 */
+     IMPORT_C TFSProgress GetLastSyncStatusL();
 
     /**
      * Forces synchronization of mailbox. This can be called
@@ -131,24 +130,24 @@
      * @param aOperationObserver optional observer given by user
      *
      * @return asynchronous request id
-     */
-    IMPORT_C TInt RefreshNowL( MFSMailRequestObserver& aOperationObserver );
+	 */
+     IMPORT_C TInt RefreshNowL( MFSMailRequestObserver& aOperationObserver );
 
-    IMPORT_C TInt RefreshNowL();
-    
+     IMPORT_C TInt RefreshNowL( );
+  	
     /**
      * cancels all ongoing synchronizations in this mailbox regardless
      * of initiator, by user or by plugin itself
      *
-     */
-    IMPORT_C void CancelSyncL();
+	 */
+     IMPORT_C void CancelSyncL();
 
     /**
      * creates into this mailbox new draft email 
      *
      * @return new draft email object, ownership is transferred to user
      */
-    IMPORT_C CFSMailMessage* CreateMessageToSend();
+  	 IMPORT_C CFSMailMessage* CreateMessageToSend( );
 
 // <qmail>  	 
     /**
@@ -178,7 +177,7 @@
         MFSMailRequestObserver& aOperationObserver );
 // </qmail> 
     
-     /**
+    /**
      * creates into this mailbox new draft email to be forwarded 
      *
      * @param aOriginalMessageId message id of the original message to be forwarded
@@ -187,8 +186,8 @@
      *
      * @return new draft email object, ownership is transferred to user
      */
-    IMPORT_C CFSMailMessage* CreateForwardMessage( const TFSMailMsgId aOriginalMessageId,
-                            const TDesC& aHeaderDescriptor = KNullDesC );
+  	 IMPORT_C CFSMailMessage* CreateForwardMessage( const TFSMailMsgId aOriginalMessageId,
+  	 												const TDesC& aHeaderDescriptor = KNullDesC  );
 
 // <qmail>       
     /**
@@ -218,9 +217,9 @@
      *
      * @return new draft email object, ownership is transferred to user
      */
-    IMPORT_C CFSMailMessage* CreateReplyMessage( const TFSMailMsgId aOriginalMessageId,
-                            const TBool aReplyToAll,
-                            const TDesC& aHeaderDescriptor = KNullDesC );
+  	 IMPORT_C CFSMailMessage* CreateReplyMessage(	const TFSMailMsgId aOriginalMessageId,
+  	 							 					const TBool aReplyToAll,
+  	 							 					const TDesC& aHeaderDescriptor = KNullDesC  );
 
 // <qmail>       
     /**
@@ -245,7 +244,7 @@
      *
      * @param aMessage message to be sent
      */
-    IMPORT_C void SendMessageL( CFSMailMessage& aMessage );
+	 IMPORT_C void SendMessageL(CFSMailMessage& aMessage);
 
 // <qmail>
     /**
@@ -259,41 +258,41 @@
 // </qmail>
 
     /**
-     * List subfolders of given folder.
-     * Only direct subfolders of given folder are returned.
-       *
-       * folder data : 
-       * - folder id
-       * - folder name
-       * - folder type ; Inbox, Outbox, Sent, Drafts, Deleted, Other
-       * - message count
-       * - unread message count
-       * - mailbox id 
-       * - parent folder
-       * - subfolder count
-       *
-       * @param aFolderId defines parent folder id. TFSMailId::NullId() for root level list.
-       * @param aFolderList plugin writes results in this array owned by user
-       */
-    IMPORT_C void ListFolders( const TFSMailMsgId aFolderId, RPointerArray<CFSMailFolder>& aFolderList ); 
+	 * List subfolders of given folder.
+	 * Only direct subfolders of given folder are returned.
+	 *
+	 * folder data : 
+	 * - folder id
+	 * - folder name
+	 * - folder type ; Inbox, Outbox, Sent, Drafts, Deleted, Other
+	 * - message count
+	 * - unread message count
+	 * - mailbox id 
+	 * - parent folder
+	 * - subfolder count
+	 *
+	 * @param aFolderId defines parent folder id. TFSMailId::NullId() for root level list.
+	 * @param aFolderList plugin writes results in this array owned by user
+	 */
+	 IMPORT_C void ListFolders( const TFSMailMsgId aFolderId, RPointerArray<CFSMailFolder>& aFolderList); 
 
-      /**
-       * List all subfolders of mailbox.
-       *
-       * folder data : 
-       * - folder id
-       * - folder name
-       * - folder type ; Inbox, Outbox, Sent Items, Drafts, Deleted Items, Other
-       * - message count
-       * - unread message count
-       * - mailbox id 
-       * - parent folder
-       * - subfolder count
-       *
-       * @return results in this array owned by this object, caller must determine
-       *         tree structure by examining parent id of each returned folder.
-       */
-    IMPORT_C RPointerArray<CFSMailFolder>& ListFolders(); 
+	/**
+	 * List all subfolders of mailbox.
+	 *
+	 * folder data : 
+	 * - folder id
+	 * - folder name
+	 * - folder type ; Inbox, Outbox, Sent Items, Drafts, Deleted Items, Other
+	 * - message count
+	 * - unread message count
+	 * - mailbox id 
+	 * - parent folder
+	 * - subfolder count
+	 *
+	 * @return results in this array owned by this object, caller must determine
+	 *         tree structure by examining parent id of each returned folder.
+	 */
+	 IMPORT_C RPointerArray<CFSMailFolder>& ListFolders(  ); 
 
     /**
      * Standard folder id accessor.
@@ -301,7 +300,7 @@
      * @param aFolderType defines folder type
      * @return standard folder id
      */
-    IMPORT_C TFSMailMsgId GetStandardFolderId( const TFSFolderType aFolderType );
+	 IMPORT_C TFSMailMsgId GetStandardFolderId( const TFSFolderType aFolderType );
 
 
     /**
@@ -310,7 +309,7 @@
      *
      * @return branding id
      */
-    IMPORT_C TDesC& GetBrandingIdL( );
+     IMPORT_C TDesC& GetBrandingIdL( );
 
 
     /**
@@ -320,10 +319,22 @@
      * @param aSourceFolderId source folder id
      * @param aDestinationFolderId destination folder id
      */    
-    IMPORT_C void MoveMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
-                                 const TFSMailMsgId aSourceFolderId, 
-                                 const TFSMailMsgId aDestinationFolderId );
+     IMPORT_C void MoveMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
+                                  const TFSMailMsgId aSourceFolderId, 
+                                  const TFSMailMsgId aDestinationFolderId );
 
+     /**
+     * Moves a messages between folders. Async version.
+     *                            
+     * @param MFSMailRequestObserver& aOperationObserver for callback
+     * @param aMessageIds ids of the messages to be transferred
+     * @param aSourceFolderId source folder id
+     * @param aDestinationFolderId destination folder id
+     */    
+	 IMPORT_C TInt MoveMessagesL( MFSMailRequestObserver& aOperationObserver,
+                                  const RArray<TFSMailMsgId>& aMessageIds, 
+                                  const TFSMailMsgId aSourceFolderId, 
+                                  const TFSMailMsgId aDestinationFolderId );
     /**
      * Copies a messages from one folder to another folder.
      * including the properties, content, and all attachments. 
@@ -336,11 +347,11 @@
      * @param aSourceFolderId source folder id
      * @param aDestinationFolderId destination folder id
      */    
-    IMPORT_C void CopyMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
-                                 RArray<TFSMailMsgId>& aCopiedMessages,
-                                 const TFSMailMsgId aSourceFolderId, 
-                                 const TFSMailMsgId aDestinationFolderId );
-                                  
+     IMPORT_C void CopyMessagesL(	const RArray<TFSMailMsgId>& aMessageIds, 
+							  		RArray<TFSMailMsgId>& aCopiedMessages,
+                              		const TFSMailMsgId aSourceFolderId, 
+                              		const TFSMailMsgId aDestinationFolderId );
+                              		
     /**
      * Asyncronous call for starting search for given string. Only one search can be
      * performed at a time.
@@ -355,33 +366,33 @@
      * results generated by the same search string.
      *    
      * The function will leave with KErrInUse if a search is already in progress.
-   *
+	 *
      * note only works if the store is in an authenticated state,
      * otherwise this function leaves with KErrNotReady
      *
      * @param aSearchStrings text strings that will be searched from different message fields.
-   * @param aSortCriteria sort criteria for the results
-   * @param aSortCriteria sort criteria for the results
+	 * @param aSortCriteria sort criteria for the results
+	 * @param aSortCriteria sort criteria for the results
      * @param aFolderIds user can give list of folders to be searched
      */    
-    IMPORT_C void SearchL( const RPointerArray<TDesC>& aSearchStrings,
-                           const TFSMailSortCriteria& aSortCriteria,
-                           MFSMailBoxSearchObserver& aSearchObserver );
+	 IMPORT_C void SearchL( const RPointerArray<TDesC>& aSearchStrings,
+						    const TFSMailSortCriteria& aSortCriteria,
+					 	    MFSMailBoxSearchObserver& aSearchObserver );
 
-    IMPORT_C void SearchL( const RPointerArray<TDesC>& aSearchStrings,
-                           const TFSMailSortCriteria& aSortCriteria,
-                           MFSMailBoxSearchObserver& aSearchObserver,
-                           RArray<TFSMailMsgId> aFolderIds );
+	 IMPORT_C void SearchL( const RPointerArray<TDesC>& aSearchStrings,
+						    const TFSMailSortCriteria& aSortCriteria,
+					 	    MFSMailBoxSearchObserver& aSearchObserver,
+                            RArray<TFSMailMsgId> aFolderIds );
     /**
      * Cancels current search. Does nothing if there is not any search ongoing.
      * The search client will not be called back after this function is called.
-     *
+	 *
      * note CancelSearch() method does NOT clear the search result cached in the store. 
      *       A different sort order can be used for the same search string, and the 
      *       cache will be utilized.  Only by using a different search string can the
      *       cache be cleaned.
      */    
-    IMPORT_C void CancelSearch();
+	 IMPORT_C void CancelSearch();
 
     /**
      * Inform the store to clean up its cache for search results.
@@ -390,15 +401,15 @@
      * 
      *  This function should be called by the UI when search results are no longer in display.
      */
-    IMPORT_C void ClearSearchResultCache();
+     IMPORT_C void ClearSearchResultCache();
 
-    /**
-     * DEPRECATED
-     *
+	/**
+	 * DEPRECATED
+	 *
      * @param aFolderId...
      * @param aObserver observer
      */    
-    IMPORT_C void AddObserver( const TFSMailMsgId aFolderId, MFSMailEventObserver& aObserver );
+	 IMPORT_C void AddObserver(const TFSMailMsgId aFolderId, MFSMailEventObserver& aObserver);
 
     /** 
      *  Get a list of most recently used addresses of this mailbox.
@@ -411,28 +422,28 @@
      * @return Array of descriptors containing MRUs. Ownership
      *         is transferred. Empty if no entries are found.
      */
-    IMPORT_C MDesCArray* ListMrusL() const;
+     IMPORT_C MDesCArray* ListMrusL() const;
 
     /**
      * Returns the current synchronizing state of this mailbox.
      *
      * @return mailbox synchronizing state data structure
      */
-    IMPORT_C TSSMailSyncState CurrentSyncState() const;
+     IMPORT_C TSSMailSyncState CurrentSyncState() const;
 
     /**
      * mailbox capability check for user
      *
      * @param aCapa mailbox capability to be checked
      */
-    IMPORT_C TBool HasCapability( const TFSMailBoxCapabilities aCapability ) const; 
+	 IMPORT_C TBool HasCapability(const TFSMailBoxCapabilities aCapability) const; 
 
     /**
      * mailbox connection status accessor
      *
      * @return connection status, online / offline
      */
-    IMPORT_C TFSMailBoxStatus GetMailBoxStatus( );
+	 IMPORT_C TFSMailBoxStatus GetMailBoxStatus( );
 
     /**
      * mailbox authentication data mutator
@@ -446,7 +457,7 @@
       * removes downloaded attachments from local/terminal memory 
       */
      IMPORT_C void RemoveDownLoadedAttachmentsL();
-   
+	 
      /**
       * reads connection id from plugin
       *
@@ -461,19 +472,45 @@
       * @param  aConnectionAllowed 
       * @return KErrNone or error code
       */
-     IMPORT_C TInt IsConnectionAllowedWhenRoaming( TBool& aConnectionAllowed ) ;
-   
+     IMPORT_C TInt IsConnectionAllowedWhenRoaming( TBool& aConnectionAllowed) ;
+
+     /**
+      * creates email from RFC822 format data stream located
+      * in given attachment file
+      *
+      * @param  aFile access to file containing data stream contents
+      *         given by user
+      *
+      * return new email object, ownership is transferred to user
+      */
+      IMPORT_C CFSMailMessage* CreateMessageFromFileL( const RFile& aFile );
+
+public: // from  CExtendableEmail
+
+     /**
+     * @see CExtendableEmail::ReleaseExtension()
+     */
+     IMPORT_C void ReleaseExtension( CEmailExtension* aExtension );
+
+     /**
+      * Returns extension by uid, leaves KErrNotSupported if extension is
+      * not available.
+      * @param aInterfaceUid extension interface uid
+      * @return extension pointer. Ownership depends on extension.
+      */
+     IMPORT_C CEmailExtension* ExtensionL( const TUid& aInterfaceUid );
+
 private:
 
-    /**
+  	/**
      * Two-phased constructor
      */
-     void ConstructL( TFSMailMsgId aMailBoxId );
+  	 void ConstructL( TFSMailMsgId aMailBoxId );
 
     /**
      * C++ default constructor.
      */
-     CFSMailBox();
+  	 CFSMailBox();
 
     /**
      * Function used internally to inform that Mru list related to this
@@ -577,12 +614,12 @@
     /**
      * request handler for plugin requests
      */
-    CFSMailRequestHandler*   iRequestHandler;  
+	 CFSMailRequestHandler* 	iRequestHandler;	
 
-    /**
+	/**
      * mailbox folder list
      */
-    RPointerArray<CFSMailFolder> iFolders;
+	 RPointerArray<CFSMailFolder> iFolders;
 
 };
 

--- a/emailservices/emailcommon/inc/CFSMailBoxBase.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBoxBase.h	Mon May 03 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,6 +23,7 @@
 #include <QExplicitlySharedDataPointer>
 #include <e32base.h>
 #include "CFSMailCommon.h"
+#include "cemailextensionbase.h"
 
 class NmMailboxPrivate;
 class NmMailbox;
@@ -37,42 +38,42 @@
  *  @since S60 S60 v3.1
  */
 
-NONSHARABLE_CLASS ( CFSMailBoxBase ) : public CBase
+NONSHARABLE_CLASS ( CFSMailBoxBase ) : public CExtendableEmail
 {
  public:
-
+  
     /**
      * Two-phased constructor.
      *
      * @param aMailBoxId mailbox id in plugin containing mailbox
      */
-     IMPORT_C static CFSMailBoxBase* NewL( const TFSMailMsgId aMailBoxId );
-
+     IMPORT_C static CFSMailBoxBase* NewL(const TFSMailMsgId aMailBoxId);
+  	
     /**
      * Two-phased constructor.
      *
      * @param aMailBoxId mailbox id in plugin containing mailbox
      */
-     IMPORT_C static CFSMailBoxBase* NewLC( const TFSMailMsgId aMailBoxId );
+     IMPORT_C static CFSMailBoxBase* NewLC(const TFSMailMsgId aMailBoxId);
 
     /**
      * Destructor.
-     */
+     */  
      IMPORT_C virtual ~CFSMailBoxBase();
-
+  	
     /**
      * mailbox id accessor
      *
      * @return mailbox id
      */
-     IMPORT_C TFSMailMsgId GetId() const;
+     IMPORT_C TFSMailMsgId GetId( ) const;
 
     /**
      * mailbox name accessor
      *
      * @return mailbox name
      */
-     IMPORT_C TDesC& GetName() const;
+     IMPORT_C TDesC& GetName( ) const;
 
     /**
      * mailbox name mutator
@@ -80,32 +81,35 @@
      * @param aMailBoxName mailbox name
      */
      IMPORT_C void SetName( const TDesC& aMailBoxName );
-
+	 		
     /**
      * retuns mailbox status accessor
      *
      * @return mailbox status
      */
-     IMPORT_C TFSMailBoxStatus GetStatus() const;
+     IMPORT_C TFSMailBoxStatus GetStatus( ) const;
 
     /**
      * mailbox status mutator
      *
      * @param aStatus mailbox status
      */
+     //<cmail>
+     //function definition is empty, we need to remove it if not needed
+     //</cmail>
      IMPORT_C void SetStatus( const TFSMailBoxStatus aStatus );
 
-    /*
-     * Function to set context of Remote Contact Lookup service for
-     * this mailbox for protocol plugins.
-     *
-     * @param aProtocolUid specifies Ecom implementation UID of
-     *        "Remote Contact Lookup Protocol Adaptation API" to use.
-     * @param aMailBoxId mailbox id in plugin
-     */
-     IMPORT_C void SetRCLInfo( const TUid aProtocolUid, const TUint aMailBoxId );
-
-     /*
+	/*
+	 * Function to set context of Remote Contact Lookup service for
+	 * this mailbox for protocol plugins.
+	 *
+	 * @param aProtocolUid specifies Ecom implementation UID of
+	 *	      "Remote Contact Lookup Protocol Adaptation API" to use.
+	 * @param aMailBoxId mailbox id in plugin
+	 */
+     IMPORT_C void SetRCLInfo(const TUid aProtocolUid, const TUint aMailBoxId);
+ 
+	/*
      * Function to retrieve Remote Contact Lookup service context for
      * this mailbox.
      *
@@ -113,7 +117,7 @@
      *        "Remote Contact Lookup Protocol Adaptation API" to use.
      * @param aMailBoxId mailbox id in plugin
      */
-     IMPORT_C void GetRCLInfo( TUid& aProtocolUid, TUint& aAccountUid );
+     IMPORT_C void GetRCLInfo(TUid& aProtocolUid, TUint& aAccountUid);
 
     /**
      * returns settings view id for mailbox
@@ -127,15 +131,15 @@
      *
      * @param aUid settings view id
      */
-     IMPORT_C void SetSettingsUid( const TUid aUid );
+     IMPORT_C void SetSettingsUid(const TUid aUid);
 
-    /**
-     * Returns a meeting request info processor, which is used for replying
-     * to meeting request received as MMRInfoObjet
-     *
-     * @return meeting info Processor, NULL if not supported by plugin
-     *         ownership not transferred
-     */
+	/**
+	 * Returns a meeting request info processor, which is used for replying
+	 * to meeting request received as MMRInfoObjet
+	 *
+	 * @return meeting info Processor, NULL if not supported by plugin
+	 *         ownership not transferred
+	 */ 
      IMPORT_C MMRInfoProcessor& MRInfoProcessorL();
 
     /**
@@ -143,28 +147,28 @@
      *
      * @return
      */
-     IMPORT_C TBool IsMRInfoProcessorSet();
+	 IMPORT_C TBool IsMRInfoProcessorSet();
+
+	/**
+	 * Meeting request info processor mutator
+	 *
+	 * @param aMrInfoProcessor meeting info Processor, ownership transferred
+	 */ 
+	 IMPORT_C void SetMRInfoProcessorL(MMRInfoProcessor* aMrInfoProcessor);
 
     /**
-     * Meeting request info processor mutator
+     * mailbox own address accessor
      *
-     * @param aMrInfoProcessor meeting info Processor, ownership transferred
+     * @return mailbox own address
      */
-     IMPORT_C void SetMRInfoProcessorL( MMRInfoProcessor* aMrInfoProcessor );
+     IMPORT_C CFSMailAddress& OwnMailAddress( );
 
-     /**
-      * mailbox own address accessor
-      *
-      * @return mailbox own address
-      */
-      IMPORT_C CFSMailAddress& OwnMailAddress();
-    
     /**
      * mailbox own address mutator
      *
      * @param aOwnMailAddress mailbox own address
      */
-     IMPORT_C void SetOwnMailAddressL( CFSMailAddress* aOwnMailAddress );
+     IMPORT_C void SetOwnMailAddressL( CFSMailAddress* aOwnMailAddress);
     
     /**
      * returns nmmailbox constructed with shared data,
@@ -181,54 +185,54 @@
      */
      CFSMailBoxBase();
 
-    /**
-     * branding id accessor
-     */
-     TDesC& BrandingId();
+     /**
+      * branding id accessor
+      */
+      TDesC& BrandingId();
 
 // <qmail> Removed SetMailBoxId </qmail>
 protected: // data
 
 protected: // <cmail>
 
-    /**
+  	/**
      * Two-phased constructor
      */
-     void ConstructL( const TFSMailMsgId aMailBoxId );
-
+  	 void ConstructL( const TFSMailMsgId aMailBoxId );
+  	 
 private: // data
-
-    /**
+ 	
+	/**
      * mailbox name
      */
-     HBufC*               iMailBoxName;
+	 HBufC*	              iMailBoxName;
 
-
-    /**
+	 
+	/**
      * remote contact lookup info
      */
      TUid                 iProtocolUid;
-     TUint                iAccountUid;
-
-    /**
+     TUint 	              iAccountUid;
+	
+	/**
      * settings uid
      */
      TUid                 iSettingsUid;
 
-     /**
+	/**
      * Meeting request info
      */
      MMRInfoProcessor*    iMRInfoProcessor;
 
-    /**
+	/**
      * mailbox own address
      */
-     CFSMailAddress*      iOwnMailAddress;
+	 CFSMailAddress*      iOwnMailAddress;
 
-    /**
-     * branding id
-     */
-     HBufC*                iBrId;
+	 /**
+	  * branding id
+	  */
+	 HBufC*                iBrId;
 
     /**
      * Reference to QT side of the mailbox object.
@@ -242,9 +246,11 @@
      * Variable is mutable in order to maintain 
      * binary compatibility in this API
      */
+// <qmail>
      mutable TPtrC16 iTextPtr;
+// </qmail>
 
 // <qmail> Removed iMailBoxId </qmail>
 };
 
-#endif  // __CFSMAILBOXBASE_H
+#endif 	// __CFSMAILBOXBASE_H

--- a/emailservices/emailcommon/inc/CFSMailCommon.h	Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailCommon.h	Mon May 03 12:23:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2008 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"
@@ -24,18 +24,18 @@
 // </qmail>
 #include "nmcommon.h" //NmId
 
-/** folder type definitions */
+/** folder type definitions */  
 enum TFSFolderType
     {
-  EFSInbox = 1,
-  EFSOutbox,
-  EFSDraftsFolder,
-  EFSSentFolder,
-  EFSDeleted,
-  EFSOther
+    EFSInbox = 1,
+    EFSOutbox,
+    EFSDraftsFolder,
+    EFSSentFolder,
+    EFSDeleted,
+    EFSOther
     };
-
-/** email flags */
+    
+/** email flags */  
 enum TFSMsgFlag
     {
     EFSMsgFlag_Read = 1,                 // Message is read (or "seen") on the server
@@ -51,10 +51,10 @@
     EFSMsgFlag_Forwarded = 1024,         // The message was forwarded
     EFSMsgFlag_OnlyToMe = 2048,          // The message was sent only to this user
     EFSMsgFlag_RemoteDeleted = 4096,     // The message has been deleted on the server
-    EFSMsgFlag_HasMsgSender = 8192,      // The message has one or more senders
+    EFSMsgFlag_HasMsgSender = 8192,      // The message has one or more senders 
     };
 
-/** email list sorting options */
+/** email list sorting options */  
 enum TFSMailSortField
     {
     EFSMailDontCare,            // user accepts any sort order
@@ -63,20 +63,20 @@
     EFSMailSortByRecipient,     // sorting is done by recipients
     EFSMailSortBySubject,       // sorting is done by subject
     EFSMailSortByPriority,      // sorting is done by priority
-    EFSMailSortByFlagStatus,    // follow up and completed
+    EFSMailSortByFlagStatus,    // follow up and completed   
     EFSMailSortByUnread,        // sorting is based on unread
     EFSMailSortBySize,          // sorting is done by size
     EFSMailSortByAttachment     // sorting is based on if message has attachments
     };
 
-/** email list sort order */
+/** email list sort order */  
 enum TFSMailSortOrder
     {
-  EFSMailDescending,
-  EFSMailAscending
+    EFSMailDescending,
+    EFSMailAscending    
     };
 
-/** email list sort criteria definition */
+/** email list sort criteria definition */  
 class TFSMailSortCriteria
     {
     public:
@@ -87,8 +87,8 @@
 /** mailbox status */
 enum TFSMailBoxStatus
     {
-  EFSMailBoxOffline = 1,
-  EFSMailBoxOnline
+    EFSMailBoxOffline = 1,
+    EFSMailBoxOnline
     };
 
 /** mailbox capabilities */
@@ -97,96 +97,99 @@
     // Mailbox supports creating subfolders.
     // Not supported by UI in 1.0 release.
     EFSMBoxCapaCreateSubfolder = 1,
-
+    
     // Mailbox supports responding to meeting requests.
     EFSMBoxCapaMeetingRequestRespond,
-
+    
     // Mailbox supports meeting request creation.
     EFSMBoxCapaMeetingRequestCreate,
-
+    
     // Mailbox supports meeting request update.
-  EFSMBoxCapaCanUpdateMeetingRequest,
-
+    EFSMBoxCapaCanUpdateMeetingRequest,     
+    
     // Mailbox supports user folder manipulation (rename and delete).
     // Not supported by UI in 1.0 release.
     EFSMBoxCapaManipulateUserFolders,
-
+    
     // Mailbox supports moving messages to and from user folders.
-    // Not supported in 1.0 release.
+    // Not supported in 1.0 release. 
     // (NOT USED. To be defined in the future.)
     EFSMBoxCapaMoveMessageToUserFolder,
-
+    
+    // Mailbox can move messages in offline or handle go online itself
+    EFSMBoxCapaMoveMessageNoConnectNeeded,
+    
     // Mailbox supports moving messages between folders.
     EFSMBoxCapaMoveToFolder,
-
+    
     // Mailbox supports copying messages between folders.
     // Not supported by UI in 1.0 release.
     EFSMBoxCapaCopyToFolder,
-
+    
     // Mailbox supports smart reply feature.
     // Returned by Intellisync and ActiveSync. UI will fetch rest of message if not supported.
     EFSMBoxCapaSmartReply,
-
+    
     // Mailbox supports smart forward feature.
     // Returned by Intellisync and ActiveSync. UI will fetch rest of message if not supported.
     EFSMBoxCapaSmartForward,
-
+    
     // Mailbox handles itself integration to Symbian Messaging.
     // Not supported by any protocol in 1.0 release.
     //
-    // (Should be returned for mailboxes that handle possible Symbian Messaging
-    // integration themselves. I.e. FW must not ask FS Integration MTM to replicate
-    // these mailboxes to Symbian Messaging. It is intended to prevent duplicate
-    // accounts in Symbian Messaging in the case when protocol plugin actually
-  // already has visible accounts in Symbian Messaging.)
+    // (Should be returned for mailboxes that handle possible Symbian Messaging 
+    // integration themselves. I.e. FW must not ask FS Integration MTM to replicate 
+    // these mailboxes to Symbian Messaging. It is intended to prevent duplicate 
+    // accounts in Symbian Messaging in the case when protocol plugin actually 
+    // already has visible accounts in Symbian Messaging.)
     EFSMBoxCapaSymbianMsgIntegration,
-
+    
     // Mailbox implements new email notifications itself.
     // Not supported by any protocol in 1.0 release.
-  //
-  // (EFSMBoxCapaNewEmailNotifications is intended to be defined for mailboxes that
-  // handle new email notifications some other way than relying to FW
-  // displaying them (e.g. via NCNList). If this is defined for a mailbox then
-  // FW will not monitor and display new email notifications for the mailbox.
-  // The aim is to prevent possible duplicate notifications to user.)
+    //
+    // (EFSMBoxCapaNewEmailNotifications is intended to be defined for mailboxes that 
+    // handle new email notifications some other way than relying to FW 
+    // displaying them (e.g. via NCNList). If this is defined for a mailbox then 
+    // FW will not monitor and display new email notifications for the mailbox.
+    // The aim is to prevent possible duplicate notifications to user.)
     EFSMBoxCapaNewEmailNotifications,
-
-  // Mailbox supports MRU feature.
-  // Framework can check this before updating the list for optimization. Intellisync and ActiveSync need to set.
-  // Capability is not checked in UI. Plugin just returns a null if there’s no MRU list and the UI doesn’t show anything.
+    
+    // Mailbox supports MRU feature.
+    // Framework can check this before updating the list for optimization. Intellisync and ActiveSync need to set.
+    // Capability is not checked in UI. Plugin just returns a null if there’s no MRU list and the UI doesn’t show anything.
     EFSMBoxCapaSupportsMRU,
-
-  // Mailbox can be deleted.
-  // Set by Intellisync and ActiveSync only if the server supports.
-  EFSMBoxCapaCanBeDeleted,
-
-  // Mailbox supports out of office feature.
-  // Set by Intellisync and ActiveSync. Not used by UI -> can be deprecated?
-  // EFSMBoxCapaSupportsOutOfOffice,
-
+     
+    // Mailbox can be deleted.
+    // Set by Intellisync and ActiveSync only if the server supports.
+    EFSMBoxCapaCanBeDeleted,
+        
+    // Mailbox supports out of office feature.
+    // Set by Intellisync and ActiveSync. Not used by UI -> can be deprecated?
+    // EFSMBoxCapaSupportsOutOfOffice,
+    
     // Mailbox supports setting OoO on/off.
     // Set by Intellisync and ActiveSync. Not used by UI -> can be deprecated?
     // EFSMBoxCapaOutOfOfficeSet,
-
+    
     // Mailbox supports editing out of office.
     // Set by Intellisync and ActiveSync. Not used by UI -> can be deprecated?
     // EFSMBoxCapaOutOfOfficeEdit,
-
-  // Mailbox supports saving to drafts automically when "create message to send" and
-  // "save message" (in framework api) are used.
-  EFSMBoxCapaSupportsSaveToDrafts,
-
+    
+    // Mailbox supports saving to drafts automically when "create message to send" and 
+    // "save message" (in framework api) are used.
+    EFSMBoxCapaSupportsSaveToDrafts,
+    
     // Remote Contact Lookup is supported via this mailbox.
     // Set by Intellisync and ActiveSync.
-  EFSMBoxCapaSupportsRCL,
-
-  // Mailbox supports followup. Email UI hides Follow Up flagging if mailbox does not support it.
+    EFSMBoxCapaSupportsRCL,
+    
+    // Mailbox supports followup. Email UI hides Follow Up flagging if mailbox does not support it.
     EFSMBoxCapaSupportsFollowUp,
-
+    
     // Mailbox supports for "do you want to delete"prompt.
     EFSMBoxCapaSupportsDeletedItemsFolder,
 
-  // Mailbox does not support editing original message with smart reply or forward
+    // Mailbox does not support editing original message with smart reply or forward
     EFSMBoxCapaReadOnlySmartQuote,
 
     // Mailbox supports sync
@@ -200,23 +203,35 @@
     EFSMBoxCapaMeetingRequestAttendeeStatus,
 
     EFSMBoxCapaMRRequiresReplyEmail,
-
+    
     // Mailbox supports embedded reply / forward message feature.
-    EFSMBoxCapaEmbeddedReplyForwardMessage
+    EFSMBoxCapaEmbeddedReplyForwardMessage,
+    
+    // Mailbox supports removing entry from calendar
+    EFSMBoxCapaRemoveFromCalendar,
 
+    // Mailbox supports attachments in meeting requests
+    EFSMboxCapaSupportsAttahmentsInMR,
+    
+    // Mailbox supports saving of embedded messages
+    EFSMboxCapaSupportsSavingOfEmbeddedMessages,
+    
+    // Mailbox supports smart editing feature.
+    // Returned by Intellisync and ActiveSync. If defined, UI will fetch message body fully. 
+    EFSMBoxCapaSmartEdit
     };
 
 /** email details included in plugin responses */
-enum TFSMailDetails
-  {
-  EFSMsgDataIdOnly = 1,     // Doesn't get any data. The object just contains the ID.
-  EFSMsgDataDate = 2,       // Get received date only. To be used when showing messages sorted by date.
-                              // The rest would be retreived when needed but date is needed to build the list.
-  EFSMsgDataSubject = 4,    // Like above but when sorting by subject
-  EFSMsgDataSender = 8,     // Likewise for sender address.
-  EFSMsgDataEnvelope = 16,  // Date, subject, Sender, To, Cc at least.
-  EFSMsgDataStructure = 32  // the part structure including mime type, size and name headers.
-  };
+enum TFSMailDetails 
+    {
+    EFSMsgDataIdOnly = 1,       // Doesn't get any data. The object just contains the ID.
+    EFSMsgDataDate = 2,         // Get received date only. To be used when showing messages sorted by date.
+                                // The rest would be retreived when needed but date is needed to build the list.
+    EFSMsgDataSubject = 4,      // Like above but when sorting by subject
+    EFSMsgDataSender = 8,       // Likewise for sender address.
+    EFSMsgDataEnvelope = 16,    // Date, subject, Sender, To, Cc at least.
+    EFSMsgDataStructure = 32    // the part structure including mime type, size and name headers.
+    };
 
     enum TFSPartFetchState
     {
@@ -227,53 +242,60 @@
     EFSEmailStructureUnknown
     };
 
-
 /** class for message part / message / folder / mailbox id */
 class TFSMailMsgId
-  {
-  public:
+    {
+    public:
 
-  inline TFSMailMsgId( ) // constructs NULL id
-  { iPluginId.iUid = 0; iId = 0; iNullId = ETrue; };
-  inline TFSMailMsgId(TUid aPluginId, TUint aId)
-  { iPluginId = aPluginId; iId = aId; iNullId = EFalse; };
-  inline TFSMailMsgId(TUint aPluginId, TUint aId)
-  { iPluginId.iUid = aPluginId; iId = aId; iNullId = EFalse; };
-  inline TFSMailMsgId(NmId aId)
+    inline TFSMailMsgId( ) // constructs NULL id
+    { iPluginId.iUid = 0; iId = 0; iNullId = ETrue; iSeparator = EFalse; };
+    inline TFSMailMsgId(TUid aPluginId, TUint aId)
+    { iPluginId = aPluginId; iId = aId; iNullId = EFalse; iSeparator = EFalse; };
+    inline TFSMailMsgId(TUint aPluginId, TUint aId)
+    { iPluginId.iUid = aPluginId; iId = aId; iNullId = EFalse; iSeparator = EFalse; };
+// <qmail>
+  	inline TFSMailMsgId(NmId aId)
 	{ iPluginId.iUid = aId.pluginId32();
 	  iId = aId.id32();
 	  (aId.id() == 0) ? iNullId = ETrue : iNullId = EFalse;
+	  iSeparator = EFalse;
 	};
-  inline TBool operator==(TFSMailMsgId aId) const
-  { if(iNullId != aId.IsNullId()) return EFalse;
-    if(iPluginId.iUid != aId.PluginId().iUid) return EFalse;
-    if(iId != aId.Id()) return EFalse; return ETrue; };
-  inline TBool operator!=(TFSMailMsgId aId) const
-  { if(iNullId != aId.IsNullId()) return ETrue;
-    if(iPluginId.iUid != aId.PluginId().iUid) return ETrue;
-    if(iId != aId.Id()) return ETrue; return EFalse; }
-  inline TBool IsNullId() const { return iNullId; };
-  inline void  SetNullId() { iPluginId.iUid = 0; iId = 0; iNullId = ETrue; } ;
-  inline TUid PluginId() const { return iPluginId; };
-  inline TUint Id() const { return iId; };
-  inline void  SetPluginId(TUid aPluginId) { iPluginId = aPluginId; iNullId = EFalse; };
-  inline void  SetId(TUint aId) { iId = aId; iNullId = EFalse; };
-  inline NmId GetNmId()
-  {
-    NmId nmid;
-    if( !iNullId ){
-      nmid.setId32(iId);
-      nmid.setPluginId32(iPluginId.iUid);
-    }
-    return nmid;
-  };
+// </qmail>
+    inline TBool operator==(TFSMailMsgId aId) const
+    { if(iNullId != aId.IsNullId()) return EFalse;
+      if(iPluginId.iUid != aId.PluginId().iUid) return EFalse;
+      if(iId != aId.Id()) return EFalse; return ETrue; };
+    inline TBool operator!=(TFSMailMsgId aId) const
+    { if(iNullId != aId.IsNullId()) return ETrue;
+      if(iPluginId.iUid != aId.PluginId().iUid) return ETrue;
+      if(iId != aId.Id()) return ETrue; return EFalse; }
+    inline TBool IsNullId() const { return iNullId; };
+    inline void  SetNullId() { iPluginId.iUid = 0; iId = 0; iNullId = ETrue; } ;
+    inline TUid PluginId() const { return iPluginId; };
+    inline TUint Id() const { return iId; };
+    inline void  SetPluginId(TUid aPluginId) { iPluginId = aPluginId; iNullId = EFalse; };
+    inline void  SetId(TUint aId) { iId = aId; iNullId = EFalse; };
+    inline void SetSeparator( TBool aSeparator ) { iSeparator = aSeparator; }
+    inline TBool IsSeparator() const { return iSeparator; }
+// <qmail>
+  	inline NmId GetNmId()
+  	{
+    	NmId nmid;
+    	if( !iNullId ) {
+      		nmid.setId32(iId);
+      		nmid.setPluginId32(iPluginId.iUid);
+    	}
+    	return nmid;
+  	};
+// </qmail>
 
-  protected:
+    protected:
 
-  TBool iNullId;
-  TUid  iPluginId;      // ecom implementation id
-  TUint iId;            // message, folder, mailbox id
-  };
+    TBool   iNullId;
+    TUid    iPluginId;      // ecom implementation id
+    TUint   iId;            // message, folder, mailbox id
+    TBool   iSeparator;     // if object is separator
+    };
 
 /* Predefined constants for ContentTypes and parameters for ContentType and ContentDisposition */
 _LIT(KFSMailContentTypeMultipartMixed, "multipart/mixed");
@@ -286,6 +308,8 @@
 _LIT(KFSMailContentTypeMessage, "message/rfc822");
 _LIT(KFSMailContentTypeParamName, " name=");
 _LIT(KFSMailContentTypeParamCharset, " charset=");
+_LIT(KFSMailContentTypeTextCalendar, "text/calendar");
+
 
 _LIT(KFSMailContentDispAttachment, " attachment");
 _LIT(KFSMailContentDispParamFilename, " filename=");
@@ -314,8 +338,8 @@
     PasswordNotVerified,
     PushChannelOff,
     PushChannelEstablished,
-  PushChannelOffBecauseBatteryIsLow,
-  OutOfDiskSpace
+    PushChannelOffBecauseBatteryIsLow,
+    OutOfDiskSpace
     };
 
 /**
@@ -371,20 +395,20 @@
         // aParam1: NULL
         // aParam2: NULL
         // aParam3: NULL
-        TFSEventNewMailbox,
+        TFSEventNewMailbox, 
 
         // New mailbox creation failure
         // aParam1: NULL
         // aParam2: NULL
         // aParam3: NULL
-        TFSEventMailboxCreationFailure,
+        TFSEventMailboxCreationFailure, 
 
         // Mailbox renamed
         // aParam1: NULL
         // aParam2: NULL
         // aParam3: NULL
         TFSEventMailboxRenamed,
-
+        
         // Mailbox deleted
         // aParam1: NULL
         // aParam2: NULL
@@ -425,18 +449,19 @@
         // aParam3: NULL
         TFSEventMailboxSyncStateChanged,
 
+// <qmail>
         // New mails created
         // aParam1: RArray<TFSMailMsgId>* aNewEntries
         // aParam2: TFSMailMsgId* aParentFolder
         // aParam3: NULL
-        TFSEventNewMail,
+        TFSEventNewMail, 
 
         // Mails changed
         // aParam1: RArray<TFSMailMsgId>* aEntries
         // aParam2: TFSMailMsgId* aParentFolder
         // aParam3: NULL
         TFSEventMailChanged,
-
+        
         // Mails deleted
         // aParam1: RArray<TFSMailMsgId>* aEntries
         // aParam2: TFSMailMsgId* aParentFolder
@@ -459,14 +484,14 @@
         // aParam1: RArray<TFSMailMsgId>* aNewEntries
         // aParam2: TFSMailMsgId* aParentFolder
         // aParam3: NULL
-        TFSEventNewFolder,
+        TFSEventNewFolder, 
 
         // Folders changed
         // aParam1: RArray<TFSMailMsgId>* aEntries
         // aParam2: TFSMailMsgId* aParentFolder
         // aParam3: NULL
         TFSEventFolderChanged,
-
+        
         // Folders deleted
         // aParam1: RArray<TFSMailMsgId>* aEntries
         // aParam2: TFSMailMsgId* aParentFolder
@@ -478,20 +503,27 @@
         // aParam2: TFSMailMsgId* aNewParentFolder
         // aParam3: TFSMailMsgId* aOldParentFolder
         TFSEventFoldersMoved,
+// </qmail>
 
-        // exception / error happened
+        // exception / error happened 
         // aParam1: TInt (TFsEmailNotifierSystemMessageType) aEventType
         // aParam2: TDesC* aCustomMessage or NULL (optional)
         // aParam3: MFSMailExceptionEventCallback* aCallback or NULL (optional)
         TFSEventException,
+        
+        // Mail deleted from viewer
+        // aParam1: RArray<TFSMailId>* aEntries
+        // aParam2: TFSMailId* aParentFolder
+        // aParam3: NULL
+        TFSEventMailDeletedFromViewer,
         };
-
+        
 /**
  * Progress data structure to indicate different kind of progress
  * information coming from plugins to user. Usually user uses
  * progress events to update progress bar in user interface.
  *
- * Download progress indication :
+ * Download progress indication : 
  *   - first event iProgressStatus = EFSStatus_Started
  *   - next event iProgressStatus = EFSStatus_Status
  *   - last event iProgressStatus = EFSStatus_RequestComplete
@@ -510,7 +542,7 @@
  *   - iProgressStatus = EFSStatus_RequestCancelled
  *   - iMaxCount & iCounter optional, latest values or ignore/unknown = -1
  *   - iError symbian error code
- *
+ * 
  * Connection establisment progress :
  *
  *   - iProgressStatus ; EFSStatus_Waiting, EFSStatus_Connecting,
@@ -525,39 +557,39 @@
 public:
 
     /** possible progress indication states  */
-  enum TFSProgressStatus
-  {
-    EFSStatus_Waiting = 1,
-    EFSStatus_Started,
-    EFSStatus_Connecting,
-    EFSStatus_Connected,
-    EFSStatus_Authenticating,
-    EFSStatus_Authenticated,
-    EFSStatus_Status,
-    EFSStatus_RequestComplete,
-    EFSStatus_RequestCancelled,
-  };
+    enum TFSProgressStatus
+    {
+        EFSStatus_Waiting = 1,
+        EFSStatus_Started,
+        EFSStatus_Connecting,
+        EFSStatus_Connected,
+        EFSStatus_Authenticating,
+        EFSStatus_Authenticated,
+        EFSStatus_Status,
+        EFSStatus_RequestComplete,
+        EFSStatus_RequestCancelled,
+    };
 
 public: // data
-
+                
     /** event progress / completion status*/
     TFSProgressStatus   iProgressStatus;
-
+                    
     /** max value in progress countingc   */
-    TInt        iMaxCount;
+    TInt                iMaxCount;
 
     /** progress counter                  */
-    TInt        iCounter;
+    TInt                iCounter;
 
     /** error code (Symbian error codes)  */
-    TInt        iError;
+    TInt                iError;
 
 // <qmail>	
 	/** Related data parameter (used for async message creation) **/	
     TAny* iParam;
 // </qmail>
     };
-
+    
 // <qmail> Protocol plugins leave with this if API is not implemented
 const TInt KErrFSMailPluginNotSupported = KErrNotSupported - 1000;
 // </qmail>