201035
authorhgs
Fri, 03 Sep 2010 14:07:42 +0300
changeset 66 084b5b1f02a7
parent 62 a8c646b56683
child 67 459da34cdb45
201035
email_plat/email_services_api/email_services_api.h
email_plat/nmail_settings_api/nmapisettingsmanager.h
emailservices/emailclientapi/src/emailmailbox.cpp
emailservices/emailclientapi/src/emailmessage.cpp
emailservices/emailclientapi/src/emailmessagesearch.cpp
emailservices/emailcommon/bwins/fsfwcommonlibu.def
emailservices/emailcommon/eabi/fsfwcommonlibu.def
emailservices/emailcommon/inc/CFSMailBox.h
emailservices/emailcommon/inc/CFSMailBoxBase.h
emailservices/emailcommon/inc/CFSMailMessagePart.h
emailservices/emailcommon/inc/CFSMailRequestHandler.h
emailservices/emailcommon/src/CFSMailBox.cpp
emailservices/emailcommon/src/CFSMailBoxBase.cpp
emailservices/emailcommon/src/CFSMailMessagePart.cpp
emailservices/emailcommon/src/CFSMailRequestHandler.cpp
emailservices/emailframework/bwins/fsmailframeworku.def
emailservices/emailframework/data/fsmailbrandmanager.rss
emailservices/emailframework/eabi/fsmailframeworku.def
emailservices/emailframework/emailframework.pro
emailservices/emailframework/inc/CFSMailBrand.h
emailservices/emailframework/inc/CFSMailBrandManagerImpl.h
emailservices/emailframework/inc/CFSMailClient.h
emailservices/emailframework/inc/CFSMailPlugin.h
emailservices/emailframework/inc/CFSMailPlugin.inl
emailservices/emailframework/inc/CFSMailPluginManager.h
emailservices/emailframework/inc/MFSMailBrandManager.h
emailservices/emailframework/inc/MFSMailPlugin.h
emailservices/emailframework/inc/MailBrandManager.hrh
emailservices/emailframework/inc/MailBrandManager.rh
emailservices/emailframework/src/CFSMailBrand.cpp
emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp
emailservices/emailframework/src/CFSMailClient.cpp
emailservices/emailframework/src/CFSMailPluginManager.cpp
emailservices/emailstore/base_plugin/bwins/basepluginu.def
emailservices/emailstore/base_plugin/eabi/basepluginu.def
emailservices/emailstore/base_plugin/inc/BasePlugin.h
emailservices/emailstore/base_plugin/src/basepluginmisc.cpp
emailservices/emailstore/base_plugin/src/basepluginnotifications.cpp
emailservices/emailstore/base_plugin/src/basepluginparts.cpp
emailservices/emailstore/message_store/debuglog/src/DebugLog.cpp
emailservices/emailstore/message_store/server/src/ContainerStoreContainersTable.cpp
emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp
emailservices/emailstore/message_store/server/src/ContainerStoreMRUAddressTable.cpp
emailservices/emailstore/message_store/server/src/MessageStoreServer.cpp
emailservices/nmailagent/src/nmmailagent.cpp
emailservices/nmailbase/inc/nmcommon.h
emailservices/nmailbase/src/nmmessagepart.cpp
emailservices/nmclientapi/bwins/nmailclientapiu.def
emailservices/nmclientapi/eabi/nmailclientapiu.def
emailservices/nmclientapi/src/nmapiengine.cpp
emailservices/nmutilities/nmutilities.pro
emailuis/nmailui/conf/nmeditorview.docml
emailuis/nmailui/conf/nmmessagesearchlistview.docml
emailuis/nmailui/inc/nmapplication.h
emailuis/nmailui/inc/nmmailboxlistviewitem.h
emailuis/nmailui/inc/nmmessagelistviewitem.h
emailuis/nmailui/inc/nmmessagesearchlistview.h
emailuis/nmailui/inc/nmuiheaders.h
emailuis/nmailui/inc/nmviewerserviceinterface.h
emailuis/nmailui/nmailui.pro
emailuis/nmailui/resources/mail_editor.docml
emailuis/nmailui/resources/mail_editor.splashml
emailuis/nmailui/resources/mail_messagelist.docml
emailuis/nmailui/resources/mail_messagelist.splashml
emailuis/nmailui/resources/mail_viewer.docml
emailuis/nmailui/resources/mail_viewer.splashml
emailuis/nmailui/src/main.cpp
emailuis/nmailui/src/nmapplication.cpp
emailuis/nmailui/src/nmattachmentpicker.cpp
emailuis/nmailui/src/nmeditorcontent.cpp
emailuis/nmailui/src/nmeditorheader.cpp
emailuis/nmailui/src/nmeditorview.cpp
emailuis/nmailui/src/nmmailboxlistviewitem.cpp
emailuis/nmailui/src/nmmessagelistview.cpp
emailuis/nmailui/src/nmmessagelistviewitem.cpp
emailuis/nmailui/src/nmmessagesearchlistview.cpp
emailuis/nmailui/src/nmuidocumentloader.cpp
emailuis/nmailui/src/nmviewerheader.cpp
emailuis/nmailui/src/nmviewerserviceinterface.cpp
emailuis/nmailui/src/nmviewerview.cpp
emailuis/nmailuiengine/bwins/nmailuiengineu.def
emailuis/nmailuiengine/eabi/nmailuiengineu.def
emailuis/nmailuiengine/inc/nmmessagelistmodel.h
emailuis/nmailuiengine/inc/nmuiengine.h
emailuis/nmailuiengine/src/nmbaseclientplugin.cpp
emailuis/nmailuiengine/src/nmmessagelistmodel.cpp
emailuis/nmailuiengine/src/nmuiengine.cpp
emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def
emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def
emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h
emailuis/nmailuiwidgets/inc/nmattachmentlistwidget.h
emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp
emailuis/nmailuiwidgets/src/nmattachmentlistwidget.cpp
emailuis/nmailuiwidgetsplugin/inc/nmailuiwidgetsplugin.h
emailuis/nmailuiwidgetsplugin/nmailuiwidgetsplugin.pro
emailuis/nmailuiwidgetsplugin/src/nmailuiwidgetsplugin.cpp
emailuis/nmframeworkadapter/inc/nmframeworkadapter.h
emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp
emailuis/nmhswidget/src/nmhswidgetemailengine.cpp
emailuis/nmhswidget/src/nmhswidgetemailrow.cpp
emailuis/nmsettingui/bwins/nmsettinguiu.def
emailuis/nmsettingui/eabi/nmsettinguiu.def
emailuis/nmsettingui/inc/nmsettingsviewfactory.h
emailuis/nmsettingui/src/nmsettingsviewfactory.cpp
emailuis/rom/nmail.iby
inc/MFSMailBrandManager.h
inc/MailBrandManager.hrh
ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h
ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp
ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp
ipsservices/ipssosplugin/EABI/IPSSOSPLUGINU.DEF
ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h
ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp
ipsservices/nmipssettings/inc/nmipsextendedsettingsmanager.h
ipsservices/nmipssettings/inc/nmipssettingslabeledcombobox.h
ipsservices/nmipssettings/inc/nmipssettingsplugin.h
ipsservices/nmipssettings/src/nmipsextendedsettingsmanager.cpp
ipsservices/nmipssettings/src/nmipsimap4settingsmanager.cpp
ipsservices/nmipssettings/src/nmipspop3settingsmanager.cpp
ipsservices/nmipssettings/src/nmipssettingscustomitem.cpp
nmail.pro
package_definition.xml
package_map.xml
--- a/email_plat/email_services_api/email_services_api.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/email_plat/email_services_api/email_services_api.h	Fri Sep 03 14:07:42 2010 +0300
@@ -18,6 +18,25 @@
 #ifndef EMAIL_SERVICES_API_H
 #define EMAIL_SERVICES_API_H
 
+// Qt
+#include <QMetaType>
+#include <QString>
+
+// Platform
+#include <xqaiwdeclplat.h>
+
+
+/*!
+    The flags which can be used with the service interfaces.
+*/
+enum EmailServiceInterfaceFlags {
+    EmailNoFlags = 0x0,
+    EmailBackReturnsToMessageList = 0x1
+};
+
+Q_DECLARE_METATYPE(EmailServiceInterfaceFlags)
+
+
 /*!
     Keys for mail send service data.
 */
@@ -28,6 +47,7 @@
 static const QString emailSendBodyTextKey = "body";
 static const QString emailSendAttachmentKey = "attachment";
 
+
 /*!
     Mail service name
 */
@@ -36,12 +56,18 @@
 /*!
     Mail send service interface name.
 */
-static const QString emailInterfaceNameSend = "com.nokia.symbian.IEmailMessageSend";
+static const QString emailFullServiceNameSend = emailServiceName + "." + XQI_EMAIL_MESSAGE_SEND;
 
 /*!
-    Mail send service interface name.
+    Mailbox service full name.
 */
-static const QString emailFullServiceNameSend = emailServiceName + "." + emailInterfaceNameSend;
+static const QString emailFullServiceNameMailbox = emailServiceName + "." + XQI_EMAIL_INBOX_VIEW;
+
+
+/*!
+    Message service full name.
+*/
+static const QString emailFullServiceNameMessage = emailServiceName + "." + XQI_EMAIL_MESSAGE_VIEW;
 
 
 /*!
@@ -67,7 +93,7 @@
         bool syncronous;
 
         XQServiceRequest request(emailFullServiceNameSend,
-                                 emailOperationSendMail,
+                                 XQOP_EMAIL_MESSAGE_SEND,
                                  syncronous);
 
         QMap<QString, QVariant> map;
@@ -87,29 +113,6 @@
         QVariant returnValue;
         bool retVal = request.send(returnValue);
 */
-static const QString emailOperationSendMail = "send(QVariant)";
-
-
-/*!
-    Mailbox service interface name.
-*/
-static const QString emailInterfaceNameMailbox = "com.nokia.symbian.IEmailInboxView";
-
-/*!
-    Mailbox service full name.
-*/
-static const QString emailFullServiceNameMailbox = emailServiceName + "." + emailInterfaceNameMailbox;
-
-
-/*!
-    Message service interface name.
-*/
-static const QString emailInterfaceNameMessage = "com.nokia.symbian.IEmailMessageView";
-
-/*!
-    Message service full name.
-*/
-static const QString emailFullServiceNameMessage = emailServiceName + "." + emailInterfaceNameMessage;
 
 
 /*!
@@ -124,7 +127,7 @@
 
     XQServiceRequest request(
         emailFullServiceNameMailbox,
-        emailOperationViewInbox,
+        XQOP_EMAIL_INBOX_VIEW,
         syncronous);
 
     QList<QVariant> list;
@@ -134,35 +137,57 @@
     QVariant returnValue;
     bool rval = request.send(returnValue);
 */
-static const QString emailOperationViewInbox = "displayInboxByMailboxId(QVariant)";
 
 
 /*!
-    \fn viewMessage(QVariant mailboxId, QVariant folderId, QVariant messageId)
-    \param mailboxId The ID of the mailbox where message is
-    \param folderId The ID of the folder where message is
-    \param messageId The ID of the message to be shown
+    \fn viewMessage(QVariant idList, QVariant flags)
+
+    This method opens the mail viewer view containing the specific message.
+    It is intended to be used via Qt Highway.
+
+
+    \param idList A list containing the required IDs for locating the wanted
+                  message. The ID are the following (and should be placed in
+                  the following order): mailbox ID, folder ID and message ID.
+
+    \param flags The flags which can contain any values defined by
+                 EmailServiceInterfaceFlags enumeration. The only flag
+                 acknowledged by this interface is EmailBackReturnsToMessageList,
+                 which, if given, will add the message list (according to the
+                 given mailbox and folder IDs) into the view stack. This means
+                 that when the back button is pressed from the viewer view, the
+                 message list view will be shown.
+                     
     \return 1 if message was opened. 0 if one of the IDs was incorrect.
 
-    This method opens a view for a specific message.
-    It is intended to be used via Qt Highway.
 
     Usage example:
 
     XQServiceRequest request(
        emailFullServiceNameMessage,
-       emailOperationViewMessage,
-       syncronous);
+       XQOP_EMAIL_MESSAGE_VIEW,
+       synchronous);
+
+    QVariantList idList;
+    idList.append(mailboxId);
+    idList.append(folderId);
+    idList.append(messageId);
+    QVariant idListAsVariant = QVariant::fromValue(idList);
 
-    QList<QVariant> list;
-    list.append(mailboxId);
-    list.append(folderId);
-    list.append(messageId);
-    request.setArguments(list);
+    // Add the message list view into the view stack. If the list view should
+    // not be added into the stack, use "quint64 flags(EmailNoFlags);" instead.
+    quint64 flags(EmailBackReturnsToMessageList);
+
+    QList<QVariant> argumentList;
+    argumentList.append(idListAsVariant);
+    argumentList.append(flags);
+
+    request.setArguments(argumentList);
 
     QVariant returnValue;
+
     bool rval = request.send(returnValue);
 */
-static const QString emailOperationViewMessage = "viewMessage(QVariant,QVariant,QVariant)";
+
 
 #endif // EMAIL_SERVICES_API_H
--- a/email_plat/nmail_settings_api/nmapisettingsmanager.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/email_plat/nmail_settings_api/nmapisettingsmanager.h	Fri Sep 03 14:07:42 2010 +0300
@@ -29,7 +29,7 @@
 {
 public:
     NmApiSettingsManager(const quint64 mailboxId);
-    ~NmApiSettingsManager();
+    virtual ~NmApiSettingsManager();
 
     bool load(quint64 mailboxId, NmApiMailboxSettingsData &data);
     bool save(const NmApiMailboxSettingsData &data);
--- a/emailservices/emailclientapi/src/emailmailbox.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmailbox.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -361,13 +361,16 @@
     {
     bool syncronous;
 
-    XQServiceRequest request( emailInterfaceNameSend,
-                             emailOperationSendMail,
-                             syncronous );
+    XQServiceRequest request( XQI_EMAIL_MESSAGE_SEND,
+                              XQOP_EMAIL_MESSAGE_SEND,
+                              syncronous );
 
     QVariant returnValue;
+
     if ( !request.send( returnValue ) )
+        {
         User::Leave( KErrGeneral );
+        }
     }
 
 // -----------------------------------------------------------------------------
--- a/emailservices/emailclientapi/src/emailmessage.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmessage.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -834,24 +834,45 @@
     {   
     bool syncronous;
 
-    XQServiceRequest request(
-       emailInterfaceNameMessage,
-       emailOperationViewMessage,
-       syncronous );
+    XQServiceRequest request( XQI_EMAIL_MESSAGE_VIEW,
+                              XQOP_EMAIL_MESSAGE_VIEW,
+                              syncronous );
 
     TFSMailMsgId mailboxId = FsMsgId( iPluginData, iMessageId.iFolderId.iMailboxId );
     TFSMailMsgId folderId = FsMsgId( iPluginData, iMessageId.iFolderId );
     TFSMailMsgId messageId = FsMsgId( iPluginData, iMessageId );
 
-    QList<QVariant> list;
-    list.append( mailboxId.Id() );
-    list.append( folderId.Id() );
-    list.append( messageId.Id() );
-    request.setArguments( list );
+    QList<QVariant> idList;
+    idList.append( mailboxId.Id() );
+    idList.append( folderId.Id() );
+    idList.append( messageId.Id() );
+
+    /*
+        Uncomment the following when the viewer service API operation definition
+        (XQOP_EMAIL_MESSAGE_VIEW) has been updated.
+    
+    QVariant idListAsVariant = QVariant::fromValue( idList );
+
+    // Add the message list view into the view stack.
+    quint64 flags( EmailBackReturnsToMessageList );
+
+    QList<QVariant> argumentList;
+    argumentList.append( idListAsVariant );
+    argumentList.append( flags );
+
+    request.setArguments( argumentList );    
+    */
+    
+    // Remove the following line when the viewer service API operation
+    // definition has been updated.
+    request.setArguments( idList );
 
     QVariant returnValue;
+
     if ( !request.send( returnValue ) )
+        {
         User::Leave( KErrGeneral );
+        }
     }
 
 // -----------------------------------------------------------------------------
--- a/emailservices/emailclientapi/src/emailmessagesearch.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmessagesearch.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -284,10 +284,11 @@
 // -----------------------------------------------------------------------------
 TInt CEmailMessageSearchAsync::Status() const
     {
+    TInt ret(KErrNone);
     if (KErrNone != iGate.Wait(1))
         {
         // Search is going on
-        return KRequestPending;
+        ret = KRequestPending;
         }
     else
         {
@@ -295,7 +296,7 @@
         iGate.Signal();       
         }
 
-    return KErrNone; 
+    return ret; 
     }
 
 // -----------------------------------------------------------------------------
--- a/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,16 +1,16 @@
 EXPORTS
 	??1CEmailExtension@@UAE@XZ @ 1 NONAME ; CEmailExtension::~CEmailExtension(void)
-	?GetTempDirL@CFSMailRequestHandler@@QAEAAVTDesC16@@XZ @ 2 NONAME ; class TDesC16 & CFSMailRequestHandler::GetTempDirL(void)
-	?CancelAllRequestsL@CFSMailRequestHandler@@QAEXXZ @ 3 NONAME ; void CFSMailRequestHandler::CancelAllRequestsL(void)
-	?SaveL@CFSMailMessagePart@@QAEXXZ @ 4 NONAME ; void CFSMailMessagePart::SaveL(void)
-	?CreateMessageToSend@CFSMailBox@@QAEPAVCFSMailMessage@@XZ @ 5 NONAME ; class CFSMailMessage * CFSMailBox::CreateMessageToSend(void)
-	?FindExtension@TEmailExtensions@@QBEHABVTUid@@@Z @ 6 NONAME ; int TEmailExtensions::FindExtension(class TUid const &) const
-	?ClearBccRecipients@CFSMailMessageBase@@QAEXXZ @ 7 NONAME ; void CFSMailMessageBase::ClearBccRecipients(void)
-	?SendMessageL@CFSMailBox@@QAEXAAVCFSMailMessage@@@Z @ 8 NONAME ; void CFSMailBox::SendMessageL(class CFSMailMessage &)
-	?RemoveMessageL@CFSMailFolder@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 9 NONAME ; int CFSMailFolder::RemoveMessageL(class TFSMailMsgId, class MFSMailRequestObserver &)
-	?GetStandardFolderId@CFSMailBox@@QAE?AVTFSMailMsgId@@W4TFSFolderType@@@Z @ 10 NONAME ; class TFSMailMsgId CFSMailBox::GetStandardFolderId(enum TFSFolderType)
-	?CancelSearch@CFSMailBox@@QAEXXZ @ 11 NONAME ; void CFSMailBox::CancelSearch(void)
-	?ResetFlag@CFSMailMessageBase@@QAEXH@Z @ 12 NONAME ; void CFSMailMessageBase::ResetFlag(int)
+	?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)
+	?FindExtension@TEmailExtensions@@QBEHABVTUid@@@Z @ 5 NONAME ; int TEmailExtensions::FindExtension(class TUid const &) const
+	?ClearBccRecipients@CFSMailMessageBase@@QAEXXZ @ 6 NONAME ; void CFSMailMessageBase::ClearBccRecipients(void)
+	?SendMessageL@CFSMailBox@@QAEXAAVCFSMailMessage@@@Z @ 7 NONAME ; void CFSMailBox::SendMessageL(class CFSMailMessage &)
+	?RemoveMessageL@CFSMailFolder@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 8 NONAME ; int CFSMailFolder::RemoveMessageL(class TFSMailMsgId, class MFSMailRequestObserver &)
+	?GetStandardFolderId@CFSMailBox@@QAE?AVTFSMailMsgId@@W4TFSFolderType@@@Z @ 9 NONAME ; class TFSMailMsgId CFSMailBox::GetStandardFolderId(enum TFSFolderType)
+	?CancelSearch@CFSMailBox@@QAEXXZ @ 10 NONAME ; void CFSMailBox::CancelSearch(void)
+	?ResetFlag@CFSMailMessageBase@@QAEXH@Z @ 11 NONAME ; void CFSMailMessageBase::ResetFlag(int)
+	?IsMRInfoProcessorSet@CFSMailBoxBase@@QAEHXZ @ 12 NONAME ; int CFSMailBoxBase::IsMRInfoProcessorSet(void)
 	??1CFSMailFolderBase@@UAE@XZ @ 13 NONAME ; CFSMailFolderBase::~CFSMailFolderBase(void)
 	??0TEmailExtensions@@QAE@XZ @ 14 NONAME ; TEmailExtensions::TEmailExtensions(void)
 	?SetFolderType@CFSMailFolderBase@@QAEXW4TFSFolderType@@@Z @ 15 NONAME ; void CFSMailFolderBase::SetFolderType(enum TFSFolderType)
@@ -42,81 +42,81 @@
 	?ConstructL@CFSMailFolderBase@@IAEXVTFSMailMsgId@@@Z @ 41 NONAME ; void CFSMailFolderBase::ConstructL(class TFSMailMsgId)
 	?SetSubject@CFSMailMessageBase@@QAEXABVTDesC16@@@Z @ 42 NONAME ; void CFSMailMessageBase::SetSubject(class TDesC16 const &)
 	?CreateReplyMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@HABVTDesC16@@@Z @ 43 NONAME ; class CFSMailMessage * CFSMailBox::CreateReplyMessage(class TFSMailMsgId, int, class TDesC16 const &)
-	??1CFSMailBoxBase@@UAE@XZ @ 44 NONAME ; CFSMailBoxBase::~CFSMailBoxBase(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
-	?ConstructL@CFSMailMessageBase@@IAEXABVNmMessageEnvelope@@@Z @ 47 NONAME ; void CFSMailMessageBase::ConstructL(class NmMessageEnvelope const &)
-	?ReleaseExtension@CFSMailMessageBase@@UAEXPAVCEmailExtension@@@Z @ 48 NONAME ; void CFSMailMessageBase::ReleaseExtension(class CEmailExtension *)
-	??_ECFSMailRequestHandler@@UAE@I@Z @ 49 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(unsigned int)
-	?NewLC@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 50 NONAME ; class CFSMailFolder * CFSMailFolder::NewLC(class TFSMailMsgId)
-	?NewL@CFSMailAddress@@SAPAV1@XZ @ 51 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(void)
-	?IsMessageL@CFSMailMessagePart@@UBEHXZ @ 52 NONAME ; int CFSMailMessagePart::IsMessageL(void) const
-	?Uid@CEmailExtension@@QBE?AVTUid@@XZ @ 53 NONAME ; class TUid CEmailExtension::Uid(void) const
-	?GetNmMessage@CFSMailMessage@@QAEPAVNmMessage@@XZ @ 54 NONAME ; class NmMessage * CFSMailMessage::GetNmMessage(void)
-	?GetContentToBufferL@CFSMailMessagePart@@QAEXAAVTDes16@@I@Z @ 55 NONAME ; void CFSMailMessagePart::GetContentToBufferL(class TDes16 &, unsigned int)
-	?AddNewAttachmentL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@VTFSMailMsgId@@0@Z @ 56 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId, class TDesC16 const &)
-	?BlockCopyFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 57 NONAME ; void CFSMailFolderBase::BlockCopyFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?GetSender@CFSMailMessageBase@@QBEPAVCFSMailAddress@@XZ @ 58 NONAME ; class CFSMailAddress * CFSMailMessageBase::GetSender(void) const
-	?ClearSearchResultCache@CFSMailBox@@QAEXXZ @ 59 NONAME ; void CFSMailBox::ClearSearchResultCache(void)
-	?CancelRequestL@CFSMailRequestHandler@@QAEXH@Z @ 60 NONAME ; void CFSMailRequestHandler::CancelRequestL(int)
-	?ExtensionL@CFSMailBox@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 61 NONAME ; class CEmailExtension * CFSMailBox::ExtensionL(class TUid const &)
-	?GetMailBoxId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 62 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMailBoxId(void) const
-	?ExtensionL@CExtendableEmail@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 63 NONAME ; class CEmailExtension * CExtendableEmail::ExtensionL(class TUid const &)
-	?ListFolders@CFSMailBox@@QAEXVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 64 NONAME ; void CFSMailBox::ListFolders(class TFSMailMsgId, class RPointerArray<class CFSMailFolder> &)
-	?NewL@CFSMailMessage@@SAPAV1@ABVNmMessage@@@Z @ 65 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class NmMessage const &)
-	?HtmlBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 66 NONAME ; class CFSMailMessagePart * CFSMailMessage::HtmlBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?ContentDescription@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 67 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDescription(void)
-	?SendMessageL@CFSMailBox@@QAEHAAVCFSMailMessage@@AAVMFSMailRequestObserver@@@Z @ 68 NONAME ; int CFSMailBox::SendMessageL(class CFSMailMessage &, class MFSMailRequestObserver &)
-	?GetFolderType@CFSMailFolderBase@@QBE?AW4TFSFolderType@@XZ @ 69 NONAME ; enum TFSFolderType CFSMailFolderBase::GetFolderType(void) const
-	?GetEmailAddress@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 70 NONAME ; class TDesC16 & CFSMailAddress::GetEmailAddress(void) const
-	?FSMailSortCriteria2NM@NmConverter@@SA?AVNmMailSortCriteria@@VTFSMailSortCriteria@@@Z @ 71 NONAME ; class NmMailSortCriteria NmConverter::FSMailSortCriteria2NM(class TFSMailSortCriteria)
-	?NewL@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 72 NONAME ; class CFSMailBox * CFSMailBox::NewL(class TFSMailMsgId)
-	?CreateMessageToSendL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 73 NONAME ; int CFSMailBox::CreateMessageToSendL(class MFSMailRequestObserver &)
-	?FetchMessagesL@CFSMailFolder@@QAEHABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@@Z @ 74 NONAME ; int CFSMailFolder::FetchMessagesL(class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &)
-	?ContentID@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 75 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentID(void)
-	?RemoveChildPartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 76 NONAME ; int CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId, class MFSMailRequestObserver &)
-	??1CFSMailFolder@@UAE@XZ @ 77 NONAME ; CFSMailFolder::~CFSMailFolder(void)
-	?toQDateTime@NmConverter@@SA?AVQDateTime@@ABVTTime@@@Z @ 78 NONAME ; class QDateTime NmConverter::toQDateTime(class TTime const &)
-	?GetContentFileL@CFSMailMessagePart@@QAE?AVRFile@@XZ @ 79 NONAME ; class RFile CFSMailMessagePart::GetContentFileL(void)
-	?AddNewAttachmentL@CFSMailMessage@@QAEHABVTDesC16@@AAVMFSMailRequestObserver@@@Z @ 80 NONAME ; int CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class MFSMailRequestObserver &)
-	?AppendBCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 81 NONAME ; void CFSMailMessageBase::AppendBCCRecipient(class CFSMailAddress *)
-	?ExtensionL@CFSMailFolder@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 82 NONAME ; class CEmailExtension * CFSMailFolder::ExtensionL(class TUid const &)
-	?IsMRInfoSet@CFSMailMessagePart@@QAEHXZ @ 83 NONAME ; int CFSMailMessagePart::IsMRInfoSet(void)
-	??1CFSMailIterator@@UAE@XZ @ 84 NONAME ; CFSMailIterator::~CFSMailIterator(void)
-	?GetNmMailbox@CFSMailBoxBase@@QAEPAVNmMailbox@@XZ @ 85 NONAME ; class NmMailbox * CFSMailBoxBase::GetNmMailbox(void)
-	?SetContentClass@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 86 NONAME ; void CFSMailMessagePart::SetContentClass(class TDesC16 const &)
-	?GetNmFolder@CFSMailFolderBase@@QAEPAVNmFolder@@XZ @ 87 NONAME ; class NmFolder * CFSMailFolderBase::GetNmFolder(void)
-	?GetFolderId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 88 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetFolderId(void) const
-	?ReadOnlyPartSize@CFSMailMessagePart@@QBEIXZ @ 89 NONAME ; unsigned int CFSMailMessagePart::ReadOnlyPartSize(void) const
-	?BlockMoveFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 90 NONAME ; void CFSMailFolderBase::BlockMoveFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?ContentDisposition@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 91 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDisposition(void)
-	?CreateReplyMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@HAAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 92 NONAME ; int CFSMailBox::CreateReplyMessageL(class TFSMailMsgId, int, class MFSMailRequestObserver &, class TDesC16 const &)
-	?NewLC@CFSMailAddress@@SAPAV1@XZ @ 93 NONAME ; class CFSMailAddress * CFSMailAddress::NewLC(void)
-	?NewL@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 94 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewL(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
-	?ChildPartsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@W4TFSMailMessagePartDataSource@1@@Z @ 95 NONAME ; void CFSMailMessagePart::ChildPartsL(class RPointerArray<class CFSMailMessagePart> &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?SetDisplayName@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 96 NONAME ; void CFSMailAddress::SetDisplayName(class TDesC16 const &)
-	?toTTime@NmConverter@@SA?AVTTime@@ABVQDateTime@@@Z @ 97 NONAME ; class TTime NmConverter::toTTime(class QDateTime const &)
-	?SetMailBoxId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 98 NONAME ; void CFSMailMessageBase::SetMailBoxId(class TFSMailMsgId)
-	?RequestHandler@CFSMailMessageBase@@QAEAAVCFSMailRequestHandler@@XZ @ 99 NONAME ; class CFSMailRequestHandler & CFSMailMessageBase::RequestHandler(void)
-	?ReleaseExtension@CFSMailFolder@@UAEXPAVCEmailExtension@@@Z @ 100 NONAME ; void CFSMailFolder::ReleaseExtension(class CEmailExtension *)
-	?GetFlags@CFSMailMessageBase@@QBEHXZ @ 101 NONAME ; int CFSMailMessageBase::GetFlags(void) const
-	?nmIdToMailMsgId@NmConverter@@SA?AVTFSMailMsgId@@VNmId@@@Z @ 102 NONAME ; class TFSMailMsgId NmConverter::nmIdToMailMsgId(class NmId)
-	?CopyMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@AAV2@VTFSMailMsgId@@2@Z @ 103 NONAME ; void CFSMailBox::CopyMessagesL(class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId, class TFSMailMsgId)
-	?ClearToRecipients@CFSMailMessageBase@@QAEXXZ @ 104 NONAME ; void CFSMailMessageBase::ClearToRecipients(void)
-	?ReleaseExtension@CExtendableEmail@@UAEXPAVCEmailExtension@@@Z @ 105 NONAME ; void CExtendableEmail::ReleaseExtension(class CEmailExtension *)
-	?ChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@@Z @ 106 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::ChildPartL(class TFSMailMsgId)
-	?GetId@CFSMailBoxBase@@QBE?AVTFSMailMsgId@@XZ @ 107 NONAME ; class TFSMailMsgId CFSMailBoxBase::GetId(void) const
-	?PreviousL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 108 NONAME ; int CFSMailIterator::PreviousL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?RefreshNowL@CFSMailBox@@QAEHXZ @ 109 NONAME ; int CFSMailBox::RefreshNowL(void)
-	?CancelSyncL@CFSMailBox@@QAEXXZ @ 110 NONAME ; void CFSMailBox::CancelSyncL(void)
-	?ContentDispositionParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 111 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentDispositionParameters(void)
-	?ListFolders@CFSMailBox@@QAEAAV?$RPointerArray@VCFSMailFolder@@@@XZ @ 112 NONAME ; class RPointerArray<class CFSMailFolder> & CFSMailBox::ListFolders(void)
-	??1CFSMailMessage@@UAE@XZ @ 113 NONAME ; CFSMailMessage::~CFSMailMessage(void)
-	?PlainTextBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 114 NONAME ; class CFSMailMessagePart * CFSMailMessage::PlainTextBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	??0CExtendableEmail@@IAE@XZ @ 115 NONAME ; CExtendableEmail::CExtendableEmail(void)
-	?SetName@CFSMailBoxBase@@QAEXABVTDesC16@@@Z @ 116 NONAME ; void CFSMailBoxBase::SetName(class TDesC16 const &)
-	?GoOfflineL@CFSMailBox@@QAEXXZ @ 117 NONAME ; void CFSMailBox::GoOfflineL(void)
-	?CleanTempDirL@CFSMailRequestHandler@@QAEXXZ @ 118 NONAME ; void CFSMailRequestHandler::CleanTempDirL(void)
+	?CopyContentFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 44 NONAME ; void CFSMailMessagePart::CopyContentFileL(class TDesC16 const &)
+	??1CFSMailBoxBase@@UAE@XZ @ 45 NONAME ; CFSMailBoxBase::~CFSMailBoxBase(void)
+	?NewLC@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 46 NONAME ; class CFSMailBox * CFSMailBox::NewLC(class TFSMailMsgId)
+	?GetParentFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 47 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetParentFolderId(void) const
+	?ConstructL@CFSMailMessageBase@@IAEXABVNmMessageEnvelope@@@Z @ 48 NONAME ; void CFSMailMessageBase::ConstructL(class NmMessageEnvelope const &)
+	?ReleaseExtension@CFSMailMessageBase@@UAEXPAVCEmailExtension@@@Z @ 49 NONAME ; void CFSMailMessageBase::ReleaseExtension(class CEmailExtension *)
+	??_ECFSMailRequestHandler@@UAE@I@Z @ 50 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(unsigned int)
+	?NewLC@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 51 NONAME ; class CFSMailFolder * CFSMailFolder::NewLC(class TFSMailMsgId)
+	?NewL@CFSMailAddress@@SAPAV1@XZ @ 52 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(void)
+	?IsMessageL@CFSMailMessagePart@@UBEHXZ @ 53 NONAME ; int CFSMailMessagePart::IsMessageL(void) const
+	?Uid@CEmailExtension@@QBE?AVTUid@@XZ @ 54 NONAME ; class TUid CEmailExtension::Uid(void) const
+	?GetNmMessage@CFSMailMessage@@QAEPAVNmMessage@@XZ @ 55 NONAME ; class NmMessage * CFSMailMessage::GetNmMessage(void)
+	?GetContentToBufferL@CFSMailMessagePart@@QAEXAAVTDes16@@I@Z @ 56 NONAME ; void CFSMailMessagePart::GetContentToBufferL(class TDes16 &, unsigned int)
+	?AddNewAttachmentL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@VTFSMailMsgId@@0@Z @ 57 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId, class TDesC16 const &)
+	?BlockCopyFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 58 NONAME ; void CFSMailFolderBase::BlockCopyFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
+	?GetSender@CFSMailMessageBase@@QBEPAVCFSMailAddress@@XZ @ 59 NONAME ; class CFSMailAddress * CFSMailMessageBase::GetSender(void) const
+	?ClearSearchResultCache@CFSMailBox@@QAEXXZ @ 60 NONAME ; void CFSMailBox::ClearSearchResultCache(void)
+	?CancelRequestL@CFSMailRequestHandler@@QAEXH@Z @ 61 NONAME ; void CFSMailRequestHandler::CancelRequestL(int)
+	?ExtensionL@CFSMailBox@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 62 NONAME ; class CEmailExtension * CFSMailBox::ExtensionL(class TUid const &)
+	?GetMailBoxId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 63 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMailBoxId(void) const
+	?ExtensionL@CExtendableEmail@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 64 NONAME ; class CEmailExtension * CExtendableEmail::ExtensionL(class TUid const &)
+	?ListFolders@CFSMailBox@@QAEXVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 65 NONAME ; void CFSMailBox::ListFolders(class TFSMailMsgId, class RPointerArray<class CFSMailFolder> &)
+	?NewL@CFSMailMessage@@SAPAV1@ABVNmMessage@@@Z @ 66 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class NmMessage const &)
+	?HtmlBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 67 NONAME ; class CFSMailMessagePart * CFSMailMessage::HtmlBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	?ContentDescription@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 68 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDescription(void)
+	?SendMessageL@CFSMailBox@@QAEHAAVCFSMailMessage@@AAVMFSMailRequestObserver@@@Z @ 69 NONAME ; int CFSMailBox::SendMessageL(class CFSMailMessage &, class MFSMailRequestObserver &)
+	?GetFolderType@CFSMailFolderBase@@QBE?AW4TFSFolderType@@XZ @ 70 NONAME ; enum TFSFolderType CFSMailFolderBase::GetFolderType(void) const
+	?GetEmailAddress@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 71 NONAME ; class TDesC16 & CFSMailAddress::GetEmailAddress(void) const
+	?FSMailSortCriteria2NM@NmConverter@@SA?AVNmMailSortCriteria@@VTFSMailSortCriteria@@@Z @ 72 NONAME ; class NmMailSortCriteria NmConverter::FSMailSortCriteria2NM(class TFSMailSortCriteria)
+	?NewL@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 73 NONAME ; class CFSMailBox * CFSMailBox::NewL(class TFSMailMsgId)
+	?CreateMessageToSendL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 74 NONAME ; int CFSMailBox::CreateMessageToSendL(class MFSMailRequestObserver &)
+	?FetchMessagesL@CFSMailFolder@@QAEHABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@@Z @ 75 NONAME ; int CFSMailFolder::FetchMessagesL(class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &)
+	?ContentID@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 76 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentID(void)
+	?RemoveChildPartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 77 NONAME ; int CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId, class MFSMailRequestObserver &)
+	??1CFSMailFolder@@UAE@XZ @ 78 NONAME ; CFSMailFolder::~CFSMailFolder(void)
+	?toQDateTime@NmConverter@@SA?AVQDateTime@@ABVTTime@@@Z @ 79 NONAME ; class QDateTime NmConverter::toQDateTime(class TTime const &)
+	?GetContentFileL@CFSMailMessagePart@@QAE?AVRFile@@XZ @ 80 NONAME ; class RFile CFSMailMessagePart::GetContentFileL(void)
+	?AddNewAttachmentL@CFSMailMessage@@QAEHABVTDesC16@@AAVMFSMailRequestObserver@@@Z @ 81 NONAME ; int CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class MFSMailRequestObserver &)
+	?AppendBCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 82 NONAME ; void CFSMailMessageBase::AppendBCCRecipient(class CFSMailAddress *)
+	?ExtensionL@CFSMailFolder@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 83 NONAME ; class CEmailExtension * CFSMailFolder::ExtensionL(class TUid const &)
+	?IsMRInfoSet@CFSMailMessagePart@@QAEHXZ @ 84 NONAME ; int CFSMailMessagePart::IsMRInfoSet(void)
+	??1CFSMailIterator@@UAE@XZ @ 85 NONAME ; CFSMailIterator::~CFSMailIterator(void)
+	?GetNmMailbox@CFSMailBoxBase@@QAEPAVNmMailbox@@XZ @ 86 NONAME ; class NmMailbox * CFSMailBoxBase::GetNmMailbox(void)
+	?SetContentClass@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 87 NONAME ; void CFSMailMessagePart::SetContentClass(class TDesC16 const &)
+	?GetNmFolder@CFSMailFolderBase@@QAEPAVNmFolder@@XZ @ 88 NONAME ; class NmFolder * CFSMailFolderBase::GetNmFolder(void)
+	?GetFolderId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 89 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetFolderId(void) const
+	?ReadOnlyPartSize@CFSMailMessagePart@@QBEIXZ @ 90 NONAME ; unsigned int CFSMailMessagePart::ReadOnlyPartSize(void) const
+	?BlockMoveFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 91 NONAME ; void CFSMailFolderBase::BlockMoveFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
+	?ContentDisposition@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 92 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDisposition(void)
+	?CreateReplyMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@HAAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 93 NONAME ; int CFSMailBox::CreateReplyMessageL(class TFSMailMsgId, int, class MFSMailRequestObserver &, class TDesC16 const &)
+	?NewLC@CFSMailAddress@@SAPAV1@XZ @ 94 NONAME ; class CFSMailAddress * CFSMailAddress::NewLC(void)
+	?NewL@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 95 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewL(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
+	?FetchLoadState@CFSMailMessagePart@@QBE?AW4TFSPartFetchState@@XZ @ 96 NONAME ; enum TFSPartFetchState CFSMailMessagePart::FetchLoadState(void) const
+	?ChildPartsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@W4TFSMailMessagePartDataSource@1@@Z @ 97 NONAME ; void CFSMailMessagePart::ChildPartsL(class RPointerArray<class CFSMailMessagePart> &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	?SetDisplayName@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 98 NONAME ; void CFSMailAddress::SetDisplayName(class TDesC16 const &)
+	?toTTime@NmConverter@@SA?AVTTime@@ABVQDateTime@@@Z @ 99 NONAME ; class TTime NmConverter::toTTime(class QDateTime const &)
+	?SetMailBoxId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 100 NONAME ; void CFSMailMessageBase::SetMailBoxId(class TFSMailMsgId)
+	?RequestHandler@CFSMailMessageBase@@QAEAAVCFSMailRequestHandler@@XZ @ 101 NONAME ; class CFSMailRequestHandler & CFSMailMessageBase::RequestHandler(void)
+	?ReleaseExtension@CFSMailFolder@@UAEXPAVCEmailExtension@@@Z @ 102 NONAME ; void CFSMailFolder::ReleaseExtension(class CEmailExtension *)
+	?GetFlags@CFSMailMessageBase@@QBEHXZ @ 103 NONAME ; int CFSMailMessageBase::GetFlags(void) const
+	?nmIdToMailMsgId@NmConverter@@SA?AVTFSMailMsgId@@VNmId@@@Z @ 104 NONAME ; class TFSMailMsgId NmConverter::nmIdToMailMsgId(class NmId)
+	?CopyMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@AAV2@VTFSMailMsgId@@2@Z @ 105 NONAME ; void CFSMailBox::CopyMessagesL(class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId, class TFSMailMsgId)
+	?ClearToRecipients@CFSMailMessageBase@@QAEXXZ @ 106 NONAME ; void CFSMailMessageBase::ClearToRecipients(void)
+	?ReleaseExtension@CExtendableEmail@@UAEXPAVCEmailExtension@@@Z @ 107 NONAME ; void CExtendableEmail::ReleaseExtension(class CEmailExtension *)
+	?ChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@@Z @ 108 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::ChildPartL(class TFSMailMsgId)
+	?GetId@CFSMailBoxBase@@QBE?AVTFSMailMsgId@@XZ @ 109 NONAME ; class TFSMailMsgId CFSMailBoxBase::GetId(void) const
+	?PreviousL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 110 NONAME ; int CFSMailIterator::PreviousL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?RefreshNowL@CFSMailBox@@QAEHXZ @ 111 NONAME ; int CFSMailBox::RefreshNowL(void)
+	?ContentDispositionParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 112 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentDispositionParameters(void)
+	?ListFolders@CFSMailBox@@QAEAAV?$RPointerArray@VCFSMailFolder@@@@XZ @ 113 NONAME ; class RPointerArray<class CFSMailFolder> & CFSMailBox::ListFolders(void)
+	??1CFSMailMessage@@UAE@XZ @ 114 NONAME ; CFSMailMessage::~CFSMailMessage(void)
+	?PlainTextBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 115 NONAME ; class CFSMailMessagePart * CFSMailMessage::PlainTextBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
+	??0CExtendableEmail@@IAE@XZ @ 116 NONAME ; CExtendableEmail::CExtendableEmail(void)
+	?SetName@CFSMailBoxBase@@QAEXABVTDesC16@@@Z @ 117 NONAME ; void CFSMailBoxBase::SetName(class TDesC16 const &)
+	?GoOfflineL@CFSMailBox@@QAEXXZ @ 118 NONAME ; void CFSMailBox::GoOfflineL(void)
 	?SupportsMoveFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 119 NONAME ; int CFSMailFolder::SupportsMoveFromL(enum TFSFolderType)
 	?NewChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@ABVTDesC16@@@Z @ 120 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewChildPartL(class TFSMailMsgId, class TDesC16 const &)
 	?toRPointerArray@NmConverter@@SA?AV?$RPointerArray@VCFSMailAddress@@@@ABV?$QList@VNmAddress@@@@@Z @ 121 NONAME ; class RPointerArray<class CFSMailAddress> NmConverter::toRPointerArray(class QList<class NmAddress> const &)
@@ -133,47 +133,47 @@
 	?CreateForwardMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@ABVTDesC16@@@Z @ 132 NONAME ; class CFSMailMessage * CFSMailBox::CreateForwardMessage(class TFSMailMsgId, class TDesC16 const &)
 	?SetContentIDL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 133 NONAME ; void CFSMailMessagePart::SetContentIDL(class TDesC16 const &)
 	?NewLC@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 134 NONAME ; class CFSMailMessage * CFSMailMessage::NewLC(class TFSMailMsgId)
-	?NewL@CFSMailAddress@@SAPAV1@ABVNmAddress@@@Z @ 135 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(class NmAddress const &)
-	?GetUnreadCount@CFSMailFolderBase@@QBEIXZ @ 136 NONAME ; unsigned int CFSMailFolderBase::GetUnreadCount(void) const
-	?SetSender@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 137 NONAME ; void CFSMailMessageBase::SetSender(class CFSMailAddress *)
-	?FindBodyPartL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@W4TFSMailMessagePartDataSource@1@@Z @ 138 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::FindBodyPartL(class TDesC16 const &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?CreateForwardMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 139 NONAME ; int CFSMailBox::CreateForwardMessageL(class TFSMailMsgId, class MFSMailRequestObserver &, class TDesC16 const &)
-	?GetTempFileL@CFSMailRequestHandler@@QAE?AVRFile@@VTFSMailMsgId@@V?$TBuf@$0BAA@@@@Z @ 140 NONAME ; class RFile CFSMailRequestHandler::GetTempFileL(class TFSMailMsgId, class TBuf<256>)
-	?SetMailBoxId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 141 NONAME ; void CFSMailFolderBase::SetMailBoxId(class TFSMailMsgId)
-	?OwnMailAddress@CFSMailBoxBase@@QAEAAVCFSMailAddress@@XZ @ 142 NONAME ; class CFSMailAddress & CFSMailBoxBase::OwnMailAddress(void)
-	?SetContent@CFSMailMessagePart@@QAEXAAVTDes16@@@Z @ 143 NONAME ; void CFSMailMessagePart::SetContent(class TDes16 &)
-	?RemoveMessageL@CFSMailFolder@@QAEXVTFSMailMsgId@@@Z @ 144 NONAME ; void CFSMailFolder::RemoveMessageL(class TFSMailMsgId)
-	?NewLC@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 145 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewLC(class TFSMailMsgId)
-	?CompleteRequest@CFSMailRequestHandler@@QAEXH@Z @ 146 NONAME ; void CFSMailRequestHandler::CompleteRequest(int)
-	?GetFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 147 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetFolderId(void) const
-	?SetMRInfo@CFSMailMessagePart@@QAEXPAVMMRInfoObject@@@Z @ 148 NONAME ; void CFSMailMessagePart::SetMRInfo(class MMRInfoObject *)
-	??0CFSMailRequestHandler@@IAE@XZ @ 149 NONAME ; CFSMailRequestHandler::CFSMailRequestHandler(void)
-	?GoOnlineL@CFSMailBox@@QAEXXZ @ 150 NONAME ; void CFSMailBox::GoOnlineL(void)
-	?SetMessageCount@CFSMailFolderBase@@QAEXI@Z @ 151 NONAME ; void CFSMailFolderBase::SetMessageCount(unsigned int)
-	?NewLC@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 152 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class TFSMailMsgId, class TFSMailMsgId)
-	??1CFSMailMessagePart@@UAE@XZ @ 153 NONAME ; CFSMailMessagePart::~CFSMailMessagePart(void)
-	?NewLC@CFSMailMessagePart@@SAPAV1@ABVNmId@@ABVNmMessagePart@@@Z @ 154 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class NmId const &, class NmMessagePart const &)
-	??1TEmailExtensions@@QAE@XZ @ 155 NONAME ; TEmailExtensions::~TEmailExtensions(void)
-	?ContentTypeParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 156 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentTypeParameters(void)
-	?GetNmMessagePart@CFSMailMessagePart@@QAEPAVNmMessagePart@@XZ @ 157 NONAME ; class NmMessagePart * CFSMailMessagePart::GetNmMessagePart(void)
-	??1CFSMailAddress@@UAE@XZ @ 158 NONAME ; CFSMailAddress::~CFSMailAddress(void)
-	?SetParentFolderId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 159 NONAME ; void CFSMailFolderBase::SetParentFolderId(class TFSMailMsgId)
-	?AttachmentNameL@CFSMailMessagePart@@QAEAAVTDesC16@@XZ @ 160 NONAME ; class TDesC16 & CFSMailMessagePart::AttachmentNameL(void)
-	?GetToRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 161 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetToRecipients(void)
-	?SetContentDescription@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 162 NONAME ; void CFSMailMessagePart::SetContentDescription(class TDesC16 const &)
-	?NMMailSortCriteria2FS@NmConverter@@SA?AVTFSMailSortCriteria@@VNmMailSortCriteria@@@Z @ 163 NONAME ; class TFSMailSortCriteria NmConverter::NMMailSortCriteria2FS(class NmMailSortCriteria)
-	?GetContentClass@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 164 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentClass(void)
-	?GetContentType@CFSMailMessagePart@@QBEABVTDesC16@@XZ @ 165 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentType(void) const
-	?SetOwnMailAddressL@CFSMailBoxBase@@QAEXPAVCFSMailAddress@@@Z @ 166 NONAME ; void CFSMailBoxBase::SetOwnMailAddressL(class CFSMailAddress *)
-	?GetPluginByUid@CFSMailRequestHandler@@QAEPAVCFSMailPlugin@@VTFSMailMsgId@@@Z @ 167 NONAME ; class CFSMailPlugin * CFSMailRequestHandler::GetPluginByUid(class TFSMailMsgId)
-	?GetSubFolderCount@CFSMailFolderBase@@QBEIXZ @ 168 NONAME ; unsigned int CFSMailFolderBase::GetSubFolderCount(void) const
-	?SetMRInfoProcessorL@CFSMailBoxBase@@QAEXPAVMMRInfoProcessor@@@Z @ 169 NONAME ; void CFSMailBoxBase::SetMRInfoProcessorL(class MMRInfoProcessor *)
-	?FetchMessagePartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@I@Z @ 170 NONAME ; int CFSMailMessagePart::FetchMessagePartL(class TFSMailMsgId, class MFSMailRequestObserver &, unsigned int)
-	?ContentSize@CFSMailMessagePart@@QBEIXZ @ 171 NONAME ; unsigned int CFSMailMessagePart::ContentSize(void) const
-	?InitAsyncRequestL@CFSMailRequestHandler@@QAE?AVTFSPendingRequest@@VTUid@@AAVMFSMailRequestObserver@@@Z @ 172 NONAME ; class TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL(class TUid, class MFSMailRequestObserver &)
-	?toQString@NmConverter@@SA?AVQString@@ABVTDesC16@@@Z @ 173 NONAME ; class QString NmConverter::toQString(class TDesC16 const &)
-	?GetNmAddress@CFSMailAddress@@QAE?AVNmAddress@@XZ @ 174 NONAME ; class NmAddress CFSMailAddress::GetNmAddress(void)
-	?GetBrandingIdL@CFSMailBox@@QAEAAVTDesC16@@XZ @ 175 NONAME ; class TDesC16 & CFSMailBox::GetBrandingIdL(void)
+	?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)
+	?SetContent@CFSMailMessagePart@@QAEXAAVTDes16@@@Z @ 144 NONAME ; void CFSMailMessagePart::SetContent(class TDes16 &)
+	?RemoveMessageL@CFSMailFolder@@QAEXVTFSMailMsgId@@@Z @ 145 NONAME ; void CFSMailFolder::RemoveMessageL(class TFSMailMsgId)
+	?NewLC@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 146 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewLC(class TFSMailMsgId)
+	?CompleteRequest@CFSMailRequestHandler@@QAEXH@Z @ 147 NONAME ; void CFSMailRequestHandler::CompleteRequest(int)
+	?GetFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 148 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetFolderId(void) const
+	?SetMRInfo@CFSMailMessagePart@@QAEXPAVMMRInfoObject@@@Z @ 149 NONAME ; void CFSMailMessagePart::SetMRInfo(class MMRInfoObject *)
+	??0CFSMailRequestHandler@@IAE@XZ @ 150 NONAME ; CFSMailRequestHandler::CFSMailRequestHandler(void)
+	?GoOnlineL@CFSMailBox@@QAEXXZ @ 151 NONAME ; void CFSMailBox::GoOnlineL(void)
+	?SetMessageCount@CFSMailFolderBase@@QAEXI@Z @ 152 NONAME ; void CFSMailFolderBase::SetMessageCount(unsigned int)
+	?NewLC@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 153 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class TFSMailMsgId, class TFSMailMsgId)
+	??1CFSMailMessagePart@@UAE@XZ @ 154 NONAME ; CFSMailMessagePart::~CFSMailMessagePart(void)
+	?NewLC@CFSMailMessagePart@@SAPAV1@ABVNmId@@ABVNmMessagePart@@@Z @ 155 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class NmId const &, class NmMessagePart const &)
+	??1TEmailExtensions@@QAE@XZ @ 156 NONAME ; TEmailExtensions::~TEmailExtensions(void)
+	?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 &)
+	?GetNmAddress@CFSMailAddress@@QAE?AVNmAddress@@XZ @ 175 NONAME ; class NmAddress CFSMailAddress::GetNmAddress(void)
 	?NewLC@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 176 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewLC(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
 	?NewL@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 177 NONAME ; class CFSMailFolder * CFSMailFolder::NewL(class TFSMailMsgId)
 	?SetFetchedContentSize@CFSMailMessagePart@@QAEXI@Z @ 178 NONAME ; void CFSMailMessagePart::SetFetchedContentSize(unsigned int)
@@ -198,38 +198,37 @@
 	?NewL@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 197 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class TFSMailMsgId)
 	?mailMsgIdToNmId@NmConverter@@SA?AVNmId@@VTFSMailMsgId@@@Z @ 198 NONAME ; class NmId NmConverter::mailMsgIdToNmId(class TFSMailMsgId)
 	?SetEmailAddress@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 199 NONAME ; void CFSMailAddress::SetEmailAddress(class TDesC16 const &)
-	?GetLastSyncStatusL@CFSMailBox@@QAE?AVTFSProgress@@XZ @ 200 NONAME ; class TFSProgress CFSMailBox::GetLastSyncStatusL(void)
-	?NextL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 201 NONAME ; int CFSMailIterator::NextL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?SetUnreadCount@CFSMailFolderBase@@QAEXI@Z @ 202 NONAME ; void CFSMailFolderBase::SetUnreadCount(unsigned int)
-	?SetRCLInfo@CFSMailBoxBase@@QAEXVTUid@@I@Z @ 203 NONAME ; void CFSMailBoxBase::SetRCLInfo(class TUid, unsigned int)
-	??1CExtendableEmail@@UAE@XZ @ 204 NONAME ; CExtendableEmail::~CExtendableEmail(void)
-	?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 *)
-	?GetMessageId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 208 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMessageId(void) const
-	?GetSubject@CFSMailMessageBase@@QBEAAVTDesC16@@XZ @ 209 NONAME ; class TDesC16 & CFSMailMessageBase::GetSubject(void) const
-	?NewL@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 210 NONAME ; class CFSMailIterator * CFSMailIterator::NewL(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?RefreshNowL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 211 NONAME ; int CFSMailBox::RefreshNowL(class MFSMailRequestObserver &)
-	?Extension@TEmailExtensions@@QBEPAVCEmailExtension@@H@Z @ 212 NONAME ; class CEmailExtension * TEmailExtensions::Extension(int) const
-	??1CFSMailRequestHandler@@UAE@XZ @ 213 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(void)
-	?DecRef@CEmailExtension@@QAEIXZ @ 214 NONAME ; unsigned int CEmailExtension::DecRef(void)
-	?SetSubFolderCount@CFSMailFolderBase@@QAEXI@Z @ 215 NONAME ; void CFSMailFolderBase::SetSubFolderCount(unsigned int)
-	?AddL@TEmailExtensions@@QAEXPAVCEmailExtension@@@Z @ 216 NONAME ; void TEmailExtensions::AddL(class CEmailExtension *)
-	?ClearCcRecipients@CFSMailMessageBase@@QAEXXZ @ 217 NONAME ; void CFSMailMessageBase::ClearCcRecipients(void)
-	?GetPartId@CFSMailMessagePart@@QBE?AVTFSMailMsgId@@XZ @ 218 NONAME ; class TFSMailMsgId CFSMailMessagePart::GetPartId(void) const
-	?ExtensionL@CFSMailMessageBase@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 219 NONAME ; class CEmailExtension * CFSMailMessageBase::ExtensionL(class TUid const &)
-	?GetReplyToAddress@CFSMailMessageBase@@QAEABVCFSMailAddress@@XZ @ 220 NONAME ; class CFSMailAddress const & CFSMailMessageBase::GetReplyToAddress(void)
-	?IncRef@CEmailExtension@@QAEXXZ @ 221 NONAME ; void CEmailExtension::IncRef(void)
-	?GetMailBoxId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 222 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetMailBoxId(void) const
-	??1CFSMailBox@@UAE@XZ @ 223 NONAME ; CFSMailBox::~CFSMailBox(void)
-	?FetchedContentSize@CFSMailMessagePart@@QBEIXZ @ 224 NONAME ; unsigned int CFSMailMessagePart::FetchedContentSize(void) const
-	?GetSubFoldersL@CFSMailFolder@@QAEXAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 225 NONAME ; void CFSMailFolder::GetSubFoldersL(class RPointerArray<class CFSMailFolder> &)
-	?SetFlag@CFSMailMessageBase@@QAEXH@Z @ 226 NONAME ; void CFSMailMessageBase::SetFlag(int)
-	?ConstructL@CFSMailRequestHandler@@IAEXV?$RPointerArray@VCImplementationInformation@@@@V?$RPointerArray@VCFSMailPlugin@@@@@Z @ 227 NONAME ; void CFSMailRequestHandler::ConstructL(class RPointerArray<class CImplementationInformation>, class RPointerArray<class CFSMailPlugin>)
-	?NewLC@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 228 NONAME ; class CFSMailIterator * CFSMailIterator::NewLC(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?MoveMessagesL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@ABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@2@Z @ 229 NONAME ; int CFSMailBox::MoveMessagesL(class MFSMailRequestObserver &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
-	??_ECEmailExtension@@UAE@I@Z @ 230 NONAME ; CEmailExtension::~CEmailExtension(unsigned int)
-	?SetContentSize@CFSMailMessagePart@@QAEXI@Z @ 231 NONAME ; void CFSMailMessagePart::SetContentSize(unsigned int)
-	?GetCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 232 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetCCRecipients(void)
-	?NewL@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 233 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewL(class TFSMailMsgId, class TFSMailMsgId)
+	?NextL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 200 NONAME ; int CFSMailIterator::NextL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?SetUnreadCount@CFSMailFolderBase@@QAEXI@Z @ 201 NONAME ; void CFSMailFolderBase::SetUnreadCount(unsigned int)
+	?SetRCLInfo@CFSMailBoxBase@@QAEXVTUid@@I@Z @ 202 NONAME ; void CFSMailBoxBase::SetRCLInfo(class TUid, unsigned int)
+	??1CExtendableEmail@@UAE@XZ @ 203 NONAME ; CExtendableEmail::~CExtendableEmail(void)
+	?qstringToHBufCLC@NmConverter@@SAPAVHBufC16@@ABVQString@@@Z @ 204 NONAME ; class HBufC16 * NmConverter::qstringToHBufCLC(class QString const &)
+	?NewLC@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 205 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewLC(class TFSMailMsgId)
+	?AppendCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 206 NONAME ; void CFSMailMessageBase::AppendCCRecipient(class CFSMailAddress *)
+	?GetMessageId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 207 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMessageId(void) const
+	?GetSubject@CFSMailMessageBase@@QBEAAVTDesC16@@XZ @ 208 NONAME ; class TDesC16 & CFSMailMessageBase::GetSubject(void) const
+	?NewL@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 209 NONAME ; class CFSMailIterator * CFSMailIterator::NewL(class MFSMailIterator &, class CFSMailRequestHandler *)
+	?RefreshNowL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 210 NONAME ; int CFSMailBox::RefreshNowL(class MFSMailRequestObserver &)
+	?Extension@TEmailExtensions@@QBEPAVCEmailExtension@@H@Z @ 211 NONAME ; class CEmailExtension * TEmailExtensions::Extension(int) const
+	??1CFSMailRequestHandler@@UAE@XZ @ 212 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(void)
+	?DecRef@CEmailExtension@@QAEIXZ @ 213 NONAME ; unsigned int CEmailExtension::DecRef(void)
+	?SetSubFolderCount@CFSMailFolderBase@@QAEXI@Z @ 214 NONAME ; void CFSMailFolderBase::SetSubFolderCount(unsigned int)
+	?AddL@TEmailExtensions@@QAEXPAVCEmailExtension@@@Z @ 215 NONAME ; void TEmailExtensions::AddL(class CEmailExtension *)
+	?ClearCcRecipients@CFSMailMessageBase@@QAEXXZ @ 216 NONAME ; void CFSMailMessageBase::ClearCcRecipients(void)
+	?GetPartId@CFSMailMessagePart@@QBE?AVTFSMailMsgId@@XZ @ 217 NONAME ; class TFSMailMsgId CFSMailMessagePart::GetPartId(void) const
+	?ExtensionL@CFSMailMessageBase@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 218 NONAME ; class CEmailExtension * CFSMailMessageBase::ExtensionL(class TUid const &)
+	?GetReplyToAddress@CFSMailMessageBase@@QAEABVCFSMailAddress@@XZ @ 219 NONAME ; class CFSMailAddress const & CFSMailMessageBase::GetReplyToAddress(void)
+	?IncRef@CEmailExtension@@QAEXXZ @ 220 NONAME ; void CEmailExtension::IncRef(void)
+	?GetMailBoxId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 221 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetMailBoxId(void) const
+	??1CFSMailBox@@UAE@XZ @ 222 NONAME ; CFSMailBox::~CFSMailBox(void)
+	?FetchedContentSize@CFSMailMessagePart@@QBEIXZ @ 223 NONAME ; unsigned int CFSMailMessagePart::FetchedContentSize(void) const
+	?GetSubFoldersL@CFSMailFolder@@QAEXAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 224 NONAME ; void CFSMailFolder::GetSubFoldersL(class RPointerArray<class CFSMailFolder> &)
+	?SetFlag@CFSMailMessageBase@@QAEXH@Z @ 225 NONAME ; void CFSMailMessageBase::SetFlag(int)
+	?ConstructL@CFSMailRequestHandler@@IAEXV?$RPointerArray@VCImplementationInformation@@@@V?$RPointerArray@VCFSMailPlugin@@@@@Z @ 226 NONAME ; void CFSMailRequestHandler::ConstructL(class RPointerArray<class CImplementationInformation>, class RPointerArray<class CFSMailPlugin>)
+	?NewLC@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 227 NONAME ; class CFSMailIterator * CFSMailIterator::NewLC(class MFSMailIterator &, class CFSMailRequestHandler *)
+	?MoveMessagesL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@ABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@2@Z @ 228 NONAME ; int CFSMailBox::MoveMessagesL(class MFSMailRequestObserver &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
+	??_ECEmailExtension@@UAE@I@Z @ 229 NONAME ; CEmailExtension::~CEmailExtension(unsigned int)
+	?SetContentSize@CFSMailMessagePart@@QAEXI@Z @ 230 NONAME ; void CFSMailMessagePart::SetContentSize(unsigned int)
+	?GetCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 231 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetCCRecipients(void)
+	?NewL@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 232 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewL(class TFSMailMsgId, class TFSMailMsgId)
 
--- a/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,182 +1,182 @@
 EXPORTS
 	_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
-	_ZN10CFSMailBox16GetMailBoxStatusEv @ 15 NONAME
-	_ZN10CFSMailBox16ReleaseExtensionEP15CEmailExtension @ 16 NONAME
-	_ZN10CFSMailBox18CreateReplyMessageE12TFSMailMsgIdiRK7TDesC16 @ 17 NONAME
-	_ZN10CFSMailBox18GetLastSyncStatusLEv @ 18 NONAME
-	_ZN10CFSMailBox19CreateMessageToSendEv @ 19 NONAME
-	_ZN10CFSMailBox19CreateReplyMessageLE12TFSMailMsgIdiR22MFSMailRequestObserverRK7TDesC16 @ 20 NONAME
-	_ZN10CFSMailBox19GetStandardFolderIdE13TFSFolderType @ 21 NONAME
-	_ZN10CFSMailBox19UpdateMessageFlagsLE12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserver @ 22 NONAME
-	_ZN10CFSMailBox20CreateForwardMessageE12TFSMailMsgIdRK7TDesC16 @ 23 NONAME
-	_ZN10CFSMailBox20CreateMessageToSendLER22MFSMailRequestObserver @ 24 NONAME
-	_ZN10CFSMailBox21CreateForwardMessageLE12TFSMailMsgIdR22MFSMailRequestObserverRK7TDesC16 @ 25 NONAME
-	_ZN10CFSMailBox22ClearSearchResultCacheEv @ 26 NONAME
-	_ZN10CFSMailBox4NewLE12TFSMailMsgId @ 27 NONAME
-	_ZN10CFSMailBox5NewLCE12TFSMailMsgId @ 28 NONAME
-	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 29 NONAME
-	_ZN10CFSMailBox9GoOnlineLEv @ 30 NONAME
-	_ZN10CFSMailBoxD0Ev @ 31 NONAME
-	_ZN10CFSMailBoxD1Ev @ 32 NONAME
-	_ZN10CFSMailBoxD2Ev @ 33 NONAME
-	_ZN11NmConverter11toQDateTimeERK5TTime @ 34 NONAME
-	_ZN11NmConverter15mailMsgIdToNmIdE12TFSMailMsgId @ 35 NONAME
-	_ZN11NmConverter15nmIdToMailMsgIdE4NmId @ 36 NONAME
-	_ZN11NmConverter15toRPointerArrayERK5QListI9NmAddressE @ 37 NONAME
-	_ZN11NmConverter16qstringToHBufCLCERK7QString @ 38 NONAME
-	_ZN11NmConverter21FSMailSortCriteria2NME19TFSMailSortCriteria @ 39 NONAME
-	_ZN11NmConverter21NMMailSortCriteria2FSE18NmMailSortCriteria @ 40 NONAME
-	_ZN11NmConverter7toTTimeERK9QDateTime @ 41 NONAME
-	_ZN11NmConverter9toQStringERK7TDesC16 @ 42 NONAME
-	_ZN13CFSMailFolder10ExtensionLERK4TUid @ 43 NONAME
-	_ZN13CFSMailFolder13ListMessagesLE14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 44 NONAME
-	_ZN13CFSMailFolder14FetchMessagesLERK6RArrayI12TFSMailMsgIdE14TFSMailDetailsR22MFSMailRequestObserver @ 45 NONAME
-	_ZN13CFSMailFolder14GetSubFoldersLER13RPointerArrayIS_E @ 46 NONAME
-	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgId @ 47 NONAME
-	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgIdR22MFSMailRequestObserver @ 48 NONAME
-	_ZN13CFSMailFolder16ReleaseExtensionEP15CEmailExtension @ 49 NONAME
-	_ZN13CFSMailFolder17SupportsMoveFromLE13TFSFolderType @ 50 NONAME
-	_ZN13CFSMailFolder4NewLE12TFSMailMsgId @ 51 NONAME
-	_ZN13CFSMailFolder5NewLCE12TFSMailMsgId @ 52 NONAME
-	_ZN13CFSMailFolderD0Ev @ 53 NONAME
-	_ZN13CFSMailFolderD1Ev @ 54 NONAME
-	_ZN13CFSMailFolderD2Ev @ 55 NONAME
-	_ZN14CFSMailAddress12GetNmAddressEv @ 56 NONAME
-	_ZN14CFSMailAddress14SetDisplayNameERK7TDesC16 @ 57 NONAME
-	_ZN14CFSMailAddress15SetEmailAddressERK7TDesC16 @ 58 NONAME
-	_ZN14CFSMailAddress4NewLERK9NmAddress @ 59 NONAME
-	_ZN14CFSMailAddress4NewLEv @ 60 NONAME
-	_ZN14CFSMailAddress5NewLCEv @ 61 NONAME
-	_ZN14CFSMailAddressD0Ev @ 62 NONAME
-	_ZN14CFSMailAddressD1Ev @ 63 NONAME
-	_ZN14CFSMailAddressD2Ev @ 64 NONAME
-	_ZN14CFSMailBoxBase10SetRCLInfoE4TUidj @ 65 NONAME
-	_ZN14CFSMailBoxBase12GetNmMailboxEv @ 66 NONAME
-	_ZN14CFSMailBoxBase14OwnMailAddressEv @ 67 NONAME
-	_ZN14CFSMailBoxBase14SetSettingsUidE4TUid @ 68 NONAME
-	_ZN14CFSMailBoxBase18SetOwnMailAddressLEP14CFSMailAddress @ 69 NONAME
-	_ZN14CFSMailBoxBase19SetMRInfoProcessorLEP16MMRInfoProcessor @ 70 NONAME
-	_ZN14CFSMailBoxBase4NewLE12TFSMailMsgId @ 71 NONAME
-	_ZN14CFSMailBoxBase5NewLCE12TFSMailMsgId @ 72 NONAME
-	_ZN14CFSMailBoxBase7SetNameERK7TDesC16 @ 73 NONAME
-	_ZN14CFSMailBoxBaseD0Ev @ 74 NONAME
-	_ZN14CFSMailBoxBaseD1Ev @ 75 NONAME
-	_ZN14CFSMailBoxBaseD2Ev @ 76 NONAME
-	_ZN14CFSMailMessage12GetNmMessageEv @ 77 NONAME
-	_ZN14CFSMailMessage12SaveMessageLER22MFSMailRequestObserver @ 78 NONAME
-	_ZN14CFSMailMessage12SaveMessageLEv @ 79 NONAME
-	_ZN14CFSMailMessage13HtmlBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 80 NONAME
-	_ZN14CFSMailMessage15AttachmentListLER13RPointerArrayI18CFSMailMessagePartE @ 81 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLER5RFileRK6TDesC8 @ 82 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC1612TFSMailMsgId @ 83 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC16R22MFSMailRequestObserver @ 84 NONAME
-	_ZN14CFSMailMessage17SaveMessagePartsLER22MFSMailRequestObserver @ 85 NONAME
-	_ZN14CFSMailMessage18PlainTextBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 86 NONAME
-	_ZN14CFSMailMessage4NewLE12TFSMailMsgId @ 87 NONAME
-	_ZN14CFSMailMessage4NewLERK9NmMessage @ 88 NONAME
-	_ZN14CFSMailMessage5NewLCE12TFSMailMsgId @ 89 NONAME
-	_ZN14CFSMailMessageD0Ev @ 90 NONAME
-	_ZN14CFSMailMessageD1Ev @ 91 NONAME
-	_ZN14CFSMailMessageD2Ev @ 92 NONAME
-	_ZN15CEmailExtension6DecRefEv @ 93 NONAME
-	_ZN15CEmailExtension6IncRefEv @ 94 NONAME
-	_ZN15CEmailExtensionC1ERK4TUid @ 95 NONAME
-	_ZN15CEmailExtensionC2ERK4TUid @ 96 NONAME
-	_ZN15CEmailExtensionD0Ev @ 97 NONAME
-	_ZN15CEmailExtensionD1Ev @ 98 NONAME
-	_ZN15CEmailExtensionD2Ev @ 99 NONAME
-	_ZN15CFSMailIterator4NewLER15MFSMailIteratorP21CFSMailRequestHandler @ 100 NONAME
-	_ZN15CFSMailIterator5NewLCER15MFSMailIteratorP21CFSMailRequestHandler @ 101 NONAME
-	_ZN15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 102 NONAME
-	_ZN15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 103 NONAME
-	_ZN15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 104 NONAME
-	_ZN15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 105 NONAME
-	_ZN15CFSMailIteratorD0Ev @ 106 NONAME
-	_ZN15CFSMailIteratorD1Ev @ 107 NONAME
-	_ZN15CFSMailIteratorD2Ev @ 108 NONAME
-	_ZN16CExtendableEmail10ExtensionLERK4TUid @ 109 NONAME
-	_ZN16CExtendableEmail16ReleaseExtensionEP15CEmailExtension @ 110 NONAME
-	_ZN16CExtendableEmailC1Ev @ 111 NONAME
-	_ZN16CExtendableEmailC2Ev @ 112 NONAME
-	_ZN16TEmailExtensions4AddLEP15CEmailExtension @ 113 NONAME
-	_ZN16TEmailExtensions6RemoveEPK15CEmailExtension @ 114 NONAME
-	_ZN16TEmailExtensionsC1Ev @ 115 NONAME
-	_ZN16TEmailExtensionsC2Ev @ 116 NONAME
-	_ZN16TEmailExtensionsD1Ev @ 117 NONAME
-	_ZN16TEmailExtensionsD2Ev @ 118 NONAME
-	_ZN17CFSMailFolderBase10ConstructLE12TFSMailMsgId @ 119 NONAME
-	_ZN17CFSMailFolderBase11GetNmFolderEv @ 120 NONAME
-	_ZN17CFSMailFolderBase12SetMailBoxIdE12TFSMailMsgId @ 121 NONAME
-	_ZN17CFSMailFolderBase13SetFolderNameERK7TDesC16 @ 122 NONAME
-	_ZN17CFSMailFolderBase13SetFolderTypeE13TFSFolderType @ 123 NONAME
-	_ZN17CFSMailFolderBase14BlockCopyFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 124 NONAME
-	_ZN17CFSMailFolderBase14BlockMoveFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 125 NONAME
-	_ZN17CFSMailFolderBase14SetUnreadCountEj @ 126 NONAME
-	_ZN17CFSMailFolderBase14SetUnseenCountEj @ 127 NONAME
-	_ZN17CFSMailFolderBase15SetMessageCountEj @ 128 NONAME
-	_ZN17CFSMailFolderBase17SetParentFolderIdE12TFSMailMsgId @ 129 NONAME
-	_ZN17CFSMailFolderBase17SetSubFolderCountEj @ 130 NONAME
-	_ZN17CFSMailFolderBase4NewLE12TFSMailMsgId @ 131 NONAME
-	_ZN17CFSMailFolderBase5NewLCE12TFSMailMsgId @ 132 NONAME
-	_ZN17CFSMailFolderBaseD0Ev @ 133 NONAME
-	_ZN17CFSMailFolderBaseD1Ev @ 134 NONAME
-	_ZN17CFSMailFolderBaseD2Ev @ 135 NONAME
-	_ZN18CFSMailMessageBase10ConstructLE12TFSMailMsgId @ 136 NONAME
-	_ZN18CFSMailMessageBase10ConstructLERK17NmMessageEnvelope @ 137 NONAME
-	_ZN18CFSMailMessageBase10ExtensionLERK4TUid @ 138 NONAME
-	_ZN18CFSMailMessageBase10SetSubjectERK7TDesC16 @ 139 NONAME
-	_ZN18CFSMailMessageBase11SetFolderIdE12TFSMailMsgId @ 140 NONAME
-	_ZN18CFSMailMessageBase12SetMailBoxIdE12TFSMailMsgId @ 141 NONAME
-	_ZN18CFSMailMessageBase12SetMessageIdE12TFSMailMsgId @ 142 NONAME
-	_ZN18CFSMailMessageBase14RequestHandlerEv @ 143 NONAME
-	_ZN18CFSMailMessageBase15GetCCRecipientsEv @ 144 NONAME
-	_ZN18CFSMailMessageBase15GetToRecipientsEv @ 145 NONAME
-	_ZN18CFSMailMessageBase16GetBCCRecipientsEv @ 146 NONAME
-	_ZN18CFSMailMessageBase16ReleaseExtensionEP15CEmailExtension @ 147 NONAME
-	_ZN18CFSMailMessageBase17AppendCCRecipientEP14CFSMailAddress @ 148 NONAME
-	_ZN18CFSMailMessageBase17AppendToRecipientEP14CFSMailAddress @ 149 NONAME
-	_ZN18CFSMailMessageBase17ClearCcRecipientsEv @ 150 NONAME
-	_ZN18CFSMailMessageBase17ClearToRecipientsEv @ 151 NONAME
-	_ZN18CFSMailMessageBase17GetReplyToAddressEv @ 152 NONAME
-	_ZN18CFSMailMessageBase17SetReplyToAddressEP14CFSMailAddress @ 153 NONAME
-	_ZN18CFSMailMessageBase18AppendBCCRecipientEP14CFSMailAddress @ 154 NONAME
-	_ZN18CFSMailMessageBase18ClearBccRecipientsEv @ 155 NONAME
-	_ZN18CFSMailMessageBase20GetNmMessageEnvelopeEv @ 156 NONAME
-	_ZN18CFSMailMessageBase4NewLE12TFSMailMsgId @ 157 NONAME
-	_ZN18CFSMailMessageBase5NewLCE12TFSMailMsgId @ 158 NONAME
-	_ZN18CFSMailMessageBase7SetDateE5TTime @ 159 NONAME
-	_ZN18CFSMailMessageBase7SetFlagEi @ 160 NONAME
-	_ZN18CFSMailMessageBase9ResetFlagEi @ 161 NONAME
-	_ZN18CFSMailMessageBase9SetSenderEP14CFSMailAddress @ 162 NONAME
-	_ZN18CFSMailMessageBaseD0Ev @ 163 NONAME
-	_ZN18CFSMailMessageBaseD1Ev @ 164 NONAME
-	_ZN18CFSMailMessageBaseD2Ev @ 165 NONAME
-	_ZN18CFSMailMessagePart10ChildPartLE12TFSMailMsgId @ 166 NONAME
-	_ZN18CFSMailMessagePart10SetContentER6TDes16 @ 167 NONAME
-	_ZN18CFSMailMessagePart11ChildPartsLER13RPointerArrayIS_ENS_28TFSMailMessagePartDataSourceE @ 168 NONAME
-	_ZN18CFSMailMessagePart11IsMRInfoSetEv @ 169 NONAME
-	_ZN18CFSMailMessagePart13FindBodyPartLERK7TDesC16NS_28TFSMailMessagePartDataSourceE @ 170 NONAME
-	_ZN18CFSMailMessagePart13NewChildPartLE12TFSMailMsgIdRK7TDesC16 @ 171 NONAME
-	_ZN18CFSMailMessagePart13SetContentIDLERK7TDesC16 @ 172 NONAME
-	_ZN18CFSMailMessagePart14SetContentSizeEj @ 173 NONAME
-	_ZN18CFSMailMessagePart14SetContentTypeERK7TDesC16 @ 174 NONAME
-	_ZN18CFSMailMessagePart15AttachmentNameLEv @ 175 NONAME
-	_ZN18CFSMailMessagePart15GetContentClassEv @ 176 NONAME
-	_ZN18CFSMailMessagePart15GetContentFileLEv @ 177 NONAME
-	_ZN18CFSMailMessagePart15SetContentClassERK7TDesC16 @ 178 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
+	_ZN10CFSMailBox13MoveMessagesLER22MFSMailRequestObserverRK6RArrayI12TFSMailMsgIdES3_S3_ @ 11 NONAME
+	_ZN10CFSMailBox13MoveMessagesLERK6RArrayI12TFSMailMsgIdES1_S1_ @ 12 NONAME
+	_ZN10CFSMailBox16GetMailBoxStatusEv @ 13 NONAME
+	_ZN10CFSMailBox16ReleaseExtensionEP15CEmailExtension @ 14 NONAME
+	_ZN10CFSMailBox18CreateReplyMessageE12TFSMailMsgIdiRK7TDesC16 @ 15 NONAME
+	_ZN10CFSMailBox19CreateMessageToSendEv @ 16 NONAME
+	_ZN10CFSMailBox19CreateReplyMessageLE12TFSMailMsgIdiR22MFSMailRequestObserverRK7TDesC16 @ 17 NONAME
+	_ZN10CFSMailBox19GetStandardFolderIdE13TFSFolderType @ 18 NONAME
+	_ZN10CFSMailBox19UpdateMessageFlagsLE12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserver @ 19 NONAME
+	_ZN10CFSMailBox20CreateForwardMessageE12TFSMailMsgIdRK7TDesC16 @ 20 NONAME
+	_ZN10CFSMailBox20CreateMessageToSendLER22MFSMailRequestObserver @ 21 NONAME
+	_ZN10CFSMailBox21CreateForwardMessageLE12TFSMailMsgIdR22MFSMailRequestObserverRK7TDesC16 @ 22 NONAME
+	_ZN10CFSMailBox22ClearSearchResultCacheEv @ 23 NONAME
+	_ZN10CFSMailBox4NewLE12TFSMailMsgId @ 24 NONAME
+	_ZN10CFSMailBox5NewLCE12TFSMailMsgId @ 25 NONAME
+	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 26 NONAME
+	_ZN10CFSMailBox9GoOnlineLEv @ 27 NONAME
+	_ZN10CFSMailBoxD0Ev @ 28 NONAME
+	_ZN10CFSMailBoxD1Ev @ 29 NONAME
+	_ZN10CFSMailBoxD2Ev @ 30 NONAME
+	_ZN11NmConverter11toQDateTimeERK5TTime @ 31 NONAME
+	_ZN11NmConverter15mailMsgIdToNmIdE12TFSMailMsgId @ 32 NONAME
+	_ZN11NmConverter15nmIdToMailMsgIdE4NmId @ 33 NONAME
+	_ZN11NmConverter15toRPointerArrayERK5QListI9NmAddressE @ 34 NONAME
+	_ZN11NmConverter16qstringToHBufCLCERK7QString @ 35 NONAME
+	_ZN11NmConverter21FSMailSortCriteria2NME19TFSMailSortCriteria @ 36 NONAME
+	_ZN11NmConverter21NMMailSortCriteria2FSE18NmMailSortCriteria @ 37 NONAME
+	_ZN11NmConverter7toTTimeERK9QDateTime @ 38 NONAME
+	_ZN11NmConverter9toQStringERK7TDesC16 @ 39 NONAME
+	_ZN13CFSMailFolder10ExtensionLERK4TUid @ 40 NONAME
+	_ZN13CFSMailFolder13ListMessagesLE14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 41 NONAME
+	_ZN13CFSMailFolder14FetchMessagesLERK6RArrayI12TFSMailMsgIdE14TFSMailDetailsR22MFSMailRequestObserver @ 42 NONAME
+	_ZN13CFSMailFolder14GetSubFoldersLER13RPointerArrayIS_E @ 43 NONAME
+	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgId @ 44 NONAME
+	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgIdR22MFSMailRequestObserver @ 45 NONAME
+	_ZN13CFSMailFolder16ReleaseExtensionEP15CEmailExtension @ 46 NONAME
+	_ZN13CFSMailFolder17SupportsMoveFromLE13TFSFolderType @ 47 NONAME
+	_ZN13CFSMailFolder4NewLE12TFSMailMsgId @ 48 NONAME
+	_ZN13CFSMailFolder5NewLCE12TFSMailMsgId @ 49 NONAME
+	_ZN13CFSMailFolderD0Ev @ 50 NONAME
+	_ZN13CFSMailFolderD1Ev @ 51 NONAME
+	_ZN13CFSMailFolderD2Ev @ 52 NONAME
+	_ZN14CFSMailAddress12GetNmAddressEv @ 53 NONAME
+	_ZN14CFSMailAddress14SetDisplayNameERK7TDesC16 @ 54 NONAME
+	_ZN14CFSMailAddress15SetEmailAddressERK7TDesC16 @ 55 NONAME
+	_ZN14CFSMailAddress4NewLERK9NmAddress @ 56 NONAME
+	_ZN14CFSMailAddress4NewLEv @ 57 NONAME
+	_ZN14CFSMailAddress5NewLCEv @ 58 NONAME
+	_ZN14CFSMailAddressD0Ev @ 59 NONAME
+	_ZN14CFSMailAddressD1Ev @ 60 NONAME
+	_ZN14CFSMailAddressD2Ev @ 61 NONAME
+	_ZN14CFSMailBoxBase10SetRCLInfoE4TUidj @ 62 NONAME
+	_ZN14CFSMailBoxBase12GetNmMailboxEv @ 63 NONAME
+	_ZN14CFSMailBoxBase14OwnMailAddressEv @ 64 NONAME
+	_ZN14CFSMailBoxBase14SetSettingsUidE4TUid @ 65 NONAME
+	_ZN14CFSMailBoxBase16MRInfoProcessorLEv @ 66 NONAME
+	_ZN14CFSMailBoxBase18SetOwnMailAddressLEP14CFSMailAddress @ 67 NONAME
+	_ZN14CFSMailBoxBase19SetMRInfoProcessorLEP16MMRInfoProcessor @ 68 NONAME
+	_ZN14CFSMailBoxBase20IsMRInfoProcessorSetEv @ 69 NONAME
+	_ZN14CFSMailBoxBase4NewLE12TFSMailMsgId @ 70 NONAME
+	_ZN14CFSMailBoxBase5NewLCE12TFSMailMsgId @ 71 NONAME
+	_ZN14CFSMailBoxBase7SetNameERK7TDesC16 @ 72 NONAME
+	_ZN14CFSMailBoxBaseD0Ev @ 73 NONAME
+	_ZN14CFSMailBoxBaseD1Ev @ 74 NONAME
+	_ZN14CFSMailBoxBaseD2Ev @ 75 NONAME
+	_ZN14CFSMailMessage12GetNmMessageEv @ 76 NONAME
+	_ZN14CFSMailMessage12SaveMessageLER22MFSMailRequestObserver @ 77 NONAME
+	_ZN14CFSMailMessage12SaveMessageLEv @ 78 NONAME
+	_ZN14CFSMailMessage13HtmlBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 79 NONAME
+	_ZN14CFSMailMessage15AttachmentListLER13RPointerArrayI18CFSMailMessagePartE @ 80 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLER5RFileRK6TDesC8 @ 81 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC1612TFSMailMsgId @ 82 NONAME
+	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC16R22MFSMailRequestObserver @ 83 NONAME
+	_ZN14CFSMailMessage17SaveMessagePartsLER22MFSMailRequestObserver @ 84 NONAME
+	_ZN14CFSMailMessage18PlainTextBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 85 NONAME
+	_ZN14CFSMailMessage4NewLE12TFSMailMsgId @ 86 NONAME
+	_ZN14CFSMailMessage4NewLERK9NmMessage @ 87 NONAME
+	_ZN14CFSMailMessage5NewLCE12TFSMailMsgId @ 88 NONAME
+	_ZN14CFSMailMessageD0Ev @ 89 NONAME
+	_ZN14CFSMailMessageD1Ev @ 90 NONAME
+	_ZN14CFSMailMessageD2Ev @ 91 NONAME
+	_ZN15CEmailExtension6DecRefEv @ 92 NONAME
+	_ZN15CEmailExtension6IncRefEv @ 93 NONAME
+	_ZN15CEmailExtensionC1ERK4TUid @ 94 NONAME
+	_ZN15CEmailExtensionC2ERK4TUid @ 95 NONAME
+	_ZN15CEmailExtensionD0Ev @ 96 NONAME
+	_ZN15CEmailExtensionD1Ev @ 97 NONAME
+	_ZN15CEmailExtensionD2Ev @ 98 NONAME
+	_ZN15CFSMailIterator4NewLER15MFSMailIteratorP21CFSMailRequestHandler @ 99 NONAME
+	_ZN15CFSMailIterator5NewLCER15MFSMailIteratorP21CFSMailRequestHandler @ 100 NONAME
+	_ZN15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 101 NONAME
+	_ZN15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 102 NONAME
+	_ZN15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 103 NONAME
+	_ZN15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 104 NONAME
+	_ZN15CFSMailIteratorD0Ev @ 105 NONAME
+	_ZN15CFSMailIteratorD1Ev @ 106 NONAME
+	_ZN15CFSMailIteratorD2Ev @ 107 NONAME
+	_ZN16CExtendableEmail10ExtensionLERK4TUid @ 108 NONAME
+	_ZN16CExtendableEmail16ReleaseExtensionEP15CEmailExtension @ 109 NONAME
+	_ZN16CExtendableEmailC1Ev @ 110 NONAME
+	_ZN16CExtendableEmailC2Ev @ 111 NONAME
+	_ZN16TEmailExtensions4AddLEP15CEmailExtension @ 112 NONAME
+	_ZN16TEmailExtensions6RemoveEPK15CEmailExtension @ 113 NONAME
+	_ZN16TEmailExtensionsC1Ev @ 114 NONAME
+	_ZN16TEmailExtensionsC2Ev @ 115 NONAME
+	_ZN16TEmailExtensionsD1Ev @ 116 NONAME
+	_ZN16TEmailExtensionsD2Ev @ 117 NONAME
+	_ZN17CFSMailFolderBase10ConstructLE12TFSMailMsgId @ 118 NONAME
+	_ZN17CFSMailFolderBase11GetNmFolderEv @ 119 NONAME
+	_ZN17CFSMailFolderBase12SetMailBoxIdE12TFSMailMsgId @ 120 NONAME
+	_ZN17CFSMailFolderBase13SetFolderNameERK7TDesC16 @ 121 NONAME
+	_ZN17CFSMailFolderBase13SetFolderTypeE13TFSFolderType @ 122 NONAME
+	_ZN17CFSMailFolderBase14BlockCopyFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 123 NONAME
+	_ZN17CFSMailFolderBase14BlockMoveFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 124 NONAME
+	_ZN17CFSMailFolderBase14SetUnreadCountEj @ 125 NONAME
+	_ZN17CFSMailFolderBase14SetUnseenCountEj @ 126 NONAME
+	_ZN17CFSMailFolderBase15SetMessageCountEj @ 127 NONAME
+	_ZN17CFSMailFolderBase17SetParentFolderIdE12TFSMailMsgId @ 128 NONAME
+	_ZN17CFSMailFolderBase17SetSubFolderCountEj @ 129 NONAME
+	_ZN17CFSMailFolderBase4NewLE12TFSMailMsgId @ 130 NONAME
+	_ZN17CFSMailFolderBase5NewLCE12TFSMailMsgId @ 131 NONAME
+	_ZN17CFSMailFolderBaseD0Ev @ 132 NONAME
+	_ZN17CFSMailFolderBaseD1Ev @ 133 NONAME
+	_ZN17CFSMailFolderBaseD2Ev @ 134 NONAME
+	_ZN18CFSMailMessageBase10ConstructLE12TFSMailMsgId @ 135 NONAME
+	_ZN18CFSMailMessageBase10ConstructLERK17NmMessageEnvelope @ 136 NONAME
+	_ZN18CFSMailMessageBase10ExtensionLERK4TUid @ 137 NONAME
+	_ZN18CFSMailMessageBase10SetSubjectERK7TDesC16 @ 138 NONAME
+	_ZN18CFSMailMessageBase11SetFolderIdE12TFSMailMsgId @ 139 NONAME
+	_ZN18CFSMailMessageBase12SetMailBoxIdE12TFSMailMsgId @ 140 NONAME
+	_ZN18CFSMailMessageBase12SetMessageIdE12TFSMailMsgId @ 141 NONAME
+	_ZN18CFSMailMessageBase14RequestHandlerEv @ 142 NONAME
+	_ZN18CFSMailMessageBase15GetCCRecipientsEv @ 143 NONAME
+	_ZN18CFSMailMessageBase15GetToRecipientsEv @ 144 NONAME
+	_ZN18CFSMailMessageBase16GetBCCRecipientsEv @ 145 NONAME
+	_ZN18CFSMailMessageBase16ReleaseExtensionEP15CEmailExtension @ 146 NONAME
+	_ZN18CFSMailMessageBase17AppendCCRecipientEP14CFSMailAddress @ 147 NONAME
+	_ZN18CFSMailMessageBase17AppendToRecipientEP14CFSMailAddress @ 148 NONAME
+	_ZN18CFSMailMessageBase17ClearCcRecipientsEv @ 149 NONAME
+	_ZN18CFSMailMessageBase17ClearToRecipientsEv @ 150 NONAME
+	_ZN18CFSMailMessageBase17GetReplyToAddressEv @ 151 NONAME
+	_ZN18CFSMailMessageBase17SetReplyToAddressEP14CFSMailAddress @ 152 NONAME
+	_ZN18CFSMailMessageBase18AppendBCCRecipientEP14CFSMailAddress @ 153 NONAME
+	_ZN18CFSMailMessageBase18ClearBccRecipientsEv @ 154 NONAME
+	_ZN18CFSMailMessageBase20GetNmMessageEnvelopeEv @ 155 NONAME
+	_ZN18CFSMailMessageBase4NewLE12TFSMailMsgId @ 156 NONAME
+	_ZN18CFSMailMessageBase5NewLCE12TFSMailMsgId @ 157 NONAME
+	_ZN18CFSMailMessageBase7SetDateE5TTime @ 158 NONAME
+	_ZN18CFSMailMessageBase7SetFlagEi @ 159 NONAME
+	_ZN18CFSMailMessageBase9ResetFlagEi @ 160 NONAME
+	_ZN18CFSMailMessageBase9SetSenderEP14CFSMailAddress @ 161 NONAME
+	_ZN18CFSMailMessageBaseD0Ev @ 162 NONAME
+	_ZN18CFSMailMessageBaseD1Ev @ 163 NONAME
+	_ZN18CFSMailMessageBaseD2Ev @ 164 NONAME
+	_ZN18CFSMailMessagePart10ChildPartLE12TFSMailMsgId @ 165 NONAME
+	_ZN18CFSMailMessagePart10SetContentER6TDes16 @ 166 NONAME
+	_ZN18CFSMailMessagePart11ChildPartsLER13RPointerArrayIS_ENS_28TFSMailMessagePartDataSourceE @ 167 NONAME
+	_ZN18CFSMailMessagePart11IsMRInfoSetEv @ 168 NONAME
+	_ZN18CFSMailMessagePart13FindBodyPartLERK7TDesC16NS_28TFSMailMessagePartDataSourceE @ 169 NONAME
+	_ZN18CFSMailMessagePart13NewChildPartLE12TFSMailMsgIdRK7TDesC16 @ 170 NONAME
+	_ZN18CFSMailMessagePart13SetContentIDLERK7TDesC16 @ 171 NONAME
+	_ZN18CFSMailMessagePart14SetContentSizeEj @ 172 NONAME
+	_ZN18CFSMailMessagePart14SetContentTypeERK7TDesC16 @ 173 NONAME
+	_ZN18CFSMailMessagePart15AttachmentNameLEv @ 174 NONAME
+	_ZN18CFSMailMessagePart15GetContentClassEv @ 175 NONAME
+	_ZN18CFSMailMessagePart15GetContentFileLEv @ 176 NONAME
+	_ZN18CFSMailMessagePart15SetContentClassERK7TDesC16 @ 177 NONAME
+	_ZN18CFSMailMessagePart16CopyContentFileLERK7TDesC16 @ 178 NONAME
 	_ZN18CFSMailMessagePart16GetNmMessagePartEv @ 179 NONAME
 	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgId @ 180 NONAME
 	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgIdR22MFSMailRequestObserver @ 181 NONAME
@@ -208,63 +208,62 @@
 	_ZN18CFSMailMessagePartD2Ev @ 207 NONAME
 	_ZN21CFSMailRequestHandler10AddPluginLE4TUidP13CFSMailPlugin @ 208 NONAME
 	_ZN21CFSMailRequestHandler10ConstructLE13RPointerArrayI26CImplementationInformationES0_I13CFSMailPluginE @ 209 NONAME
-	_ZN21CFSMailRequestHandler11GetTempDirLEv @ 210 NONAME
-	_ZN21CFSMailRequestHandler12GetTempFileLE12TFSMailMsgId4TBufILi256EE @ 211 NONAME
-	_ZN21CFSMailRequestHandler13CleanTempDirLEv @ 212 NONAME
-	_ZN21CFSMailRequestHandler14CancelRequestLEi @ 213 NONAME
-	_ZN21CFSMailRequestHandler14GetPluginByUidE12TFSMailMsgId @ 214 NONAME
-	_ZN21CFSMailRequestHandler15CompleteRequestEi @ 215 NONAME
-	_ZN21CFSMailRequestHandler17InitAsyncRequestLE4TUidR22MFSMailRequestObserver @ 216 NONAME
-	_ZN21CFSMailRequestHandler17RemoveAllRequestsEv @ 217 NONAME
-	_ZN21CFSMailRequestHandler18CancelAllRequestsLEv @ 218 NONAME
-	_ZN21CFSMailRequestHandler4NewLER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 219 NONAME
-	_ZN21CFSMailRequestHandler5NewLCER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 220 NONAME
-	_ZN21CFSMailRequestHandlerC1Ev @ 221 NONAME
-	_ZN21CFSMailRequestHandlerC2Ev @ 222 NONAME
-	_ZN21CFSMailRequestHandlerD0Ev @ 223 NONAME
-	_ZN21CFSMailRequestHandlerD1Ev @ 224 NONAME
-	_ZN21CFSMailRequestHandlerD2Ev @ 225 NONAME
-	_ZNK10CFSMailBox16CurrentSyncStateEv @ 226 NONAME
-	_ZNK14CFSMailAddress14GetDisplayNameEv @ 227 NONAME
-	_ZNK14CFSMailAddress15GetEmailAddressEv @ 228 NONAME
-	_ZNK14CFSMailBoxBase5GetIdEv @ 229 NONAME
-	_ZNK14CFSMailBoxBase7GetNameEv @ 230 NONAME
-	_ZNK15CEmailExtension3UidEv @ 231 NONAME
-	_ZNK16TEmailExtensions13FindExtensionERK4TUid @ 232 NONAME
-	_ZNK16TEmailExtensions9ExtensionEi @ 233 NONAME
-	_ZNK17CFSMailFolderBase11GetFolderIdEv @ 234 NONAME
-	_ZNK17CFSMailFolderBase12GetMailBoxIdEv @ 235 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderNameEv @ 236 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderTypeEv @ 237 NONAME
-	_ZNK17CFSMailFolderBase14GetUnreadCountEv @ 238 NONAME
-	_ZNK17CFSMailFolderBase14GetUnseenCountEv @ 239 NONAME
-	_ZNK17CFSMailFolderBase15GetMessageCountEv @ 240 NONAME
-	_ZNK17CFSMailFolderBase17GetParentFolderIdEv @ 241 NONAME
-	_ZNK17CFSMailFolderBase17GetSubFolderCountEv @ 242 NONAME
-	_ZNK18CFSMailMessageBase10GetSubjectEv @ 243 NONAME
-	_ZNK18CFSMailMessageBase11GetFolderIdEv @ 244 NONAME
-	_ZNK18CFSMailMessageBase12GetMailBoxIdEv @ 245 NONAME
-	_ZNK18CFSMailMessageBase12GetMessageIdEv @ 246 NONAME
-	_ZNK18CFSMailMessageBase7GetDateEv @ 247 NONAME
-	_ZNK18CFSMailMessageBase8GetFlagsEv @ 248 NONAME
-	_ZNK18CFSMailMessageBase9GetSenderEv @ 249 NONAME
-	_ZNK18CFSMailMessageBase9IsFlagSetEi @ 250 NONAME
-	_ZNK18CFSMailMessagePart10IsMessageLEv @ 251 NONAME
-	_ZNK18CFSMailMessagePart11ContentSizeEv @ 252 NONAME
-	_ZNK18CFSMailMessagePart14GetContentTypeEv @ 253 NONAME
-	_ZNK18CFSMailMessagePart16ReadOnlyPartSizeEv @ 254 NONAME
-	_ZNK18CFSMailMessagePart18FetchedContentSizeEv @ 255 NONAME
-	_ZNK18CFSMailMessagePart9GetPartIdEv @ 256 NONAME
-	_ZTI15CEmailExtension @ 257 NONAME
-	_ZTI16CExtendableEmail @ 258 NONAME
-	_ZTI21CFSMailRequestHandler @ 259 NONAME
-	_ZTV15CEmailExtension @ 260 NONAME
-	_ZTV16CExtendableEmail @ 261 NONAME
-	_ZTV21CFSMailRequestHandler @ 262 NONAME
-	_ZThn4_N15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 263 NONAME
-	_ZThn4_N15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 264 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 265 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 266 NONAME
-	_ZThn4_N15CFSMailIteratorD0Ev @ 267 NONAME
-	_ZThn4_N15CFSMailIteratorD1Ev @ 268 NONAME
+	_ZN21CFSMailRequestHandler12GetTempFileLE12TFSMailMsgId4TBufILi256EE @ 210 NONAME
+	_ZN21CFSMailRequestHandler14CancelRequestLEi @ 211 NONAME
+	_ZN21CFSMailRequestHandler14GetPluginByUidE12TFSMailMsgId @ 212 NONAME
+	_ZN21CFSMailRequestHandler15CompleteRequestEi @ 213 NONAME
+	_ZN21CFSMailRequestHandler17InitAsyncRequestLE4TUidR22MFSMailRequestObserver @ 214 NONAME
+	_ZN21CFSMailRequestHandler17RemoveAllRequestsEv @ 215 NONAME
+	_ZN21CFSMailRequestHandler18CancelAllRequestsLEv @ 216 NONAME
+	_ZN21CFSMailRequestHandler4NewLER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 217 NONAME
+	_ZN21CFSMailRequestHandler5NewLCER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 218 NONAME
+	_ZN21CFSMailRequestHandlerC1Ev @ 219 NONAME
+	_ZN21CFSMailRequestHandlerC2Ev @ 220 NONAME
+	_ZN21CFSMailRequestHandlerD0Ev @ 221 NONAME
+	_ZN21CFSMailRequestHandlerD1Ev @ 222 NONAME
+	_ZN21CFSMailRequestHandlerD2Ev @ 223 NONAME
+	_ZNK10CFSMailBox16CurrentSyncStateEv @ 224 NONAME
+	_ZNK14CFSMailAddress14GetDisplayNameEv @ 225 NONAME
+	_ZNK14CFSMailAddress15GetEmailAddressEv @ 226 NONAME
+	_ZNK14CFSMailBoxBase5GetIdEv @ 227 NONAME
+	_ZNK14CFSMailBoxBase7GetNameEv @ 228 NONAME
+	_ZNK15CEmailExtension3UidEv @ 229 NONAME
+	_ZNK16TEmailExtensions13FindExtensionERK4TUid @ 230 NONAME
+	_ZNK16TEmailExtensions9ExtensionEi @ 231 NONAME
+	_ZNK17CFSMailFolderBase11GetFolderIdEv @ 232 NONAME
+	_ZNK17CFSMailFolderBase12GetMailBoxIdEv @ 233 NONAME
+	_ZNK17CFSMailFolderBase13GetFolderNameEv @ 234 NONAME
+	_ZNK17CFSMailFolderBase13GetFolderTypeEv @ 235 NONAME
+	_ZNK17CFSMailFolderBase14GetUnreadCountEv @ 236 NONAME
+	_ZNK17CFSMailFolderBase14GetUnseenCountEv @ 237 NONAME
+	_ZNK17CFSMailFolderBase15GetMessageCountEv @ 238 NONAME
+	_ZNK17CFSMailFolderBase17GetParentFolderIdEv @ 239 NONAME
+	_ZNK17CFSMailFolderBase17GetSubFolderCountEv @ 240 NONAME
+	_ZNK18CFSMailMessageBase10GetSubjectEv @ 241 NONAME
+	_ZNK18CFSMailMessageBase11GetFolderIdEv @ 242 NONAME
+	_ZNK18CFSMailMessageBase12GetMailBoxIdEv @ 243 NONAME
+	_ZNK18CFSMailMessageBase12GetMessageIdEv @ 244 NONAME
+	_ZNK18CFSMailMessageBase7GetDateEv @ 245 NONAME
+	_ZNK18CFSMailMessageBase8GetFlagsEv @ 246 NONAME
+	_ZNK18CFSMailMessageBase9GetSenderEv @ 247 NONAME
+	_ZNK18CFSMailMessageBase9IsFlagSetEi @ 248 NONAME
+	_ZNK18CFSMailMessagePart10IsMessageLEv @ 249 NONAME
+	_ZNK18CFSMailMessagePart11ContentSizeEv @ 250 NONAME
+	_ZNK18CFSMailMessagePart14FetchLoadStateEv @ 251 NONAME
+	_ZNK18CFSMailMessagePart14GetContentTypeEv @ 252 NONAME
+	_ZNK18CFSMailMessagePart16ReadOnlyPartSizeEv @ 253 NONAME
+	_ZNK18CFSMailMessagePart18FetchedContentSizeEv @ 254 NONAME
+	_ZNK18CFSMailMessagePart9GetPartIdEv @ 255 NONAME
+	_ZTI15CEmailExtension @ 256 NONAME
+	_ZTI16CExtendableEmail @ 257 NONAME
+	_ZTI21CFSMailRequestHandler @ 258 NONAME
+	_ZTV15CEmailExtension @ 259 NONAME
+	_ZTV16CExtendableEmail @ 260 NONAME
+	_ZTV21CFSMailRequestHandler @ 261 NONAME
+	_ZThn4_N15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 262 NONAME
+	_ZThn4_N15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 263 NONAME
+	_ZThn4_N15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 264 NONAME
+	_ZThn4_N15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 265 NONAME
+	_ZThn4_N15CFSMailIteratorD0Ev @ 266 NONAME
+	_ZThn4_N15CFSMailIteratorD1Ev @ 267 NONAME
 
--- a/emailservices/emailcommon/inc/CFSMailBox.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBox.h	Fri Sep 03 14:07:42 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -45,10 +45,10 @@
 NONSHARABLE_CLASS ( CFSMailBox ) : public CFSMailBoxBase
 {
  public:
-  
+
     /**
      * Destructor.
-     */  
+     */
     IMPORT_C  ~CFSMailBox();
 
     /**
@@ -57,14 +57,14 @@
      * @param aMailBoxId mailbox id in plugin containing mailbox
      */
   	 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 );
-  	
+
     /**
      * Enables synchronization of the mailbox. This means
      * that the framework can connect to server to do synchronization
@@ -82,7 +82,7 @@
      * Connection is set offline normally by using specific function
      * for this purpose. There are also other reasons for ending up
      * in offline state like network error or scheduling.
-     * 
+     *
 	 */
      IMPORT_C void GoOnlineL();
 
@@ -94,19 +94,11 @@
      * If GoOnlineL has effect on other mailboxes using the
      * same connection then this function has effect on those
      * mailboxes also.
-     * 
+     *
 	 */
      IMPORT_C void GoOfflineL();
 
     /**
-     * Returns last synchronizing operation progress status.
-     *
-     * @return last sync operation progress status
-     * 
-	 */
-     IMPORT_C TFSProgress GetLastSyncStatusL();
-
-    /**
      * Forces synchronization of mailbox. This can be called
      * whether the mailbox is currently offline or online. In the
      * case the mailbox is offline in the beginning, connection
@@ -114,10 +106,10 @@
      *
      * All collections (mail etc.) supported by the connection and
      * enabled by user settings are synchronized.
-     *     
+     *
      * This is an asynchronous operation and the request id
      * is returned for cancelling purpose.
-     * 
+     *
      * User can provide an observer as a parameter,
      * which will pass progress notifications during the operation
      * as callbacks related to this operation.
@@ -134,51 +126,44 @@
      IMPORT_C TInt RefreshNowL( MFSMailRequestObserver& aOperationObserver );
 
      IMPORT_C TInt RefreshNowL( );
-  	
-    /**
-     * cancels all ongoing synchronizations in this mailbox regardless
-     * of initiator, by user or by plugin itself
-     *
-	 */
-     IMPORT_C void CancelSyncL();
 
     /**
-     * creates into this mailbox new draft email 
+     * creates into this mailbox new draft email
      *
      * @return new draft email object, ownership is transferred to user
      */
   	 IMPORT_C CFSMailMessage* CreateMessageToSend( );
 
-// <qmail>  	 
+// <qmail>
     /**
      * Creates a new draft email into this mailbox asynchronously. When the operation
-     * finishes, RequestResponseL is called on the observer and the created message is 
+     * finishes, RequestResponseL is called on the observer and the created message is
      * passed along with the TFSProgress data. UI should not use this method directly
      * but via an NmMessageCreationOperation-derived object.
      *
-     * @param aOperationObserver Observer for the operation 
-     * 
+     * @param aOperationObserver Observer for the operation
+     *
      * @return id of the request, KErrFSMailPluginNotSupported if the protocol plugin this
      * instance is attached to does not support the async method.
      */
      IMPORT_C TInt CreateMessageToSendL( MFSMailRequestObserver& aOperationObserver );
-// </qmail>       
+// </qmail>
 
-// <qmail> 
+// <qmail>
     /**
     * update message flags
-    * 
+    *
     * ownership of message pointers is transferred
-    * 
+    *
     */
-    IMPORT_C int UpdateMessageFlagsL( 
+    IMPORT_C int UpdateMessageFlagsL(
         const TFSMailMsgId aMailboxId,
         RPointerArray<CFSMailMessage> &messages,
         MFSMailRequestObserver& aOperationObserver );
-// </qmail> 
-    
+// </qmail>
+
     /**
-     * creates into this mailbox new draft email to be forwarded 
+     * creates into this mailbox new draft email to be forwarded
      *
      * @param aOriginalMessageId message id of the original message to be forwarded
      * @param aHeaderDescriptor user can give quote headers data to plugin as
@@ -189,14 +174,14 @@
   	 IMPORT_C CFSMailMessage* CreateForwardMessage( const TFSMailMsgId aOriginalMessageId,
   	 												const TDesC& aHeaderDescriptor = KNullDesC  );
 
-// <qmail>       
+// <qmail>
     /**
      * creates into this mailbox new draft email to be forwarded asynchronously
-     * When the operation finishes, RequestResponseL is called on the observer and 
+     * When the operation finishes, RequestResponseL is called on the observer and
      * the created message is passed along with the TFSProgress data.
      *
      * @param aOriginalMessageId message id of the original message to be forwarded
-     * @param aOperationObserver Observer for the operation 
+     * @param aOperationObserver Observer for the operation
      * @param aHeaderDescriptor user can give quote headers data to plugin as
      *  parameter if needed
      *
@@ -205,7 +190,7 @@
     IMPORT_C TInt CreateForwardMessageL( const TFSMailMsgId aOriginalMessageId,
                             MFSMailRequestObserver& aOperationObserver,
                             const TDesC& aHeaderDescriptor = KNullDesC );
-// </qmail>       
+// </qmail>
 
     /**
      * creates into this mailbox new email for reply
@@ -221,13 +206,13 @@
   	 							 					const TBool aReplyToAll,
   	 							 					const TDesC& aHeaderDescriptor = KNullDesC  );
 
-// <qmail>       
+// <qmail>
     /**
      * creates into this mailbox new email for reply
      *
      * @param aOriginalMessageId id of the original message to be replied
      * @param aReplyToAll is set true if reply to all is requested
-     * @param aOperationObserver Observer for the operation 
+     * @param aOperationObserver Observer for the operation
      * @param aHeaderDescriptor user can give quote headers data to plugin as
      *  parameter if needed
      *
@@ -237,7 +222,7 @@
                                       const TBool aReplyToAll,
                                       MFSMailRequestObserver& aOperationObserver,
                                       const TDesC& aHeaderDescriptor = KNullDesC );
-// </qmail>       
+// </qmail>
 
     /**
      * sends email
@@ -261,38 +246,38 @@
 	 * List subfolders of given folder.
 	 * Only direct subfolders of given folder are returned.
 	 *
-	 * folder data : 
+	 * folder data :
 	 * - folder id
 	 * - folder name
 	 * - folder type ; Inbox, Outbox, Sent, Drafts, Deleted, Other
 	 * - message count
 	 * - unread message count
-	 * - mailbox id 
+	 * - 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); 
+	 IMPORT_C void ListFolders( const TFSMailMsgId aFolderId, RPointerArray<CFSMailFolder>& aFolderList);
 
 	/**
 	 * List all subfolders of mailbox.
 	 *
-	 * folder data : 
+	 * folder data :
 	 * - folder id
 	 * - folder name
 	 * - folder type ; Inbox, Outbox, Sent Items, Drafts, Deleted Items, Other
 	 * - message count
 	 * - unread message count
-	 * - mailbox id 
+	 * - 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(  ); 
+	 IMPORT_C RPointerArray<CFSMailFolder>& ListFolders(  );
 
     /**
      * Standard folder id accessor.
@@ -302,42 +287,32 @@
      */
 	 IMPORT_C TFSMailMsgId GetStandardFolderId( const TFSFolderType aFolderType );
 
-
-    /**
-     * Branding id accessor for this mailbox. This function is used by Branding Manager
-     * to associate mailbox to a branding definition.
-     *
-     * @return branding id
-     */
-     IMPORT_C TDesC& GetBrandingIdL( );
-
-
     /**
      * Moves a messages between folders.
      *
      * @param aMessageIds ids of the messages to be transferred
      * @param aSourceFolderId source folder id
      * @param aDestinationFolderId destination folder id
-     */    
-     IMPORT_C void MoveMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
-                                  const TFSMailMsgId aSourceFolderId, 
+     */
+     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 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. 
+     * including the properties, content, and all attachments.
      * (note only works if the store is in an authenticated state,
      *  otherwise this function leaves with KErrNotReady)
      *
@@ -346,12 +321,12 @@
      *        owned by user
      * @param aSourceFolderId source folder id
      * @param aDestinationFolderId destination folder id
-     */    
-     IMPORT_C void CopyMessagesL(	const RArray<TFSMailMsgId>& aMessageIds, 
+     */
+     IMPORT_C void CopyMessagesL(	const RArray<TFSMailMsgId>& aMessageIds,
 							  		RArray<TFSMailMsgId>& aCopiedMessages,
-                              		const TFSMailMsgId aSourceFolderId, 
+                              		const TFSMailMsgId aSourceFolderId,
                               		const TFSMailMsgId aDestinationFolderId );
-                              		
+
     /**
      * Asyncronous call for starting search for given string. Only one search can be
      * performed at a time.
@@ -359,12 +334,12 @@
      * This function will search for message's containing the given search string.
      * The search will be performed on the all message fields: To, Cc, Bcc, subject, body.
      * The search client will be notified of each found message,
-     * and upon completion of the search.  Only one search can be performed at a time.  
-     *  
+     * and upon completion of the search.  Only one search can be performed at a time.
+     *
      * To change the sort order in the search result, use the same search string in the
      * but change the aSortCriteria parameter.  The store "caches" the search
      * 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,
@@ -374,7 +349,7 @@
 	 * @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 );
@@ -383,28 +358,29 @@
      * 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 
+     * 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();
 
     /**
      * Inform the store to clean up its cache for search results.
-     *        
+     *
      *  This method cancels the the ongoing search (if exists), and then clean ups store's cache.
-     * 
+     *
      *  This function should be called by the UI when search results are no longer in display.
      */
      IMPORT_C void ClearSearchResultCache();
 
+
 	/**
 	 * DEPRECATED
 	 *
      * @param aFolderId...
      * @param aObserver observer
-     */    
+     */
 	 IMPORT_C void AddObserver(const TFSMailMsgId aFolderId, MFSMailEventObserver& aObserver);
 
     /**
@@ -449,13 +425,12 @@
      */
   	 CFSMailBox();
 
+ private: // data
 
- private: // data
- 
     /**
      * request handler for plugin requests
      */
-	 CFSMailRequestHandler* 	iRequestHandler;	
+	 CFSMailRequestHandler* 	iRequestHandler;
 
 	/**
      * mailbox folder list
--- a/emailservices/emailcommon/inc/CFSMailBoxBase.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBoxBase.h	Fri Sep 03 14:07:42 2010 +0300
@@ -98,6 +98,23 @@
      * @param aUid settings view id
      */
      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
+	 */ 
+     IMPORT_C MMRInfoProcessor& MRInfoProcessorL();
+
+    /**
+     * method to cheack if MRInfoProcessor is set
+     *
+     * @return
+     */
+	 IMPORT_C TBool IsMRInfoProcessorSet();
+
 	/**
 	 * Meeting request info processor mutator
 	 *
--- a/emailservices/emailcommon/inc/CFSMailMessagePart.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailMessagePart.h	Fri Sep 03 14:07:42 2010 +0300
@@ -266,7 +266,19 @@
      * @return content file handle 
      */
      IMPORT_C RFile GetContentFileL();
-       
+        
+    /**
+     * copies contents of this message part to given file
+     *
+     * @param aContentLocation defines file location as 
+     * a) directory, when plugin finds out corresponding file name
+     *    related to this part id, in this case last character should
+     *    be '/'
+     * b) directory & filename, when both directory and file name
+     *    are given by user
+     * 
+     */        
+     IMPORT_C void CopyContentFileL(const TDesC& aContentLocation);
     
     /**
      * returns email part full content size (in bytes)
@@ -295,6 +307,20 @@
      IMPORT_C void SetFetchedContentSize(TUint aContentSize);
 
     /**
+     * returns email part content current fetch state
+     * Intended as utility function for UI.
+     * If (0 == FetchedContentSize())
+     *    return EFSNone;
+     * else if (FetchedContentSize() < ContentSize()) then
+     *    return EFSPartial
+     * else
+     *    return EFSFull
+     *
+     * @return email fetch state (EFSNone / EFSPartial / EFSFull)
+     */
+     IMPORT_C TFSPartFetchState FetchLoadState() const;
+
+    /**
      * copies email part contents to buffer given by user
      *
      * @param aBuffer buffer owned by user
--- a/emailservices/emailcommon/inc/CFSMailRequestHandler.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailRequestHandler.h	Fri Sep 03 14:07:42 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"
@@ -53,7 +53,7 @@
     };
 
 public: // data
-		        
+
     /** request id */
     TInt                       iRequestId;
 
@@ -72,12 +72,12 @@
  *
  *  @lib FSFWCommonLib
  *  @since S60 v3.1
- */ 
+ */
 class EMAILCOMMON_EXPORT CFSMailRequestHandler : public CBase
 	{
 
 public:
-  
+
     /**
      * destructor.
      */
@@ -124,7 +124,7 @@
      * @param aRequestId id of the request to be cancelled
      */
       void CancelRequestL( TInt aRequestId );
-	 
+
     /**
      * cancels all pending asynchronous requests
      *
@@ -148,20 +148,8 @@
       void AddPluginL( TUid aPluginId, CFSMailPlugin* aPlugin );
 
      /**
-      * cleans temp dir
-      * 
-      */
-      void CleanTempDirL( );
-
-     /**
-      * returns temp dir path
-      * 
-      */
-      TDesC& GetTempDirL( );
-
-     /**
       * opens or creates file
-      * 
+      *
       * @param aFileName file name
       */
      // <qmail>
@@ -173,7 +161,7 @@
      * C++ default constructor.
      */
   	 CFSMailRequestHandler();
-  	 
+
     /**
      * two based constructor
      */
@@ -185,7 +173,7 @@
     /** list of loaded plugins */
 	 RPointerArray<CFSMailPluginData>    iPluginList;
 
-private: 
+private:
 
     /** removes all asynchronous requests */
     void RemoveAllRequests();
@@ -194,11 +182,11 @@
 
     /** list of pending requests */
 	 RArray<TFSPendingRequest>           iPendingRequests;
-	
+
 	/** request id counter       */
     TUint                                iRequestId;
 
-    /** temp directory files handling        */ 
+    /** temp directory files handling        */
     RFs                                  iFs;
     HBufC                                *iTempDirName;
     };
--- a/emailservices/emailcommon/src/CFSMailBox.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailBox.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -40,12 +40,12 @@
 EXPORT_C CFSMailBox* CFSMailBox::NewLC(TFSMailMsgId aMailBoxId)
 {
     NM_FUNCTION;
-    
+
     CFSMailBox* api = new (ELeave) CFSMailBox();
     CleanupStack:: PushL(api);
     api->ConstructL(aMailBoxId);
     return api;
-} 
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailBox::NewL
@@ -53,7 +53,7 @@
 EXPORT_C CFSMailBox* CFSMailBox::NewL(TFSMailMsgId aMailBoxId)
 {
     NM_FUNCTION;
-    
+
     CFSMailBox* api =  CFSMailBox::NewLC(aMailBoxId);
     CleanupStack:: Pop(api);
     return api;
@@ -65,7 +65,7 @@
 CFSMailBox::CFSMailBox()
 {
     NM_FUNCTION;
-    
+
     // get requesthandler pointer
     iRequestHandler = static_cast<CFSMailRequestHandler*>(Dll::Tls());
 }
@@ -86,7 +86,7 @@
 void CFSMailBox::ConstructL(TFSMailMsgId aMailBoxId)
 {
     NM_FUNCTION;
-    
+
 // <qmail>
     CFSMailBoxBase::ConstructL(aMailBoxId);
 // </qmail>
@@ -98,7 +98,7 @@
 EXPORT_C void CFSMailBox::GoOnlineL()
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->GoOnlineL( GetId() );
@@ -111,43 +111,12 @@
 EXPORT_C void CFSMailBox::GoOfflineL()
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->GoOfflineL( GetId() );
         }
-        
     }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::CancelSyncL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::CancelSyncL()
-    {
-    NM_FUNCTION;
-    
-    if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
-        {
-        plugin->CancelSyncL( GetId() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::GetLastSyncStatusL
-// -----------------------------------------------------------------------------
-EXPORT_C TFSProgress CFSMailBox::GetLastSyncStatusL()
-    {
-    NM_FUNCTION;
-    
-    TFSProgress progress;
-    progress.iError = EFalse;
-    if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
-        {
-        progress = plugin->GetLastSyncStatusL( GetId() );       
-        }
-    return progress;
-    }
-
 // -----------------------------------------------------------------------------
 // CFSMailBox::RefreshNowL
 // -----------------------------------------------------------------------------
@@ -155,7 +124,7 @@
     MFSMailRequestObserver& aOperationObserver )
     {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
     request.iRequestId = 0;
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
@@ -180,7 +149,7 @@
 EXPORT_C TInt CFSMailBox::RefreshNowL( )
     {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
     request.iRequestId = 0;
     MFSMailRequestObserver* observer = NULL;
@@ -188,7 +157,7 @@
         {
         // init asynchronous request
         request = iRequestHandler->InitAsyncRequestL( GetId().PluginId(), *observer );
-        
+
         observer = request.iObserver;
         TRAPD(err,plugin->RefreshNowL( GetId(), *observer, request.iRequestId));
         if(err != KErrNone)
@@ -206,7 +175,7 @@
 EXPORT_C CFSMailMessage* CFSMailBox::CreateMessageToSend( )
 {
     NM_FUNCTION;
-    
+
     CFSMailMessage* message(NULL);
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
@@ -227,11 +196,11 @@
         MFSMailRequestObserver& aOperationObserver )
     {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
-    
+
     CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() );
-    
+
     if ( plugin )
         {
         // init asynchronous request
@@ -240,7 +209,7 @@
 
         MFSMailRequestObserver* observer = request.iObserver;
 
-        TRAPD( err, plugin->CreateMessageToSendL( 
+        TRAPD( err, plugin->CreateMessageToSendL(
             GetId(), *observer, request.iRequestId ) );
 
         if( err != KErrNone )
@@ -248,29 +217,29 @@
             iRequestHandler->CompleteRequest( request.iRequestId );
             User::Leave( err );
             }
-        }    
+        }
     else
         {
         User::Leave( KErrNotFound );
         }
-    
+
     return request.iRequestId;
     }
 // </qmail>
 
 //<qmail>
-EXPORT_C int CFSMailBox::UpdateMessageFlagsL( 
+EXPORT_C int CFSMailBox::UpdateMessageFlagsL(
     const TFSMailMsgId aMailboxId,
     RPointerArray<CFSMailMessage> &messages,
     MFSMailRequestObserver& aOperationObserver)
 {
     NM_FUNCTION;
-    
+
     Q_UNUSED(aMailboxId);
     TFSPendingRequest request;
-        
+
     CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() );
-    
+
     if ( plugin )
         {
         // init asynchronous request
@@ -279,8 +248,8 @@
 
         MFSMailRequestObserver* observer = request.iObserver;
 
-        TRAPD( err, plugin->StoreMessagesL( 
-                GetId(), 
+        TRAPD( err, plugin->StoreMessagesL(
+                GetId(),
                 messages,
                 *observer, request.iRequestId ) );
 
@@ -294,9 +263,9 @@
         {
         User::Leave( KErrNotFound );
         }
-    
+
     return request.iRequestId;
-    
+
 }
 //</qmail>
 
@@ -307,11 +276,11 @@
                                                             const TDesC& aHeaderDescriptor )
 {
     NM_FUNCTION;
-    
+
     CFSMailMessage* message(NULL);
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
-        TRAPD(err,message = plugin->CreateForwardMessageL( GetId(), 
+        TRAPD(err,message = plugin->CreateForwardMessageL( GetId(),
                                                                 aOriginalMessageId,
                                                                 aHeaderDescriptor ));
         if(err != KErrNone)
@@ -331,11 +300,11 @@
                         const TDesC& aHeaderDescriptor )
     {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
-    
+
     CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() );
-    
+
     if ( plugin )
         {
         // init asynchronous request
@@ -344,7 +313,7 @@
 
         MFSMailRequestObserver* observer = request.iObserver;
 
-        TRAPD( err, plugin->CreateForwardMessageL( 
+        TRAPD( err, plugin->CreateForwardMessageL(
             GetId(), aOriginalMessageId, *observer, request.iRequestId, aHeaderDescriptor ) );
 
         if( err != KErrNone )
@@ -352,12 +321,12 @@
             iRequestHandler->CompleteRequest( request.iRequestId );
             User::Leave( err );
             }
-        }    
+        }
     else
         {
         User::Leave( KErrNotFound );
         }
-    
+
     return request.iRequestId;
     }
 // </qmail>
@@ -370,7 +339,7 @@
                                                          const TDesC& aHeaderDescriptor )
 {
     NM_FUNCTION;
-    
+
     CFSMailMessage* message = NULL;
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
@@ -396,11 +365,11 @@
                                       const TDesC& aHeaderDescriptor )
 {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
-    
+
     CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() );
-    
+
     if ( plugin )
         {
         // init asynchronous request
@@ -409,7 +378,7 @@
 
         MFSMailRequestObserver* observer = request.iObserver;
 
-        TRAPD( err, plugin->CreateReplyMessageL( 
+        TRAPD( err, plugin->CreateReplyMessageL(
             GetId(), aOriginalMessageId, aReplyToAll, *observer, request.iRequestId, aHeaderDescriptor ) );
 
         if( err != KErrNone )
@@ -417,12 +386,12 @@
             iRequestHandler->CompleteRequest( request.iRequestId );
             User::Leave( err );
             }
-        }    
+        }
     else
         {
         User::Leave( KErrNotFound );
         }
-    
+
     return request.iRequestId;
 }
 // </qmail>
@@ -433,7 +402,7 @@
 EXPORT_C TFSMailMsgId CFSMailBox::GetStandardFolderId(TFSFolderType aFolderType)
 {
     NM_FUNCTION;
-    
+
     TFSMailMsgId folderId;
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
@@ -452,7 +421,7 @@
 EXPORT_C void CFSMailBox::SendMessageL( CFSMailMessage& aMessage )
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         // <qmail> Removed UpdateMrusL. </qmail>
@@ -509,7 +478,7 @@
                                         RPointerArray<CFSMailFolder>& aFolderList)
 {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
     {
         TRAPD(err, plugin->ListFoldersL(GetId(),aFolder,aFolderList));
@@ -524,9 +493,9 @@
 // CFSMailBox::ListFolders
 // -----------------------------------------------------------------------------
 EXPORT_C RPointerArray<CFSMailFolder>& CFSMailBox::ListFolders( )
-{   
+{
     NM_FUNCTION;
-    
+
     iFolders.ResetAndDestroy();
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
     {
@@ -541,29 +510,14 @@
 }
 
 // -----------------------------------------------------------------------------
-// CFSMailBox::GetBrandingIdL
-// -----------------------------------------------------------------------------
-EXPORT_C TDesC& CFSMailBox::GetBrandingIdL( )
-{
-    NM_FUNCTION;
-	if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
-        {
-        TDesC& result = plugin->GetBrandingIdL( GetId() );
-        return result;
-        }
-    
-    return BrandingId();
-}
-
-// -----------------------------------------------------------------------------
 // CFSMailBox::MoveMessagesL
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::MoveMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
-                                         const TFSMailMsgId aSourceFolderId, 
+EXPORT_C void CFSMailBox::MoveMessagesL( const RArray<TFSMailMsgId>& aMessageIds,
+                                         const TFSMailMsgId aSourceFolderId,
                                          const TFSMailMsgId aDestinationFolderId )
 {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->MoveMessagesL(GetId(), aMessageIds, aSourceFolderId, aDestinationFolderId);
@@ -574,12 +528,12 @@
 // CFSMailBox::MoveMessagesL
 // -----------------------------------------------------------------------------
 EXPORT_C TInt CFSMailBox::MoveMessagesL( MFSMailRequestObserver& aOperationObserver,
-                                         const RArray<TFSMailMsgId>& aMessageIds, 
-                                         const TFSMailMsgId aSourceFolderId, 
+                                         const RArray<TFSMailMsgId>& aMessageIds,
+                                         const TFSMailMsgId aSourceFolderId,
                                          const TFSMailMsgId aDestinationFolderId )
 {
     NM_FUNCTION;
-    
+
     TFSPendingRequest request;
     request.iRequestId = 0;
     if( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
@@ -588,11 +542,11 @@
         request = iRequestHandler->InitAsyncRequestL( GetId().PluginId(),
                                                         aOperationObserver );
         plugin->MoveMessagesL(
-            GetId(), 
-            aMessageIds, 
-            aSourceFolderId, 
-            aDestinationFolderId, 
-            aOperationObserver, 
+            GetId(),
+            aMessageIds,
+            aSourceFolderId,
+            aDestinationFolderId,
+            aOperationObserver,
             request.iRequestId );
         }
     return request.iRequestId;
@@ -601,20 +555,20 @@
 // -----------------------------------------------------------------------------
 // CFSMailBox::CopyMessagesL
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::CopyMessagesL( const RArray<TFSMailMsgId>& aMessageIds, 
-                                         RArray<TFSMailMsgId>& aNewMessages, 
-                                         const TFSMailMsgId aSourceFolderId, 
+EXPORT_C void CFSMailBox::CopyMessagesL( const RArray<TFSMailMsgId>& aMessageIds,
+                                         RArray<TFSMailMsgId>& aNewMessages,
+                                         const TFSMailMsgId aSourceFolderId,
                                          const TFSMailMsgId aDestinationFolderId )
 {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->CopyMessagesL(GetId(), aMessageIds, aNewMessages,
-                                aSourceFolderId, aDestinationFolderId );    
+                                aSourceFolderId, aDestinationFolderId );
         }
 }
-    
+
 // -----------------------------------------------------------------------------
 // CFSMailBox::SearchL
 // -----------------------------------------------------------------------------
@@ -623,7 +577,7 @@
                                    MFSMailBoxSearchObserver& aSearchObserver )
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
 
@@ -633,10 +587,10 @@
 
         TFSMailMsgId draftsFolderId = GetStandardFolderId( EFSDraftsFolder );
         TFSMailMsgId outboxId = GetStandardFolderId( EFSOutbox );
-        
+
         // remove outbox, drafts folder from folder list
         RArray<TFSMailMsgId> folderIds;
-        CleanupClosePushL( folderIds );  
+        CleanupClosePushL( folderIds );
         for(TInt i=0;i<iFolders.Count();i++)
         {
             TFSMailMsgId id = iFolders[i]->GetFolderId();
@@ -645,7 +599,7 @@
                 folderIds.AppendL(id);
             }
         }
-        
+
         // start search
         plugin->SearchL( GetId(), folderIds, aSearchStrings, aSortCriteria, aSearchObserver );
         CleanupStack::PopAndDestroy( &folderIds );
@@ -658,7 +612,7 @@
 EXPORT_C void CFSMailBox::CancelSearch()
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->CancelSearch( GetId() );
@@ -671,7 +625,7 @@
 EXPORT_C void CFSMailBox::ClearSearchResultCache()
     {
     NM_FUNCTION;
-    
+
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         plugin->ClearSearchResultCache( GetId() );
@@ -684,7 +638,7 @@
 EXPORT_C TSSMailSyncState CFSMailBox::CurrentSyncState() const
     {
     NM_FUNCTION;
-    
+
     TSSMailSyncState syncState(Idle);
     if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
         {
@@ -693,14 +647,13 @@
     return syncState;
     }
 
-
 // -----------------------------------------------------------------------------
 // CFSMailBox::GetMailBoxStatus
 // -----------------------------------------------------------------------------
 EXPORT_C TFSMailBoxStatus CFSMailBox::GetMailBoxStatus()
 {
     NM_FUNCTION;
-    
+
     TFSMailBoxStatus status(EFSMailBoxOffline);
     if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId() ) )
     {
@@ -709,8 +662,6 @@
     return status;
 }
 
-
-
 // -----------------------------------------------------------------------------
 // CFSMailBox::ReleaseExtension
 // -----------------------------------------------------------------------------
@@ -718,25 +669,25 @@
     {
     NM_FUNCTION;
 	// <qmail> Not using KMailboxExtMrCalInfo
-    
+
     // no specialized behaviour, call base class
     CExtendableEmail::ReleaseExtension( aExtension );
 	// </qmail>
     }
-    
+
 // -----------------------------------------------------------------------------
 // CFSMailBox::ExtensionL
 // -----------------------------------------------------------------------------
 EXPORT_C CEmailExtension* CFSMailBox::ExtensionL( const TUid& aInterfaceUid )
     {
     NM_FUNCTION;
-    
+
     CEmailExtension* extension = NULL;
 // <qmail>
-    extension = CExtendableEmail::ExtensionL( aInterfaceUid );    
+    extension = CExtendableEmail::ExtensionL( aInterfaceUid );
     if ( aInterfaceUid == KMailboxExtMrCalInfo )
         {
-// </qmail>        
+// </qmail>
         if ( !extension )
             {
             extension = new ( ELeave ) CMRCalendarInfoImpl();
@@ -744,7 +695,7 @@
             iExtensions.AddL( extension );
             CleanupStack::Pop(); // calInfo
             }
-        }    
+        }
     else if ( aInterfaceUid == KEmailMailboxStateExtensionUid )
 		// <qmail> Not using KEmailSettingExtensionUid or KEmailConnectionStatusQueryExtensionUid </qmail>
         {
@@ -756,7 +707,7 @@
                 // request extension from plugin, leaves if not supported
                 extension = plugin->ExtensionL( aInterfaceUid );
                 }
-    
+
             }
         }
     else
--- a/emailservices/emailcommon/src/CFSMailBoxBase.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailBoxBase.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -194,6 +194,34 @@
     
 		iSettingsUid = aUid;
 	}
+
+// -----------------------------------------------------------------------------
+// CFSMailBoxBase::MRInfoProcessorL
+// -----------------------------------------------------------------------------
+EXPORT_C MMRInfoProcessor& CFSMailBoxBase::MRInfoProcessorL()
+	{
+    NM_FUNCTION;
+    
+	return *iMRInfoProcessor;
+	}
+
+// -----------------------------------------------------------------------------
+// CFSMailBoxBase::IsMRInfoProcessorSet
+// -----------------------------------------------------------------------------
+EXPORT_C TBool CFSMailBoxBase::IsMRInfoProcessorSet()
+	{
+    NM_FUNCTION;
+    
+	if(iMRInfoProcessor)
+		{
+		return ETrue;
+		}
+	else
+		{
+		return EFalse;
+		}
+	}
+
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetMRInfoProcessorL
 // -----------------------------------------------------------------------------
--- a/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -517,6 +517,19 @@
 	return iFile;
 	}
 
+// -----------------------------------------------------------------------------
+// CFSMailMessagePart::CopyContentFileL
+// -----------------------------------------------------------------------------
+EXPORT_C void CFSMailMessagePart::CopyContentFileL( const TDesC& aFilePath )
+	{
+    NM_FUNCTION;
+    
+	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetPartId()))
+		{
+		plugin->CopyMessagePartFileL( GetMailBoxId(), GetFolderId(),
+			GetMessageId(), GetPartId(), aFilePath);		
+		}
+	}
 
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::GetContentToBufferL
@@ -1186,7 +1199,37 @@
 //</qmail>
 	}
 
-
+// -----------------------------------------------------------------------------
+// CFSMailMessagePart::FetchLoadState
+// -----------------------------------------------------------------------------
+EXPORT_C TFSPartFetchState CFSMailMessagePart::FetchLoadState() const
+	{
+    NM_FUNCTION;
+    
+//<qmail>
+	 if(iMessagePartsStatus != EFSDefault)
+		{
+		return iMessagePartsStatus;
+		}
+     else if (iNmPrivateMessagePart->mSize == 0)
+     	{
+     	return EFSFull;     	
+     	}
+     else if(iNmPrivateMessagePart->mFetchedSize == 0)
+     	{
+     	return EFSNone;
+     	}
+     else if (iNmPrivateMessagePart->mFetchedSize < iNmPrivateMessagePart->mSize)
+     	{
+     	return EFSPartial;
+     	}
+     else
+     	{
+     	return EFSFull;
+     	}
+//</qmail>
+	}
+	
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::FetchMessagePartL
 // -----------------------------------------------------------------------------
--- a/emailservices/emailcommon/src/CFSMailRequestHandler.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailRequestHandler.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -26,7 +26,7 @@
 #include "CFSMailRequestObserver.h"
 
 
-// ================= MEMBER FUNCTIONS ==========================================    
+// ================= MEMBER FUNCTIONS ==========================================
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::CFSMailRequestHandler
 // -----------------------------------------------------------------------------
@@ -37,10 +37,10 @@
     // store pointer to TLS
     TInt err = Dll::SetTls(static_cast<TAny*>(this));
 
-    // reset 
+    // reset
     iPendingRequests.Reset();
     iPluginList.Reset();
-    
+
     iTempDirName =NULL;
 }
 
@@ -50,19 +50,19 @@
  CFSMailRequestHandler::~CFSMailRequestHandler()
     {
     NM_FUNCTION;
-    
+
     TRAP_IGNORE( CancelAllRequestsL() );
     RemoveAllRequests();
     iPendingRequests.Reset();
     iPluginList.ResetAndDestroy();
-    
+
     if(iTempDirName)
         {
         delete iTempDirName;
         // close file server connection
-        iFs.Close();        
+        iFs.Close();
         }
-    
+
     // clear TLS
     Dll::FreeTls();
     }
@@ -70,28 +70,28 @@
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::NewLC
 // -----------------------------------------------------------------------------
- CFSMailRequestHandler* CFSMailRequestHandler::NewLC( 
+ CFSMailRequestHandler* CFSMailRequestHandler::NewLC(
                                     RPointerArray<CImplementationInformation>& aPluginInfo,
                                     RPointerArray<CFSMailPlugin>& aPlugins )
 {
     NM_FUNCTION;
-    
+
     CFSMailRequestHandler* pluginHandler = new (ELeave) CFSMailRequestHandler();
     CleanupStack:: PushL(pluginHandler);
     pluginHandler->ConstructL( aPluginInfo, aPlugins );
     return pluginHandler;
-} 
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::NewL
 // -----------------------------------------------------------------------------
- CFSMailRequestHandler* CFSMailRequestHandler::NewL( 
+ CFSMailRequestHandler* CFSMailRequestHandler::NewL(
                                     RPointerArray<CImplementationInformation>& aPluginInfo,
                                     RPointerArray<CFSMailPlugin>& aPlugins )
 {
     NM_FUNCTION;
-    
-    CFSMailRequestHandler* pluginHandler =  
+
+    CFSMailRequestHandler* pluginHandler =
         CFSMailRequestHandler::NewLC( aPluginInfo, aPlugins );
     CleanupStack:: Pop(pluginHandler);
     return pluginHandler;
@@ -100,7 +100,7 @@
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::ConstructL
 // -----------------------------------------------------------------------------
-void CFSMailRequestHandler::ConstructL( 
+void CFSMailRequestHandler::ConstructL(
                                 RPointerArray<CImplementationInformation> /*aPluginInfo*/,
                                 RPointerArray<CFSMailPlugin> /*aPlugins*/ )
 {
@@ -125,16 +125,16 @@
 
     return NULL;
     }
-    
+
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::InitAsyncRequestL
 // -----------------------------------------------------------------------------
- TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL( 
+ TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL(
                                                     TUid aPluginId,
                                                     MFSMailRequestObserver& aOperationObserver)
     {
     NM_FUNCTION;
-    
+
         TFSPendingRequest newRequest;
         for(TInt i=0;i<iPendingRequests.Count();i++)
             {
@@ -142,7 +142,7 @@
                 {
                 iPendingRequests[i].iPluginId = aPluginId;
                 iPendingRequests[i].iRequestStatus = TFSPendingRequest::EFSRequestPending;
-                iPendingRequests[i].iObserver->SetUserObserver(aOperationObserver);         
+                iPendingRequests[i].iObserver->SetUserObserver(aOperationObserver);
                 newRequest = iPendingRequests[i];
                 return newRequest;
                 }
@@ -150,12 +150,12 @@
 
         newRequest.iRequestId = iPendingRequests.Count();
         newRequest.iPluginId = aPluginId;
-        newRequest.iRequestStatus = TFSPendingRequest::EFSRequestPending;           
-        CFSMailRequestObserver* observer = 
+        newRequest.iRequestStatus = TFSPendingRequest::EFSRequestPending;
+        CFSMailRequestObserver* observer =
             CFSMailRequestObserver::NewL(*this, aOperationObserver);
         newRequest.iObserver = observer;
         iPendingRequests.AppendL(newRequest);
-        
+
         return newRequest;
     }
 
@@ -165,7 +165,7 @@
  void CFSMailRequestHandler::CompleteRequest( TInt aRequestId )
     {
     NM_FUNCTION;
-    
+
         for(TInt i=0;i<iPendingRequests.Count();i++)
         {
         if(iPendingRequests[i].iRequestId == aRequestId)
@@ -176,14 +176,14 @@
         }
 
     }
-    
+
 // -----------------------------------------------------------------------------
 // CFSMailRequestHandler::CancelRequestL
 // -----------------------------------------------------------------------------
  void CFSMailRequestHandler::CancelRequestL( TInt aRequestId )
     {
     NM_FUNCTION;
-    
+
         for(TInt i=0;i<iPendingRequests.Count();i++)
         {
         if(iPendingRequests[i].iRequestId == aRequestId &&
@@ -206,7 +206,7 @@
  void CFSMailRequestHandler::CancelAllRequestsL( )
     {
     NM_FUNCTION;
-    
+
         for(TInt i=0;i<iPendingRequests.Count();i++)
         {
             if(iPendingRequests[i].iRequestStatus == TFSPendingRequest::EFSRequestPending)
@@ -231,7 +231,7 @@
     CFSMailPluginData* pluginData = new (ELeave) CFSMailPluginData;
     pluginData->iPluginId = aPluginId;
     pluginData->iPlugin = aPlugin;
-    iPluginList.AppendL(pluginData);             
+    iPluginList.AppendL(pluginData);
     }
 
 // -----------------------------------------------------------------------------
@@ -240,7 +240,7 @@
 void CFSMailRequestHandler::RemoveAllRequests()
     {
     NM_FUNCTION;
-    
+
     for(TInt i=0;i<iPendingRequests.Count();i++)
         {
         delete iPendingRequests[i].iObserver;
@@ -254,18 +254,18 @@
  RFile CFSMailRequestHandler::GetTempFileL( TFSMailMsgId aContentId, TFileName aFileName )
 {
     NM_FUNCTION;
-    
+
     // get temp dir path
-    if(iTempDirName == NULL)
+    if(!iTempDirName)
         {
         // open file server connection
         User::LeaveIfError(iFs.Connect());
         iFs.CreatePrivatePath(EDriveC);
         iTempDirName = HBufC::NewL(20);
         TPtr ptr = iTempDirName->Des();
-        iFs.PrivatePath(ptr);        
+        iFs.PrivatePath(ptr);
         }
-    
+
     // create temp file
     RFile file;
     aFileName.Append(iTempDirName->Des());
@@ -275,21 +275,3 @@
     return file;
     }
 
-// -----------------------------------------------------------------------------
-// CFSMailRequestHandler::CleanTempDirL
-// -----------------------------------------------------------------------------
- void CFSMailRequestHandler::CleanTempDirL( )
-    {
-    NM_FUNCTION;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailRequestHandler::GetTempDirL
-// -----------------------------------------------------------------------------
- TDesC& CFSMailRequestHandler::GetTempDirL( )
-    {
-    NM_FUNCTION;
-    
-    return *iTempDirName;
-    }
-
--- a/emailservices/emailframework/bwins/fsmailframeworku.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/bwins/fsmailframeworku.def	Fri Sep 03 14:07:42 2010 +0300
@@ -2,32 +2,23 @@
 	?DeleteMailBoxByUidL@CFSMailClient@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 1 NONAME ; int CFSMailClient::DeleteMailBoxByUidL(class TFSMailMsgId, class MFSMailRequestObserver &)
 	?CancelL@CFSMailClient@@QAEXH@Z @ 2 NONAME ; void CFSMailClient::CancelL(int)
 	?ReleaseExtension@CFSMailClient@@UAEXPAVCEmailExtension@@@Z @ 3 NONAME ; void CFSMailClient::ReleaseExtension(class CEmailExtension *)
-	?CleanTempDirL@CFSMailClient@@QAEXXZ @ 4 NONAME ; void CFSMailClient::CleanTempDirL(void)
-	?Close@CFSMailClient@@QAEXXZ @ 5 NONAME ; void CFSMailClient::Close(void)
-	?DeleteMessagesByUidL@CFSMailClient@@QAEXVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 6 NONAME ; void CFSMailClient::DeleteMessagesByUidL(class TFSMailMsgId, class TFSMailMsgId, class RArray<class TFSMailMsgId> const &)
-	?WizardDataAvailableL@CFSMailClient@@QAEHXZ @ 7 NONAME ; int CFSMailClient::WizardDataAvailableL(void)
-	?ListMailBoxes@CFSMailClient@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailBox@@@@@Z @ 8 NONAME ; int CFSMailClient::ListMailBoxes(class TFSMailMsgId, class RPointerArray<class CFSMailBox> &)
-	?GetTempDirL@CFSMailClient@@QAEAAVTDesC16@@XZ @ 9 NONAME ; class TDesC16 & CFSMailClient::GetTempDirL(void)
-	?GetFolderByUidL@CFSMailClient@@QAEPAVCFSMailFolder@@VTFSMailMsgId@@0@Z @ 10 NONAME ; class CFSMailFolder * CFSMailClient::GetFolderByUidL(class TFSMailMsgId, class TFSMailMsgId)
-	?ExtensionL@CFSMailClient@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 11 NONAME ; class CEmailExtension * CFSMailClient::ExtensionL(class TUid const &)
-	?PrepareMrDescriptionL@CFSMailClient@@UAEXABVTFSMailMsgId@@0@Z @ 12 NONAME ; void CFSMailClient::PrepareMrDescriptionL(class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?NewL@CFSMailClient@@SAPAV1@H@Z @ 13 NONAME ; class CFSMailClient * CFSMailClient::NewL(int)
-	?SetMailboxName@CFSMailClient@@QAEXVTFSMailMsgId@@ABVTDesC16@@@Z @ 14 NONAME ; void CFSMailClient::SetMailboxName(class TFSMailMsgId, class TDesC16 const &)
-	?GetMessageByUidL@CFSMailClient@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 15 NONAME ; class CFSMailMessage * CFSMailClient::GetMessageByUidL(class TFSMailMsgId, class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails)
-	?GetMailBoxByUidL@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 16 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidL(class TFSMailMsgId)
-	?AuthenticateL@CFSMailClient@@QAEHAAVMFSMailRequestObserver@@@Z @ 17 NONAME ; int CFSMailClient::AuthenticateL(class MFSMailRequestObserver &)
-	?GetBrandManagerL@CFSMailClient@@QAEAAVMFSMailBrandManager@@XZ @ 18 NONAME ; class MFSMailBrandManager & CFSMailClient::GetBrandManagerL(void)
-	??1CFSMailClient@@EAE@XZ @ 19 NONAME ; CFSMailClient::~CFSMailClient(void)
-	?NewLC@CFSMailClient@@SAPAV1@H@Z @ 20 NONAME ; class CFSMailClient * CFSMailClient::NewLC(int)
-	?UnregisterRequestObserver@CFSMailClient@@QAEXH@Z @ 21 NONAME ; void CFSMailClient::UnregisterRequestObserver(int)
-	?RemoveObserver@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 22 NONAME ; void CFSMailClient::RemoveObserver(class MFSMailEventObserver &)
-	?SubscribeMailboxEventsL@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 23 NONAME ; void CFSMailClient::SubscribeMailboxEventsL(class TFSMailMsgId, class MFSMailEventObserver &)
-	?ListMessages@CFSMailClient@@QAEPAVMFSMailIterator@@VTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 24 NONAME ; class MFSMailIterator * CFSMailClient::ListMessages(class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
-	?UnsubscribeMailboxEvents@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 25 NONAME ; void CFSMailClient::UnsubscribeMailboxEvents(class TFSMailMsgId, class MFSMailEventObserver &)
-	?CancelAllL@CFSMailClient@@QAEXXZ @ 26 NONAME ; void CFSMailClient::CancelAllL(void)
-	?GetMailBoxByUidLC@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 27 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidLC(class TFSMailMsgId)
-	?NewL@CFSMailClient@@SAPAV1@XZ @ 28 NONAME ; class CFSMailClient * CFSMailClient::NewL(void)
-	?AddObserverL@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 29 NONAME ; void CFSMailClient::AddObserverL(class MFSMailEventObserver &)
-	?IncReferenceCount@CFSMailClient@@QAEHXZ @ 30 NONAME ; int CFSMailClient::IncReferenceCount(void)
-	?GetSignatureL@CFSMailClient@@QAEPAVHBufC16@@ABVTFSMailMsgId@@@Z @ 31 NONAME ; class HBufC16 * CFSMailClient::GetSignatureL(class TFSMailMsgId const &)
+	?Close@CFSMailClient@@QAEXXZ @ 4 NONAME ; void CFSMailClient::Close(void)
+	?DeleteMessagesByUidL@CFSMailClient@@QAEXVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 5 NONAME ; void CFSMailClient::DeleteMessagesByUidL(class TFSMailMsgId, class TFSMailMsgId, class RArray<class TFSMailMsgId> const &)
+	?ListMailBoxes@CFSMailClient@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailBox@@@@@Z @ 6 NONAME ; int CFSMailClient::ListMailBoxes(class TFSMailMsgId, class RPointerArray<class CFSMailBox> &)
+	?GetFolderByUidL@CFSMailClient@@QAEPAVCFSMailFolder@@VTFSMailMsgId@@0@Z @ 7 NONAME ; class CFSMailFolder * CFSMailClient::GetFolderByUidL(class TFSMailMsgId, class TFSMailMsgId)
+	?ExtensionL@CFSMailClient@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 8 NONAME ; class CEmailExtension * CFSMailClient::ExtensionL(class TUid const &)
+	?NewL@CFSMailClient@@SAPAV1@H@Z @ 9 NONAME ; class CFSMailClient * CFSMailClient::NewL(int)
+	?GetMessageByUidL@CFSMailClient@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 10 NONAME ; class CFSMailMessage * CFSMailClient::GetMessageByUidL(class TFSMailMsgId, class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails)
+	?GetMailBoxByUidL@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 11 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidL(class TFSMailMsgId)
+	??1CFSMailClient@@EAE@XZ @ 12 NONAME ; CFSMailClient::~CFSMailClient(void)
+	?NewLC@CFSMailClient@@SAPAV1@H@Z @ 13 NONAME ; class CFSMailClient * CFSMailClient::NewLC(int)
+	?GetSignatureL@CFSMailClient@@QAEPAVHBufC16@@ABVTFSMailMsgId@@@Z @ 14 NONAME ; class HBufC16 * CFSMailClient::GetSignatureL(class TFSMailMsgId const &)
+	?RemoveObserver@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 15 NONAME ; void CFSMailClient::RemoveObserver(class MFSMailEventObserver &)
+	?SubscribeMailboxEventsL@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 16 NONAME ; void CFSMailClient::SubscribeMailboxEventsL(class TFSMailMsgId, class MFSMailEventObserver &)
+	?ListMessages@CFSMailClient@@QAEPAVMFSMailIterator@@VTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 17 NONAME ; class MFSMailIterator * CFSMailClient::ListMessages(class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
+	?UnsubscribeMailboxEvents@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 18 NONAME ; void CFSMailClient::UnsubscribeMailboxEvents(class TFSMailMsgId, class MFSMailEventObserver &)
+	?NewL@CFSMailClient@@SAPAV1@XZ @ 19 NONAME ; class CFSMailClient * CFSMailClient::NewL(void)
+	?AddObserverL@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 20 NONAME ; void CFSMailClient::AddObserverL(class MFSMailEventObserver &)
+	?IncReferenceCount@CFSMailClient@@QAEHXZ @ 21 NONAME ; int CFSMailClient::IncReferenceCount(void)
+	?PrepareMrDescriptionL@CFSMailClient@@UAEXABVTFSMailMsgId@@0@Z @ 22 NONAME ; void CFSMailClient::PrepareMrDescriptionL(class TFSMailMsgId const &, class TFSMailMsgId const &)
 
--- a/emailservices/emailframework/data/fsmailbrandmanager.rss	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,429 +0,0 @@
-/*
-* Copyright (c) 2001 - 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Resource file for email branding.
-*
-*/
-
-NAME FSMB
-
-#include <eikon.rh>
-#include <data_caging_paths_strings.hrh>
-#include <google_brand_graphics.mbg>
-#include <yahoo_brand_graphics.mbg>
-#include <microsoft_brand_graphics.mbg>
-#include <ovi_brand_graphics.mbg>
-#include <aol_brand_graphics.mbg>
-#include <mail_for_exchange_brand_graphics.mbg>
-
-#include "MailBrandManager.hrh"
-#include "MailBrandManager.rh"
-
-// ---------------------------------------------------------
-//   
-//    Define the resource file signature 
-//    This resource should be empty.
-//
-// ---------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE BRANDING_DATA r_branding_data
-    {
-    list_of_brands =
-        {
-        BRAND {
-
-            // Definition of Google Mail brand   
-            graphics_file_path = APP_BITMAP_DIR"\\google_brand_graphics.mif";
-
-            brand_id_match_strings =
-                {
-                BRAND_MATCH_STRING { text = "googlemail.com"; }
-                };
-            
-            graphics = 
-                {              		     		
-                BRANDABLE_GRAPHIC { id = EFSMailboxIcon; 
-                icon_id = EMbmGoogle_brand_graphicsGmail44svgtest4;
-                mask_id = EMbmGoogle_brand_graphicsGmail44svgtest4_mask; }                    
-                };
-                
-            texts = 
-                {
-                BRANDABLE_TEXT { id = EFSMailboxName; text = "Google Mail"; }
-                };
-                
-            colors =
-            	{
-            	BRANDABLE_COLOR { id = EFSMailboxNameColor; red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-            	};
-             },
-             
-             BRAND {
-
-                 // Definition of GMail brand   
-                 graphics_file_path = APP_BITMAP_DIR"\\google_brand_graphics.mif";
-                 brand_id_match_strings =
-                     {
-                     BRAND_MATCH_STRING { text = "gmail.com"; }
-                     };
-                 graphics = 
-                     {                               
-                      BRANDABLE_GRAPHIC { id = EFSMailboxIcon; 
-                      icon_id = EMbmGoogle_brand_graphicsGmail44svgtest4;
-                      mask_id = EMbmGoogle_brand_graphicsGmail44svgtest4_mask; }                    
-                     };
-                     
-                 texts = 
-                     {
-                     BRANDABLE_TEXT { id = EFSMailboxName; text = "Gmail"; }
-                     };
-                     
-                 colors =
-                     {
-                     BRANDABLE_COLOR { id = EFSMailboxNameColor; red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                     };
-                  },
-            
-            BRAND {
-                // Definition of Yahoo! Mail brand   
-                graphics_file_path = APP_BITMAP_DIR"\\yahoo_brand_graphics.mif";
-
-                brand_id_match_strings =
-                    {
-                    BRAND_MATCH_STRING { text = "*.ymail.com"; },
-                    BRAND_MATCH_STRING { text = "ymail.com"; },
-                    BRAND_MATCH_STRING { text = "*.kimo.com"; },
-                    BRAND_MATCH_STRING { text = "kimo.com"; },
-                    BRAND_MATCH_STRING { text = "*.geocities.com"; },
-                    BRAND_MATCH_STRING { text = "geocities.com"; },
-                    BRAND_MATCH_STRING { text = "*.rocketmail.com"; },
-                    BRAND_MATCH_STRING { text = "rocketmail.com"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.ca"; },
-                    BRAND_MATCH_STRING { text = "yahoo.ca"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.cn"; },
-                    BRAND_MATCH_STRING { text = "yahoo.cn"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.co.in"; },
-                    BRAND_MATCH_STRING { text = "yahoo.co.in"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.in"; },
-                    BRAND_MATCH_STRING { text = "yahoo.in"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.co.kr"; },
-                    BRAND_MATCH_STRING { text = "yahoo.co.kr"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.co.uk"; },
-                    BRAND_MATCH_STRING { text = "yahoo.co.uk"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.ar"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.ar"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.br"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.br"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.cn"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.cn"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.hk"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.hk"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.mx"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.mx"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.sg"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.sg"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.tw"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.tw"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.my"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.my"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.vn"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.vn"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.ph"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.ph"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.tr"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.tr"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.co"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.co"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.pe"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.pe"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.com.ve"; },
-                    BRAND_MATCH_STRING { text = "yahoo.com.ve"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.de"; },
-                    BRAND_MATCH_STRING { text = "yahoo.de"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.dk"; },
-                    BRAND_MATCH_STRING { text = "yahoo.dk"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.es"; },
-                    BRAND_MATCH_STRING { text = "yahoo.es"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.fr"; },
-                    BRAND_MATCH_STRING { text = "yahoo.fr"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.gr"; },
-                    BRAND_MATCH_STRING { text = "yahoo.gr"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.ie"; },
-                    BRAND_MATCH_STRING { text = "yahoo.ie"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.it"; },
-                    BRAND_MATCH_STRING { text = "yahoo.it"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.no"; },
-                    BRAND_MATCH_STRING { text = "yahoo.no"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.se"; },
-                    BRAND_MATCH_STRING { text = "yahoo.se"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.co.id"; },
-                    BRAND_MATCH_STRING { text = "yahoo.co.id"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.co.th"; },
-                    BRAND_MATCH_STRING { text = "yahoo.co.th"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.pl"; },
-                    BRAND_MATCH_STRING { text = "yahoo.pl"; },
-                    BRAND_MATCH_STRING { text = "*.yahoo.cl"; },
-                    BRAND_MATCH_STRING { text = "yahoo.cl"; }
-                    };
-                
-                graphics = 
-                    {
-                    BRANDABLE_GRAPHIC { id = EFSMailboxIcon;
-                    icon_id = EMbmYahoo_brand_graphicsYahoo;
-                    mask_id = EMbmYahoo_brand_graphicsYahoo_mask; }                    
-                    };
-                    
-                texts = 
-                    {
-                    BRANDABLE_TEXT { id = EFSMailboxName; text = "Yahoo! Mail"; }
-                    };
-                    
-                colors =
-                	{
-                	BRANDABLE_COLOR { id = EFSMailboxNameColor;
-                	red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                	};
-                },
-
-                BRAND {
-                    // Definition of Yahoo!7 Mail brand   
-                    graphics_file_path = APP_BITMAP_DIR"\\yahoo_brand_graphics.mif";
-
-                    brand_id_match_strings =
-                        {
-                        BRAND_MATCH_STRING { text = "*.y7mail.com"; },
-                        BRAND_MATCH_STRING { text = "y7mail.com"; },
-                        BRAND_MATCH_STRING { text = "*.yahoo.com.au"; },
-                        BRAND_MATCH_STRING { text = "yahoo.com.au"; }
-                        };
-                    
-                    graphics = 
-                        {
-                        BRANDABLE_GRAPHIC { id = EFSMailboxIcon;
-                        icon_id = EMbmYahoo_brand_graphicsYahoo;
-                        mask_id = EMbmYahoo_brand_graphicsYahoo_mask; }                    
-                        };
-                        
-                    texts = 
-                        {
-                        BRANDABLE_TEXT { id = EFSMailboxName; text = "Yahoo!7 Mail"; }
-                        };
-                        
-                    colors =
-                        {
-                        BRANDABLE_COLOR { id = EFSMailboxNameColor;
-                        red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                        };
-                    },
-                     
-                                    BRAND {
-                                        // Definition of Yahoo!Xtra Mail brand   
-                                        graphics_file_path = APP_BITMAP_DIR"\\yahoo_brand_graphics.mif";
-
-                                        brand_id_match_strings =
-                                            {
-                                            BRAND_MATCH_STRING { text = "yahoo.co.nz"; }
-                                            };
-                                        
-                                        graphics = 
-                                            {
-                                            BRANDABLE_GRAPHIC { id = EFSMailboxIcon;
-                                            icon_id = EMbmYahoo_brand_graphicsYahoo;
-                                            mask_id = EMbmYahoo_brand_graphicsYahoo_mask; }                    
-                                            };
-                                            
-                                        texts = 
-                                            {
-                                            BRANDABLE_TEXT { id = EFSMailboxName; text = "Yahoo!Xtra Mail"; }
-                                            };
-                                            
-                                        colors =
-                                            {
-                                            BRANDABLE_COLOR { id = EFSMailboxNameColor;
-                                            red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                                            };
-                                        },
-                    
-            BRAND {
-                // Definition of Hotmail brand   
-                graphics_file_path = APP_BITMAP_DIR"\\microsoft_brand_graphics.mif";
-
-                brand_id_match_strings =
-                        {
-                        BRAND_MATCH_STRING { text = "*.msn.com"; },
-                        BRAND_MATCH_STRING { text = "msn.com"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.com"; },
-                        BRAND_MATCH_STRING { text = "hotmail.com"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.co.uk"; },
-                        BRAND_MATCH_STRING { text = "hotmail.co.uk"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.co.jp"; },
-                        BRAND_MATCH_STRING { text = "hotmail.co.jp"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail-int.com"; },
-                        BRAND_MATCH_STRING { text = "hotmail-int.com"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.de"; },
-                        BRAND_MATCH_STRING { text = "hotmail.de"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.fr"; },
-                        BRAND_MATCH_STRING { text = "hotmail.fr"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.it"; },
-                        BRAND_MATCH_STRING { text = "hotmail.it"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.nl"; },
-                        BRAND_MATCH_STRING { text = "hotmail.nl"; },
-                        BRAND_MATCH_STRING { text = "*.hotmail.es"; },
-                        BRAND_MATCH_STRING { text = "hotmail.es"; },
-                        BRAND_MATCH_STRING { text = "*.live.com"; },
-                        BRAND_MATCH_STRING { text = "live.com"; },
-                        BRAND_MATCH_STRING { text = "*.live.at"; },
-                        BRAND_MATCH_STRING { text = "live.at"; },
-                        BRAND_MATCH_STRING { text = "*.live.be"; },
-                        BRAND_MATCH_STRING { text = "live.be"; },
-                        BRAND_MATCH_STRING { text = "*.live.ca"; },
-                        BRAND_MATCH_STRING { text = "live.ca"; },
-                        BRAND_MATCH_STRING { text = "*.live.cl"; },
-                        BRAND_MATCH_STRING { text = "live.cl"; },
-                        BRAND_MATCH_STRING { text = "*.live.cn"; },
-                        BRAND_MATCH_STRING { text = "live.cn"; },
-                        BRAND_MATCH_STRING { text = "*.live.de"; },
-                        BRAND_MATCH_STRING { text = "live.de"; },
-                        BRAND_MATCH_STRING { text = "*.live.dk"; },
-                        BRAND_MATCH_STRING { text = "live.dk"; },
-                        BRAND_MATCH_STRING { text = "*.live.fr"; },
-                        BRAND_MATCH_STRING { text = "live.fr"; },
-                        BRAND_MATCH_STRING { text = "*.live.hk"; },
-                        BRAND_MATCH_STRING { text = "live.hk"; },
-                        BRAND_MATCH_STRING { text = "*.live.it"; },
-                        BRAND_MATCH_STRING { text = "live.it"; },
-                        BRAND_MATCH_STRING { text = "*.live.jp"; },
-                        BRAND_MATCH_STRING { text = "live.jp"; },
-                        BRAND_MATCH_STRING { text = "*.live.nl"; },
-                        BRAND_MATCH_STRING { text = "live.nl"; },
-                        BRAND_MATCH_STRING { text = "*.live.no"; },
-                        BRAND_MATCH_STRING { text = "live.no"; },
-                        BRAND_MATCH_STRING { text = "*.live.ph"; },
-                        BRAND_MATCH_STRING { text = "live.ph"; },
-                        BRAND_MATCH_STRING { text = "*.live.ru"; },
-                        BRAND_MATCH_STRING { text = "live.ru"; },
-                        BRAND_MATCH_STRING { text = "*.live.se"; },
-                        BRAND_MATCH_STRING { text = "live.se"; },
-                        BRAND_MATCH_STRING { text = "*.live.ie"; },
-                        BRAND_MATCH_STRING { text = "live.ie"; },
-                        BRAND_MATCH_STRING { text = "*.live.in"; },
-                        BRAND_MATCH_STRING { text = "live.in"; },
-                        BRAND_MATCH_STRING { text = "*.live.co.kr"; },
-                        BRAND_MATCH_STRING { text = "live.co.kr"; },
-                        BRAND_MATCH_STRING { text = "*.live.co.uk"; },
-                        BRAND_MATCH_STRING { text = "live.co.uk"; },
-                        BRAND_MATCH_STRING { text = "*.live.co.za"; },
-                        BRAND_MATCH_STRING { text = "live.co.za"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.ar"; },
-                        BRAND_MATCH_STRING { text = "live.com.ar"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.au"; },
-                        BRAND_MATCH_STRING { text = "live.com.au"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.mx"; },
-                        BRAND_MATCH_STRING { text = "live.com.mx"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.my"; },
-                        BRAND_MATCH_STRING { text = "live.com.my"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.pe"; },
-                        BRAND_MATCH_STRING { text = "live.com.pe"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.pk"; },
-                        BRAND_MATCH_STRING { text = "live.com.pk"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.pt"; },
-                        BRAND_MATCH_STRING { text = "live.com.pt"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.sg"; },
-                        BRAND_MATCH_STRING { text = "live.com.sg"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.ve"; },
-                        BRAND_MATCH_STRING { text = "live.com.ve"; },
-                        BRAND_MATCH_STRING { text = "*.live.com.ph"; },
-                        BRAND_MATCH_STRING { text = "live.com.ph"; },
-                        BRAND_MATCH_STRING { text = "*.livemail.com.br"; },
-                        BRAND_MATCH_STRING { text = "livemail.com.br"; },
-                        BRAND_MATCH_STRING { text = "*.livemail.tw"; },
-                        BRAND_MATCH_STRING { text = "livemail.tw"; },
-                        BRAND_MATCH_STRING { text = "*.windowslive.com"; },
-                        BRAND_MATCH_STRING { text = "windowslive.com"; },
-                        BRAND_MATCH_STRING { text = "*.windowslive.es"; },
-                        BRAND_MATCH_STRING { text = "windowslive.es"; }
-                        };
-                
-                graphics = 
-                        {
-                        BRANDABLE_GRAPHIC { id = EFSMailboxIcon; 
-                        icon_id = EMbmMicrosoft_brand_graphicsMicrosoft;
-                        mask_id = EMbmMicrosoft_brand_graphicsMicrosoft_mask; }                    
-                        };
-                    
-                texts = 
-                        {
-                        BRANDABLE_TEXT { id = EFSMailboxName; text = "Hotmail"; }
-                        };
-                    
-                colors =
-                        {
-                        BRANDABLE_COLOR { id = EFSMailboxNameColor; red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                        };
-                },
-                
-                BRAND {
-        	    // definition of OVI brand
-        	    graphics_file_path = APP_BITMAP_DIR"\\ovi_brand_graphics.mif";
-
-        	    brand_id_match_strings =
-                    {
-                    BRAND_MATCH_STRING { text = "*.ovi.com"; },
-                    BRAND_MATCH_STRING { text = "ovi.com"; }
-                    };
-            
-        	    graphics = 
-                    {
-                    BRANDABLE_GRAPHIC { id = EFSMailboxIcon;
-                    icon_id = EMbmOvi_brand_graphicsOvi;
-                    mask_id = EMbmOvi_brand_graphicsOvi_mask; }                    
-                    };
-                
-        	    texts = 
-                    {
-                    BRANDABLE_TEXT { id = EFSMailboxName; text = "Ovi Mail"; }
-                    };
-                
-        	    colors =
-                    {
-                    BRANDABLE_COLOR { id = EFSMailboxNameColor; red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                    };
-            },
-
-            BRAND {
-        	    // definition of Mail for Exchange brand
-        	    graphics_file_path = APP_BITMAP_DIR"\\mail_for_exchange_brand_graphics.mif";
-
-        	    brand_id_match_strings =
-                    {
-                    BRAND_MATCH_STRING { text = "Mail for Exchange"; }
-                    };
-            
-        	    graphics = 
-                    {
-                    BRANDABLE_GRAPHIC { id = EFSMailboxIcon;
-                    icon_id = EMbmMail_for_exchange_brand_graphicsMail_for_exchange;
-                    mask_id = EMbmMail_for_exchange_brand_graphicsMail_for_exchange_mask; }                    
-                    };
-
-        	    colors =
-                    {
-                    BRANDABLE_COLOR { id = EFSMailboxNameColor; red = 0xff; green = 0x30; blue = 0x20; alpha = 0xff; }
-                    };
-            }
-        };
-    }
--- a/emailservices/emailframework/eabi/fsmailframeworku.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/eabi/fsmailframeworku.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,35 +1,26 @@
 EXPORTS
-	_ZN13CFSMailClient10CancelAllLEv @ 1 NONAME
-	_ZN13CFSMailClient10ExtensionLERK4TUid @ 2 NONAME
-	_ZN13CFSMailClient11GetTempDirLEv @ 3 NONAME
-	_ZN13CFSMailClient12AddObserverLER20MFSMailEventObserver @ 4 NONAME
-	_ZN13CFSMailClient12ListMessagesE12TFSMailMsgIdS0_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 5 NONAME
-	_ZN13CFSMailClient13AuthenticateLER22MFSMailRequestObserver @ 6 NONAME
-	_ZN13CFSMailClient13CleanTempDirLEv @ 7 NONAME
-	_ZN13CFSMailClient13ListMailBoxesE12TFSMailMsgIdR13RPointerArrayI10CFSMailBoxE @ 8 NONAME
-	_ZN13CFSMailClient14RemoveObserverER20MFSMailEventObserver @ 9 NONAME
-	_ZN13CFSMailClient14SetMailboxNameE12TFSMailMsgIdRK7TDesC16 @ 10 NONAME
-	_ZN13CFSMailClient15GetFolderByUidLE12TFSMailMsgIdS0_ @ 11 NONAME
-	_ZN13CFSMailClient16GetBrandManagerLEv @ 12 NONAME
-	_ZN13CFSMailClient16GetMailBoxByUidLE12TFSMailMsgId @ 13 NONAME
-	_ZN13CFSMailClient16GetMessageByUidLE12TFSMailMsgIdS0_S0_14TFSMailDetails @ 14 NONAME
-	_ZN13CFSMailClient16ReleaseExtensionEP15CEmailExtension @ 15 NONAME
-	_ZN13CFSMailClient17GetMailBoxByUidLCE12TFSMailMsgId @ 16 NONAME
-	_ZN13CFSMailClient17IncReferenceCountEv @ 17 NONAME
-	_ZN13CFSMailClient19DeleteMailBoxByUidLE12TFSMailMsgIdR22MFSMailRequestObserver @ 18 NONAME
-	_ZN13CFSMailClient20DeleteMessagesByUidLE12TFSMailMsgIdS0_RK6RArrayIS0_E @ 19 NONAME
-	_ZN13CFSMailClient20WizardDataAvailableLEv @ 20 NONAME
-	_ZN13CFSMailClient21PrepareMrDescriptionLERK12TFSMailMsgIdS2_ @ 21 NONAME
-	_ZN13CFSMailClient23SubscribeMailboxEventsLE12TFSMailMsgIdR20MFSMailEventObserver @ 22 NONAME
-	_ZN13CFSMailClient24UnsubscribeMailboxEventsE12TFSMailMsgIdR20MFSMailEventObserver @ 23 NONAME
-	_ZN13CFSMailClient25UnregisterRequestObserverEi @ 24 NONAME
-	_ZN13CFSMailClient4NewLEi @ 25 NONAME
-	_ZN13CFSMailClient4NewLEv @ 26 NONAME
-	_ZN13CFSMailClient5CloseEv @ 27 NONAME
-	_ZN13CFSMailClient5NewLCEi @ 28 NONAME
-	_ZN13CFSMailClient7CancelLEi @ 29 NONAME
-	_ZN13CFSMailClientD0Ev @ 30 NONAME
-	_ZN13CFSMailClientD1Ev @ 31 NONAME
-	_ZN13CFSMailClientD2Ev @ 32 NONAME
-	_ZN13CFSMailClient13GetSignatureLERK12TFSMailMsgId @ 33 NONAME
+	_ZN13CFSMailClient10ExtensionLERK4TUid @ 1 NONAME
+	_ZN13CFSMailClient12AddObserverLER20MFSMailEventObserver @ 2 NONAME
+	_ZN13CFSMailClient12ListMessagesE12TFSMailMsgIdS0_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 3 NONAME
+	_ZN13CFSMailClient13GetSignatureLERK12TFSMailMsgId @ 4 NONAME
+	_ZN13CFSMailClient13ListMailBoxesE12TFSMailMsgIdR13RPointerArrayI10CFSMailBoxE @ 5 NONAME
+	_ZN13CFSMailClient14RemoveObserverER20MFSMailEventObserver @ 6 NONAME
+	_ZN13CFSMailClient15GetFolderByUidLE12TFSMailMsgIdS0_ @ 7 NONAME
+	_ZN13CFSMailClient16GetMailBoxByUidLE12TFSMailMsgId @ 8 NONAME
+	_ZN13CFSMailClient16GetMessageByUidLE12TFSMailMsgIdS0_S0_14TFSMailDetails @ 9 NONAME
+	_ZN13CFSMailClient16ReleaseExtensionEP15CEmailExtension @ 10 NONAME
+	_ZN13CFSMailClient17IncReferenceCountEv @ 11 NONAME
+	_ZN13CFSMailClient19DeleteMailBoxByUidLE12TFSMailMsgIdR22MFSMailRequestObserver @ 12 NONAME
+	_ZN13CFSMailClient20DeleteMessagesByUidLE12TFSMailMsgIdS0_RK6RArrayIS0_E @ 13 NONAME
+	_ZN13CFSMailClient23SubscribeMailboxEventsLE12TFSMailMsgIdR20MFSMailEventObserver @ 14 NONAME
+	_ZN13CFSMailClient24UnsubscribeMailboxEventsE12TFSMailMsgIdR20MFSMailEventObserver @ 15 NONAME
+	_ZN13CFSMailClient4NewLEi @ 16 NONAME
+	_ZN13CFSMailClient4NewLEv @ 17 NONAME
+	_ZN13CFSMailClient5CloseEv @ 18 NONAME
+	_ZN13CFSMailClient5NewLCEi @ 19 NONAME
+	_ZN13CFSMailClient7CancelLEi @ 20 NONAME
+	_ZN13CFSMailClientD0Ev @ 21 NONAME
+	_ZN13CFSMailClientD1Ev @ 22 NONAME
+	_ZN13CFSMailClientD2Ev @ 23 NONAME
+	_ZN13CFSMailClient21PrepareMrDescriptionLERK12TFSMailMsgIdS2_ @ 24 NONAME
 
--- a/emailservices/emailframework/emailframework.pro	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/emailframework.pro	Fri Sep 03 14:07:42 2010 +0300
@@ -27,28 +27,20 @@
 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
 
 HEADERS   += inc/CFSFWImplementation.h \
-inc/CFSMailBrand.h \
-inc/CFSMailBrandManagerImpl.h \
 inc/CFSMailClient.h \
 inc/CFSMailClient.hrh \
 inc/CFSMailPlugin.h \
 inc/CFSMailPlugin.hrh \
 inc/CFSMailPluginManager.h \
-inc/MailBrandManager.hrh \
-inc/MailBrandManager.rh \
 inc/MFSMailBoxSearchObserver.h \
-inc/MFSMailBrandManager.h \
 inc/MFSMailEventObserver.h \
 inc/MFSMailIterator.h \
-inc/MFSMailPlugin.h \
 inc/MFSMailRequestObserver.h 
 
     
 SOURCES   += src/CFSFWImplementation.cpp \
 src/CFSMailClient.cpp \
 src/CFSMailPluginManager.cpp \
-src/CFSMailBrand.cpp \
-src/CFSMailBrandManagerImpl.cpp \
 inc/CFSMailPlugin.inl \
 inc/CFSMailPluginInterface.inl 
  
@@ -58,15 +50,6 @@
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID2 = 0x1000008D
     TARGET.UID3 = 0x2001E279
-
-    resourceBlock = \
-      "$${LITERAL_HASH}include <data_caging_paths.hrh>" \
-      "SOURCEPATH      data" \
-      "START RESOURCE fsmailbrandmanager.rss" \
-      "HEADER" \
-      "targetpath RESOURCE_FILES_DIR" \
-      "LANGUAGE_IDS" \
-      "END" \
       
     debuggerBlock= \
       "$${LITERAL_HASH}ifdef DEBUGLOGGER_BUILD_CONFIG_DEBUG" \
@@ -83,9 +66,8 @@
       "$${LITERAL_HASH}endif"
 
       
-    MMP_RULES += resourceBlock \
-      debuggerBlock \
-	  defBlock
+    MMP_RULES += debuggerBlock \
+	             defBlock
     
     LIBS += -lbafl \
     -leuser \
--- a/emailservices/emailframework/inc/CFSMailBrand.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/*
-* 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"
-* 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:  ES Protocol Framework brand container class
-*
-*/
-
-
-#ifndef CFSMAILBRAND_H
-#define CFSMAILBRAND_H
-
-// INCLUDES
-#include "MailBrandManager.hrh"		// TFSBrandElement
-#include <gdi.h>
-#include <badesca.h>
-
-// FORWARD DECLARATIONS
-class TResourceReader;
-class CGulIcon;
-
-/**
- *  email framework brand container class
- *
- *  @lib FSFWCommonLib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS ( CFSMailBrand ): public CBase
-	{
-
-public:
-		
-    /**
-     *  Class to represent branded graphic elements
-     *  when stored to an instance of CFSMailBrand.
-     */
-	class TBrandedGraphic
-		{
-		public:
-		    /**
-             * Id to identify type of graphics branded.
-             */
-			TFSBrandElement iElementId;
-			
-			TInt iIconId;
-			TInt iMaskId;
-		};
-	
-	/**
-     *  Class to represent branded text elements
-     *  when stored to an instance of CFSMailBrand.
-     */
-	class TBrandedText
-		{
-		public:
-		    /**
-             * Id to identify type of text branded.
-             */
-			TFSBrandElement iElementId;
-			
-			/**
-			 * Pointer to the text. Actual ownership of the text element
-			 * is held elsewhere.
-			 */
-			TPtrC iText;
-		};
-	
-	/**
-     *  Class to represent branded color elements
-     *  when stored to an instance of CFSMailBrand.
-     */	
-	class TBrandedColor
-		{
-		public:
-		    /**
-             * Id to identify type of color branded.
-             */
-			TFSBrandElement iElementId;
-			
-			TRgb iColor;
-		};
-		
-public:
-
-    /**
-     * Two-phased constructor.
-     */
-     static CFSMailBrand* NewLC( TResourceReader& aReader, TBool aIsWhiteLabel );
-
-    /**
-     * Two-phased constructor.
-     */
-	static CFSMailBrand* NewL( TResourceReader& aReader, TBool aIsWhiteLabel );
-
-    /**
-     * destructor.
-     */
-     virtual ~CFSMailBrand();
-	
-    /**
-     * Function to check whether the given brand id string
-     * matches the brand id of this brand or not.
-     *
-     * @since S60 ?S60_version
-     * @param aBrandingIdMatchString Brand id.
-     * @return Boolean value. ETrue meaning that the ids match and
-     *         EFalse that they don't.
-     */  
-     TBool IsMatching( const TDesC& aBrandingIdMatchString );
-			
-    /**
-     * Returns branded text element of given type.
-     *
-     * @param aElementId Id of the branded element. This identifies which
-	 *                   text user wishes to retrieve.
-     * @return A TPtrC object. Returns TPtrC to a null descriptor if the
-	 *         brand doesn't contain the requested branding element.
-     */
-     TDesC& GetText( TFSBrandElement aElementId );
-			
-    /**
-     * Returns branded color element of given type.
-     *
-     * @param aElement The id of the branded element. This identifies which
-	 *                 color user wishes to retrieve.
-     * @param aColor A reference to a TRgb object. The color is returned
-	 *               using this reference.
-     *
-	 * @return Error code. KErrNotFound if the brand doesn't contain the
-	 *         requested branding element.
-     */
-     TInt GetColor( TFSBrandElement aElementId, TRgb& aColor );
-			
-    /**
-     * Returns branded graphic element of given type.
-     *
-     * @param aBrandingIdMatchString Matching string. Can contain
-     *                               wildcard characters.
-     * @param aMailBoxId mailbox whose branded element is retrieved.
-	 *
-	 * @return A pointer to a CGulIcon object. The caller of this method is 
-	 *         responsible of destroying the object. Returns NULL if the 
-	 *         brand doesn't contain the requested branding element.
-     */
-     CGulIcon* GetGraphicL( TFSBrandElement aElementId );
-
-    /**
-     * Returns branded graphic element of given type.
-     *
-     * @param aElementId brand element
-     * @param aIconIds Icon path and ids
-	 *
-	 * @return Error code
-     */
-     TInt GetGraphicIdsL( TFSBrandElement aElementId,
-                          TDes& aIconIds );
-		
-private:
-		
-    /**
-     * constructor
-     */
-     CFSMailBrand();
-			
-    /**
-	 * Function which constructs instance of this class by reading necessary
-	 * brand data from the given resource file.
-	 *
-	 * @param aReader Resource reader that can be used to read branding data.
-	 */
-     void ConstructFromResourceL( TResourceReader& aReader );
-			
-     /**
-      *
-      */
-      void ConstructFromCenrepL( );
-
-private: // data
-
-    /**
-     * Brand id matching string read from the resource file. When match
-     * for user given brand id is checked, this variable contains the
-     * match string. This can contain wild card characters.
-     * Own.
-     */
-    RPointerArray<HBufC>    iBrandMatchStrings;
-    
-    /**
-     * Filepath for icon found from this brand.
-     * Own.
-     */
-    HBufC* iIconFilePath;
-
-    /**
-     * Graphic elements found from this brand.
-     * Own.
-     */
-    CArrayFixSeg< TBrandedGraphic >* iGraphicElements;
-    /**
-     * Text elements found from this brand.
-     * Own.
-     */
-    CArrayFixSeg< TBrandedText >* iTextElements;
-    /**
-     * Color elements found from this brand.
-     * Own.
-     */
-    CArrayFixSeg< TBrandedColor >* iColorElements;
-    /**
-     * Actual branded text contents for text elements stored in
-     * iTextElements is held here.
-     * Own.
-     */
-    CDesCArraySeg* iTexts;
-
-	HBufC*         iEmpty;
-			
-	};
-
-#endif CFSMAILBAND_H
\ No newline at end of file
--- a/emailservices/emailframework/inc/CFSMailBrandManagerImpl.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* 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"
-* 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:  ES Protocol Framework branding manager interface definition
-*
-*/
-
-
-#ifndef CFSMAILBRANDMANAGER_H
-#define CFSMAILBRANDMANAGER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <barsc.h>
-
-#include "MFSMailBrandManager.h"
-
-// FORWARD DECLARATIONS
-class TResourceReader;
-class CFSMailClient;
-class CFSMailBox;
-class CFSMailBrand;
-
-/**
- *  Branding manager implementation header.
- *
- *  @lib FSFWCommonLib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS ( CFSMailBrandManagerImpl ) : public CBase, public MFSMailBrandManager
-	{
-		public:
-			
-    /**
-     * Two-phased constructor.
-     *
-     */
-     static CFSMailBrandManagerImpl* NewL( CFSMailClient& aMailClient );
-     
-    /**
-     * Two-phased constructor.
-     *
-     */
-     static CFSMailBrandManagerImpl* NewLC( CFSMailClient& aMailClient );
-			
-    /**
-     * Destructor.
-     */
-     virtual ~CFSMailBrandManagerImpl();
-			
-private:	// From MFSMailBrandManager
-
-	/**
-	 * @see MFSMailBrandManager::GetGraphicL
-	 */
-	CGulIcon* GetGraphicL( TFSBrandElement aElement,
-	                       const TFSMailMsgId& aMailboxId );
-
-	/**
-	 * @see MFSMailBrandManager::GetGraphicL, overloaded with brandid
-	 */
-	CGulIcon* GetGraphicL( TFSBrandElement aElement, const TDesC& aBrandId );
-	
-	
-	/**
-	 * @see MFSMailBrandManager::GetTextL
-	 */
-	TPtrC GetTextL( TFSBrandElement aElement,
-	                const TFSMailMsgId& aMailboxId );
-
-	/**
-	 * @see MFSMailBrandManager::GetTextL
-	 */
-	TPtrC GetTextL( TFSBrandElement aElement,
-			        const TDesC& aBrandId );
-
-
-	/**
-	 * @see MFSMailBrandManager::GetColorL
-	 */
-	TInt GetColorL( TFSBrandElement aElement,
-	                const TFSMailMsgId& aMailboxId,
-	                TRgb& aColor );
-
-	/**
-	 * @see MFSMailBrandManager::UpdateMailboxNamesL
-	 */
-	void UpdateMailboxNamesL(  const TFSMailMsgId aMailboxId );
-
-	/**
-	 * @see MFSMailBrandManager::GetGraphicIdsL
-	 */
-	TInt GetGraphicIdsL( TFSBrandElement aElement,
-	                     const TFSMailMsgId& aMailboxId,
-                         TDes& aIconIds  );
-
-	/**
-	 * @see MFSMailBrandManager::GetGraphicIdsL
-	 */
-    TInt GetGraphicIdsL( TFSBrandElement aElement, 
-                         const TDesC& aBrandId,
-                         TDes& aIconIds  );
-    
-private:
-
-    /**
-     * costructor
-     */
-	 CFSMailBrandManagerImpl( CFSMailClient& aMailClient );
-	
-    /**
-     * Two-phased constructor.
-     */
-	void ConstructL();
-
-    /**
-	 * Function which constructs brands used by this class from given
-	 * resource file.
-	 *
-	 * @param aReader Resource reader that can be used to read branding data.
-	 */
-	void ConstructFromResourceL( TResourceReader& aReader );
-	
-	/**
-	 * Function which maps brand id received from a mailbox to a brand
-	 * object.
-	 *
-	 * @param aBrandId Id to identify the brand object.
-	 */
-	CFSMailBrand* FindMatchingBrandL( const TDesC& aBrandId );
-	
-	/**
-	 * Function which goes through the mail boxes and finds the one whose
-	 * brand matches the given brand id.
-	 *
-	 * @param aBrandId Id identifying the brand.
-	 */
-	CFSMailBox* MailboxMatchingBrandIdL( const TDesC& aBrandId ) const;
-	
-// <gmail_brand_issue>
-    void GetMCCValueL( TDes& aMcc ) const;    
-
-    void GetMCCValueFromSIML( TDes& aMcc ) const;    
-
-    TUint8 GetCurrentCountryL() const;
-
-    void VerifyMailAccountName( TPtrC& aBrandedName ) const;
-// </gmail_brand_issue>
-
-private: // data
-
-    /**
-     * Mail client reference.
-     */
-    CFSMailClient& iMailClient;
-
-    /**
-     * Array containing all brands.
-     * Own.
-     */
-	CArrayPtrSeg< CFSMailBrand >* iBrands;
-	
-	/**
-     * File server session used for example for reading brand resource file.
-     */
-	RFs iFsSession;
-	
-	/**
-     * RResourceFile used to read a resource file into buffer. Used
-     * for example to read the resource file containing the branding data.
-     */
-	RResourceFile iResourceFile;
-		
-	};
-	
-	
-#endif CFSMAILBRANDMANAGER_H
--- a/emailservices/emailframework/inc/CFSMailClient.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailClient.h	Fri Sep 03 14:07:42 2010 +0300
@@ -26,7 +26,6 @@
 #include "cemailextensionbase.h"
 
 //<cmail>
-#include "MFSMailBrandManager.h"
 #include "CFSMailPlugin.h"
 //</cmail>
 
@@ -47,15 +46,15 @@
     *   // Initialize the access to the mail framework
     *   CFSMailClient* mail = CFSMailClient::NewL();
     *   CleanupClosePushL(*mail);
-    * 
+    *
     *   // List mailboxes for user to select which one to open
     *   RPointerArray<CFSMailBox> mailBoxes;
     *   mailBoxes.Reset();
     *   TFSMailMsgId plugin; // null id if all mailboxes required
     *   mail->ListMailBoxes(plugin,mailBoxes);
     *   // Lets select the first one this time
-    *   CFSMailBox * currentMailbox = mailboxes[0]; 
-    * 
+    *   CFSMailBox * currentMailbox = mailboxes[0];
+    *
     *   // list all mailbox folders for user
     *   RPointerArray<CFSMailFolder> folders = currentMailBox->ListFolders( );
     *
@@ -67,7 +66,7 @@
     *   // List messages in inbox
     *   // select message details to be listed
     *   TFSMailDetails details(EFSMsgDataStructure);
-    *   
+    *
     *   // set sorting criteria
     *   TFSMailSortCriteria criteria;
     *   criteria.iField = EFSMailSortByDate;
@@ -83,7 +82,7 @@
     *   RPointerArray<CFSMailMessage> messages;
     *   messages.Reset();
     *   iterator->NextL(currentMessageId, folder->GetMessageCount(), messages);
-    *       
+    *
     *   // Show the first 5 messages to in the UI
     *   for(TInt i=0;i<messages.Count() && i<5;i++)
     *   {
@@ -99,7 +98,7 @@
     *           TInt startOffset = 0;
     *           body->GetContentToBufferL(text,startOffset);
     *           MyPlainTextBodyShowMethod(text);
-    *           delete body;        
+    *           delete body;
     *       }
     *
     *       //list email attachments
@@ -153,18 +152,18 @@
     *
     * Copyright &copy; 2006 Nokia.  All rights reserved.
     *
-    * This material, including documentation and any related computer programs, 
-    * is protected by copyright controlled by Nokia.  All rights are reserved.  
-    * Copying, including reproducing, storing, adapting or translating, any or 
-    * all of this material requires the prior written consent of Nokia.  This 
-    * material also contains confidential information which may not be disclosed 
+    * This material, including documentation and any related computer programs,
+    * is protected by copyright controlled by Nokia.  All rights are reserved.
+    * Copying, including reproducing, storing, adapting or translating, any or
+    * all of this material requires the prior written consent of Nokia.  This
+    * material also contains confidential information which may not be disclosed
     * to others without the prior written consent of Nokia.
     */
 
 NONSHARABLE_CLASS(CFSMailClient) : public CExtendableEmail
 {
  public:
-    
+
     /**
      * Creates a new CFSMailClient singleton instance or increments
      * reference count if singleton already exists
@@ -180,7 +179,7 @@
      * @return CFSMailClient pointer
      */
      IMPORT_C static CFSMailClient* NewL( TInt aConfiguration );
-    
+
     /**
      * Creates a new CFSMailClient singleton instance or increments
      * reference count if singleton already exists
@@ -214,27 +213,12 @@
      *
      * @param aMailBoxId mailbox id
      * @return mailbox object ( CFSMailBox )
-     *         or NULL if no matching mailbox found. 
+     *         or NULL if no matching mailbox found.
      *         Ownership is transferred to user!
      */
      IMPORT_C CFSMailBox* GetMailBoxByUidL( const TFSMailMsgId aMailBoxId);
-      	  		
 
     /**
-     * returns email mailbox object related to given mailbox id. Otherwise 
-     * identical to GetMailBoxByUidL but mailbox object is stored to cleanup 
-     * stack.
-     *
-     * @param aMailBoxId mailbox id
-     * @return mailbox object ( CFSMailBox )
-     *         or NULL if no matching mailbox found.
-     *         CFSMailBox pointer is stored to cleanup stack (even if NULL). 
-     *         Ownership is transferred to user! 
-     */
-     IMPORT_C CFSMailBox* GetMailBoxByUidLC( const TFSMailMsgId aMailBoxId);
-
-     
-    /**
      * returns email folder object related to given folder id
      *
      * @param aMailBoxId id of mailbox containing folder
@@ -255,7 +239,7 @@
      * @return email object (CFSMailMessage), ownership is transferred to user
      */
      IMPORT_C CFSMailMessage* GetMessageByUidL(const TFSMailMsgId aMailBoxId, const TFSMailMsgId aFolderId,
-                                              const TFSMailMsgId aMessageId, const TFSMailDetails aDetails );                                             
+                                              const TFSMailMsgId aMessageId, const TFSMailDetails aDetails );
     /**
      * deletes emails defined in message id list
      *
@@ -263,7 +247,7 @@
      * @param aFolderId id of folder containing email
      * @param aMessageIds defines ids of email to be deleted
      */
-     IMPORT_C void DeleteMessagesByUidL( const TFSMailMsgId aMailBoxId, const TFSMailMsgId aFolderId, 
+     IMPORT_C void DeleteMessagesByUidL( const TFSMailMsgId aMailBoxId, const TFSMailMsgId aFolderId,
                                          const RArray<TFSMailMsgId>& aMessageIds );
 
     /**
@@ -296,13 +280,6 @@
                                 const RArray<TFSMailSortCriteria>& aSorting);
 
     /**
-     * returns branding manager to handle branding elements
-     *
-     * @return branding manager (ownership in framework)
-     */
-     IMPORT_C MFSMailBrandManager& GetBrandManagerL( void );
-
-    /**
      * Adds a new event observer. There can be several observers active at
      * the same time. Caller MUST call RemoveObserver before destroying given
      * observer object.
@@ -310,7 +287,7 @@
      * @param aObserver observer implementation
      */
      IMPORT_C void AddObserverL(MFSMailEventObserver& aObserver);
-     
+
     /**
      * Removes event observer
      *
@@ -318,12 +295,6 @@
      */
      IMPORT_C void RemoveObserver(MFSMailEventObserver& aObserver);
 
-    /**
-     * unregisters plugin request observer to cancel pending events  
-     *
-     * @param aRequestId request id of the pending asynchronous request
-     */
-     IMPORT_C void UnregisterRequestObserver(TInt aRequestId);
 
     /**
      * Subscribes events from given mailbox
@@ -343,81 +314,35 @@
      IMPORT_C void UnsubscribeMailboxEvents(TFSMailMsgId aMailboxId, MFSMailEventObserver& aObserver);
 
     /**
-     * Sends notification to all protocol plugins that there is
-     * Email Wizard data available for some of them.
-     *
-     * Can return any of the standard Symbian error codes if
-     * one of the plugins reports failed mailbox configuration.
-     */
-     IMPORT_C TInt WizardDataAvailableL();
-
-    /**
-     * Client can call this function to immediately initialize authentications that are mandatory
-     * to get services from protocol plugins. This means e.g. store authentications. FW will
-     * internally ask authentication from all existing plugins before this operations completes.
-     *
-     * @param aOperationObserver is client provided observer that will receive progress
-     * notifications during the operation.
-     */
-     IMPORT_C TInt AuthenticateL(MFSMailRequestObserver& aOperationObserver);
-
-    /**
-     * get framework temp directory
-     */
-     IMPORT_C TDesC& GetTempDirL( );
-
-    /**
-     * clean framework temp directory
-     */
-     IMPORT_C void CleanTempDirL( );
-
-    /**
      * cancels single pending asynchronous request
      *
      * @param aRequestId identifies request
      */
      IMPORT_C void CancelL( const TInt aRequestId );
 
-    /**
-     * cancels all pending asynchronous requests
-     */
-     IMPORT_C void CancelAllL( );
-
-     /**
-      * Calls plugin to change the name of the mailbox
-      *
-      * @param aMailboxId mailbox id
-      * @param aMailboxName new name for the mailbox
-      */
-     IMPORT_C void SetMailboxName( const TFSMailMsgId aMailboxId, const TDesC& aMailboxName );
-
-
 //<qmail>
      /**
       * increments reference count to framework singleton
 	  * visibility change to public by Qmail
       */
      IMPORT_C TInt IncReferenceCount();
-//</qmail>
-     
-	 
+
      /**
       * Prepares and sets the MR description by converting HTML body to Plain text
       *
       * @param aMailboxId mailbox id
       * @param aMessageId message id
-      */     
+      */
      IMPORT_C virtual void PrepareMrDescriptionL( const TFSMailMsgId& aMailBoxId,
                                                   const TFSMailMsgId& aMessageId );
-// <qmail>
      /**
       * Gets the signature for the given mailbox.
-      * 
+      *
       * @param aMailBoxId mailbox id
       */
      IMPORT_C HBufC* GetSignatureL( const TFSMailMsgId& aMailBoxId );
 // </qmail>
- 
+
 public: // from  CExtendableEmail
 
     /**
@@ -433,7 +358,7 @@
     * @param aExtension extension to release
     */
     IMPORT_C virtual CEmailExtension* ExtensionL( const TUid& aInterfaceUid );
-        
+
  protected:
 
  private:
@@ -470,9 +395,6 @@
 
     /** */
     CFSFWImplementation*     iFWImplementation;
-     
-    /** branding manager pointer  */
-    MFSMailBrandManager*     iBrandManager;
 };
 
 #endif // __FSMAILCLIENT_H
--- a/emailservices/emailframework/inc/CFSMailPlugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.h	Fri Sep 03 14:07:42 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -37,7 +37,7 @@
 /**
  *  Freestyle Email Framework Plugin Interface
  *
- *  class MFSMailPlugin defines functions used by email framework
+ *  class CFSMailPlugin defines functions used by email framework
  *  and implemented by plugin implementor.
  *
  *  Plugin implementor inherits from class CFSMailPlugin,
@@ -133,7 +133,7 @@
      *        will receive progress notifications during the operation.
      * @param aRequestId identifies asynchronous request if parallel
      * requests exist
-     * @param aSilentConnection defines if connection is needed to be 
+     * @param aSilentConnection defines if connection is needed to be
      *        silent connection or non-silent one (default).
      */
      virtual void RefreshNowL( const TFSMailMsgId& aMailBoxId,
@@ -142,24 +142,6 @@
                                const TBool aSilentConnection=EFalse ) = 0;
 
     /**
-     * Returns last synchronization operation status.
-     *
-     * @param aMailBoxId mailbox id
-     *
-     * @return last sync operation status
-     *
-     */
-     virtual const TFSProgress GetLastSyncStatusL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * cancels all ongoing synchronizations in given mailbox regardless if initiated
-     * by email framework or plugin itself
-     *
-     * @return error code
-     */
-     virtual TInt CancelSyncL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
      * Returns the current synchronization state of mailbox.
      *
      * @param aMailboxId id of the target mailbox
@@ -178,17 +160,6 @@
      virtual TFSMailBoxStatus GetMailBoxStatus( const TFSMailMsgId& aMailBoxId ) = 0;
 
     /**
-     * checks if mailbox supports given capability
-     *
-     * @param aCapability capability to be checked
-     * @param aMailBoxId id of the target mailbox
-     *
-     * @return true/false
-     */
-     virtual TBool MailboxHasCapabilityL(   TFSMailBoxCapabilities aCapability,
-                                            TFSMailMsgId aMailBoxId ) = 0;
-
-    /**
      * lists existing mailboxes contained by plugin
      *
      * @param aMailBoxes plugin writes list of existing mailboxes into this
@@ -224,16 +195,6 @@
                                         const TInt aRequestId ) = 0;
 
     /**
-     * Returns branding id of this mailbox.
-     * This function is used by Branding Manager to associate mailbox to a branding
-     * definition. Plugin should return incoming mail server associated with this mailbox.
-     *
-     * @param aMailBoxId defines the target mailbox
-     * @return branding id
-     */
-     virtual TDesC& GetBrandingIdL(const TFSMailMsgId& aMailboxId) = 0;
-
-    /**
      * Subscribes events coming from given mailbox. UnsubscribeMailboxEvents
      * MUST be called before destroying given observer object.
      *
@@ -253,45 +214,6 @@
                                            MFSMailEventObserver& aObserver) = 0;
 
     /**
-     * Gives notification that new account data may be available from Email Wizard.
-     * Plugin must check if there is Wizard Data available for it and create
-     * new account if necessary. If plugin does not support Email Wizard this
-     * function can just return immediately.
-     *
-     * Should return KErrNone if no data found or configuration was successful.
-     * otherwise any of the standard Symbian error codes.
-     */
-     virtual TInt WizardDataAvailableL() = 0;
-
-    /**
-     * reads connection id from plugin
-     *
-     * @param  aConnectionId reference to connection id
-     * @return KErrNone or error code
-     */
-     virtual TInt GetConnectionId( TFSMailMsgId aMailBoxId, TUint32& aConnectionId );
-
-    /**
-     * checks from plugin if connection is allowed when roaming
-     *
-     * @param  aConnectionAllowed
-     * @return KErrNone or error code
-     */
-     virtual TInt IsConnectionAllowedWhenRoaming( TFSMailMsgId aMailBoxId, TBool& aConnectionAllowed );
-
-
-    /**
-      * Reads email from file stream and converts it to class CFSMailMessage
-      *
-      * @param  aMailBoxId mailbox where email exists
-      * @param  aFile input file given by user
-      * @return CFSMailMessage
-      */
-     virtual CFSMailMessage* CreateMessageFromFileL( const TFSMailMsgId /*aMailboxId*/,
-                                                     const RFile& /*aFile*/ )
-                                                     { return NULL; };
-
-    /**
      * Moves a messages between the given folders.
      *
      * @param aMailBoxId id of the target mailbox
@@ -338,40 +260,6 @@
                                  const TFSMailMsgId& aSourceFolderId,
                                  const TFSMailMsgId& aDestinationFolderId ) = 0;
 
-    /** Get a list of most recently used addresses of desired mailbox.
-     *  Each MRU entry consists of two descriptors placed sequentially
-     *  in the array. First one is the display name and the second
-     *  one is the actual email address. If for example some entry does
-     *  not contain a name at all then a KNullDesC is found in place of
-     *  the name.
-     *
-     *  The function will leave with KErrNotFound if a mailbox with
-     *  given id is not found.
-     *
-     * @param aMailBoxId target mailbox id
-     *
-     * @return Array of descriptors containing MRUs. Ownership
-     * is transferred. Empty if no entries are found.
-     */
-     virtual MDesCArray* GetMrusL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /** Set a list of most recently used addresses for given mailbox.
-     *  Each MRU entry consists of two descriptors placed sequentially
-     *  in the array. First one is the display name and the second
-     *  one is the actual email address. If for example some entry does
-     *  not contain a name at all then a KNullDesC is found in place of
-     *  the name.
-     *
-     *  The function will leave with KErrNotFound if a mailbox with
-     *  given id is not found.
-     *
-     * @param aMailBoxId target mailbox id
-     * @param aNewMruList Array of descriptors containing MRUs.
-     * Empty if no entries are found.
-     */
-     virtual void SetMrusL( const TFSMailMsgId& aMailBoxId,
-                            MDesCArray* aNewMruList ) = 0;
-
     /** FOLDER HANDLING API */
     /**
      * returns email folder object related to given folder id
@@ -532,15 +420,16 @@
      virtual void DeleteMessagesByUidL( const TFSMailMsgId& aMailBoxId,
                                         const TFSMailMsgId& aFolderId,
                                         const RArray<TFSMailMsgId>& aMessages ) = 0;
-     
+
 // <qmail>
+
      /**
       * deletes email defined by message id
       *
       * @param aMailBoxId id of the mailbox containing email
       * @param aFolderId email parent folder id
       * @param aMessages ids of messages to be deleted
-      * @param aOperationObserver Observer for the operation 
+      * @param aOperationObserver Observer for the operation
       * @param aRequestId id of the operation
       * @return KErrNone if this method is supported, KErrNotSupported if not
       */
@@ -550,7 +439,7 @@
                                          MFSMailRequestObserver& aOperationObserver,
                                          const TInt aRequestId );
 // </qmail>
-      
+
     /**
      * creates new email template into drafts folder
      *
@@ -560,25 +449,24 @@
      virtual CFSMailMessage* CreateMessageToSendL( const TFSMailMsgId& aMailBoxId ) = 0;
 
 // <qmail>
-     /**
-      * Asynchronous creation of new email template into drafts folder. When the operation
-      * finishes, RequestResponseL is called on the observer and the created message is 
-      * passed along with the TFSProgress data. It is not necessary for a plugin to 
-	  * implement this method if using the synchronous version does not cause performance
-	  * problems for the UI or general problems for the application. UI uses these methods
-	  * via an operation class NmMessageCreationOperation (see NmailUiEngine). If a plugin
-	  * doesn't implement this method the operation class automatically selects the
-	  * synchronous version.
-      *
-      * @param aMailBoxId id of the mailbox where new email is created
-      * @param aOperationObserver Observer for the operation 
-      * @param aRequestId id of the operation
-	  * @return KErrNone if this method is supported, KErrNotSupported if not
-      */
-     virtual void CreateMessageToSendL(
-	     const TFSMailMsgId& aMailBoxId,
-         MFSMailRequestObserver& aOperationObserver,
-         const TInt aRequestId );
+    /**
+     * Asynchronous creation of new email template into drafts folder. When the operation
+     * finishes, RequestResponseL is called on the observer and the created message is
+     * passed along with the TFSProgress data. It is not necessary for a plugin to
+     * implement this method if using the synchronous version does not cause performance
+     * problems for the UI or general problems for the application. UI uses these methods
+     * via an operation class NmMessageCreationOperation (see NmailUiEngine). If a plugin
+     * doesn't implement this method the operation class automatically selects the
+     * synchronous version.
+     *
+     * @param aMailBoxId id of the mailbox where new email is created
+     * @param aOperationObserver Observer for the operation
+     * @param aRequestId id of the operation
+     * @return KErrNone if this method is supported, KErrNotSupported if not
+     */
+     virtual void CreateMessageToSendL( const TFSMailMsgId& aMailBoxId,
+                                        MFSMailRequestObserver& aOperationObserver,
+                                        const TInt aRequestId ) = 0;
 // </qmail>
 
     /**
@@ -591,16 +479,16 @@
      virtual CFSMailMessage* CreateForwardMessageL( const TFSMailMsgId& aMailBoxId,
                                                     const TFSMailMsgId& aOriginalMessageId,
                                                     const TDesC& aHeaderDescriptor = KNullDesC ) = 0;
-	 
+
 // <qmail>
      /**
       * Asynchronous creation of new forwarded email into drafts folder. When the operation
-      * finishes, RequestResponseL is called on the observer and the created message is 
+      * finishes, RequestResponseL is called on the observer and the created message is
       * passed along with the TFSProgress data.
       *
       * @param aMailBoxId id of the mailbox where new email is created
       * @param aOriginalMessageId if of the (original) message,which is forwarded
-      * @param aOperationObserver Observer for the operation 
+      * @param aOperationObserver Observer for the operation
       * @param aRequestId id of the operation
       * @param aHeaderDescriptor user can give quote headers data to plugin as
       *  parameter if needed
@@ -629,16 +517,16 @@
                                                   const TBool aReplyToAll,
                                                   const TDesC& aHeaderDescriptor = KNullDesC) = 0;
 
-// <qmail>	 
+// <qmail>
      /**
       * Asynchronous creation of new mail template to drafts folder to be replied. When the operation
-      * finishes, RequestResponseL is called on the observer and the created message is 
+      * finishes, RequestResponseL is called on the observer and the created message is
       * passed along with the TFSProgress data.
       *
       * @param aMailBoxId id of the mailbox where new email is created
       * @param aOriginalMessageId id of original email,which is replied to
       * @param aReplyToAll true if reply to all is wanted
-      * @param aOperationObserver Observer for the operation 
+      * @param aOperationObserver Observer for the operation
       * @param aRequestId id of the operation
       * @param aHeaderDescriptor user can give quote headers data to plugin as
       *        parameter if needed
@@ -651,7 +539,7 @@
                                        MFSMailRequestObserver& aOperationObserver,
                                        const TInt aRequestId,
                                        const TDesC& aHeaderDescriptor = KNullDesC);
-// </qmail>	 
+// </qmail>
 
     /**
      * stores email object data to message store after modifications (commit)
@@ -668,7 +556,7 @@
     * Asynchronous message storing
     *
     * @param aMailBoxId id of the mailbox where the messages are
-    * @param aOperationObserver Observer for the operation 
+    * @param aOperationObserver Observer for the operation
     * @param aRequestId id of the operation
     */
     virtual void StoreMessagesL(
@@ -677,7 +565,7 @@
         MFSMailRequestObserver& aOperationObserver,
         const TInt aRequestId ) = 0;
     // </qmail>
-    
+
     /**
      * starts email fetching from email server
      *
@@ -810,7 +698,7 @@
 // <qmail>
 	    /**
 	     * Creates and adds a new child part from file to given email part.
-	     * 
+	     *
 	     * @param aMailBoxId id of the mailbox where parent part is located
 	     * @param aParentFolderId id of the parent folder where email is located
 	     * @param aMessageId id of the email parent part belongs to
@@ -819,11 +707,11 @@
 	     * If aInsertBefore is NULL id then new part is added as last.
 	     * @param aContentType content type of the new message part
 	     * @param aFilePath file containing new child part contents
-         * @param aOperationObserver Observer for the operation 
+         * @param aOperationObserver Observer for the operation
          * @param aRequestId id of the operation
 	     *
 	     * return new child part object, ownership is transferred to user
-	     */        
+	     */
         virtual void NewChildPartFromFileL( const TFSMailMsgId& aMailBoxId,
 	                                        const TFSMailMsgId& aParentFolderId,
 	                                        const TFSMailMsgId& aMessageId,
@@ -833,10 +721,10 @@
 	                                        MFSMailRequestObserver& aOperationObserver,
 	                                        const TInt aRequestId );
 // </qmail>
-	 
+
 	 /**
 	  * Creates and adds a new child part from file to given email part.
-	  * 
+	  *
 	  * @param aMailBoxId id of the mailbox where parent part is located
 	  * @param aParentFolderId id of the parent folder where email is located
 	  * @param aMessageId id of the email parent part belongs to
@@ -848,34 +736,13 @@
 	  *  ownership is transferred
 	  *
 	  * return new child part object, ownership is transferred to user
-	  */        
-	  virtual CFSMailMessagePart* NewChildPartFromFileL( const TFSMailMsgId& aMailBoxId, 
-	                                                     const TFSMailMsgId& aParentFolderId, 
-	                                                     const TFSMailMsgId& aMessageId, 
-	                                                     const TFSMailMsgId& aParentPartId, 
-	                                                     const TDesC& aContentType, 
-	                                                     RFile& aFile ) = 0; 
-
-
-    /**
-     * Copies given email as new child part to given email part.
-     *
-     * @param aMailBoxId id of the mailbox where email is located
-     * @param aParentFolderId id of the parent folder where email is located
-     * @param aMessageId id of the email parent part belongs to
-     * @param aParentPartId id of the parent part of the new part
-     * @param aInsertBefore id of existing part that new part should precede.
-     *        If NULL id then new part is added as last.
-     * @param aMessage id of the email that is copied as child part
-     *
-     * return new child part object, ownership is transferred to user
-     */
-     virtual CFSMailMessagePart* CopyMessageAsChildPartL( const TFSMailMsgId& aMailBoxId,
-                                                          const TFSMailMsgId& aParentFolderId,
-                                                          const TFSMailMsgId& aMessageId,
-                                                          const TFSMailMsgId& aParentPartId,
-                                                          const TFSMailMsgId& aInsertBefore,
-                                                          const CFSMailMessage& aMessage) = 0;
+	  */
+	  virtual CFSMailMessagePart* NewChildPartFromFileL( const TFSMailMsgId& aMailBoxId,
+	                                                     const TFSMailMsgId& aParentFolderId,
+	                                                     const TFSMailMsgId& aMessageId,
+	                                                     const TFSMailMsgId& aParentPartId,
+	                                                     const TDesC& aContentType,
+	                                                     RFile& aFile ) = 0;
 
     /**
      * Removes child part (and its children, if any) from given email part
@@ -895,15 +762,15 @@
 // <qmail>
      /**
       * Removes child part (and its children, if any) from given email part
-      * 
+      *
       * @param aMailBoxId id of the mailbox where email is located
       * @param aParentFolderId id of the parent folder where email is located
       * @param aMessageId id of the email parent part belongs to
       * @param aParentPartId id of the parent of the part
       * @param aPartId id of the part to removed
-      * @param aOperationObserver Observer for the operation 
+      * @param aOperationObserver Observer for the operation
       * @param aRequestId id of the operation
-      */        
+      */
       virtual void RemoveChildPartL( const TFSMailMsgId& aMailBoxId,
                                      const TFSMailMsgId& aParentFolderId,
                                      const TFSMailMsgId& aMessageId,
@@ -912,7 +779,7 @@
                                      MFSMailRequestObserver& aOperationObserver,
                                      const TInt aRequestId);
 // </qmail>
-      
+
     /**
      * Returns given message part. Ownership of object is transferred to caller.
      *
@@ -1000,35 +867,6 @@
                                 const TFSMailMsgId& aMessagePartId) = 0;
 
     /**
-     * Removes fetched contents of these parts.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aPartIds message part ids to be removed
-     */
-     virtual void RemovePartContentL(   const TFSMailMsgId& aMailBoxId,
-                                        const TFSMailMsgId& aParentFolderId,
-                                        const TFSMailMsgId& aMessageId,
-                                        const RArray<TFSMailMsgId>& aPartIds) = 0;
-
-    /**
-     * Sets email part contents from given file.
-     * Possible old contents are replaced.
-     *
-     * @param aMailBoxId id of the mailbox where email is located
-     * @param aParentFolderId id of the parent folder where email is located
-     * @param aMessageId id of the email part belongs to
-     * @param aMessagePartId id of the message part
-     * @param aFilePath source file path
-     */
-     virtual void SetPartContentFromFileL( const TFSMailMsgId& aMailBoxId,
-                                           const TFSMailMsgId& aParentFolderId,
-                                           const TFSMailMsgId& aMessageId,
-                                           const TFSMailMsgId& aMessagePartId,
-                                           const TDesC& aFilePath) = 0;
-
-    /**
      * stores email part object data to message store after modifications (commit)
      *
      * @param aMailBoxId id of the mailbox where email is located
@@ -1040,13 +878,13 @@
                                      const TFSMailMsgId& aParentFolderId,
                                      const TFSMailMsgId& aMessageId,
                                      CFSMailMessagePart& aMessagePart) = 0;
-     
+
     // <qmail>
     /**
      * Asynchronous message parts storing
      *
      * @param aMessagePart email parts data to be stored
-     * @param aOperationObserver Observer for the operation 
+     * @param aOperationObserver Observer for the operation
      * @param aRequestId id of the operation
      */
     virtual void StoreMessagePartsL( RPointerArray<CFSMailMessagePart>& aMessagePart,
@@ -1184,42 +1022,31 @@
      virtual void AuthenticateL(MFSMailRequestObserver& aOperationObserver, TInt aRequestId) = 0;
 
     /**
-     * sets authentication popup data
-     * @param aMailBoxId id of the mailbox
-     * @param aUsername email account user name
-     * @param aPassword email account password
-     */
-    virtual void SetCredentialsL( const TFSMailMsgId& aMailBoxId,
-                                  const TDesC& aUsername,
-                                  const TDesC& aPassword )  = 0;
-
-    /**
       * Sets the mailbox name for this mailbox.
       *
       * @param aMailboxId id of target mailbox
       * @param aMailboxName new name for the mailbox
       */
     virtual void SetMailboxName(const TFSMailMsgId& aMailboxId, const TDesC& aMailboxName ) = 0;
-    
+
     /**
      * Prepares and sets the MR description by converting HTML body to Plain text
      *
      * @param aMailboxId mailbox id
      * @param aMessageId message id
-     */     
+     */
     virtual void PrepareMrDescriptionL( const TFSMailMsgId& /*aMailBoxId*/,
                                         const TFSMailMsgId& /*aMessageId*/ )
-                                        { return; };
-
+                                    { return; };
 
     /**
      * Gets the signature for the given mailbox. Returns NULL if there is no signature defined for
      * the given mailbox.
      *
      * @param aMailboxId mailbox id
-     */     
+     */
     virtual HBufC* GetSignatureL( const TFSMailMsgId& aMailBoxId );
-    
+
 protected:
 
     /**
--- a/emailservices/emailframework/inc/CFSMailPlugin.inl	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.inl	Fri Sep 03 14:07:42 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"
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description: Inline methods for class CFSMailPlugin. 
+* Description: Inline methods for class CFSMailPlugin.
 *
 */
 
@@ -44,7 +44,7 @@
     {
     REComSession::FinalClose();
     }
-    
+
 // -----------------------------------------------------------------------------
 // CFSMailPlugin::ListImplementationsL
 // -----------------------------------------------------------------------------
@@ -60,46 +60,11 @@
 //
 inline CFSMailPlugin* CFSMailPlugin::NewL(TUid aUid)
     {
-    return static_cast<CFSMailPlugin*>( 
+    return static_cast<CFSMailPlugin*>(
         REComSession::CreateImplementationL(
             aUid, _FOFF( CFSMailPlugin, iDtor_ID_Key ) ) );
     }
 
-// <cmail> empty implementations added to avoid CS warnings
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::GetConnectionId
-// -----------------------------------------------------------------------------
-inline TInt CFSMailPlugin::GetConnectionId(
-    TFSMailMsgId /*aMailBoxId*/,
-    TUint32& /*aConnectionId*/ )
-    {
-    return KErrNotSupported;
-    }
-    
-    // <cmail> empty implementations added to avoid CS warnings
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::IsConnectionAllowedWhenRoaming
-// -----------------------------------------------------------------------------
-inline TInt CFSMailPlugin::IsConnectionAllowedWhenRoaming(
-	TFSMailMsgId /*aMailBoxId*/,
-	TBool& /*aConnectionAllowed*/ )
-    {
-    return KErrNotSupported;
-    }
-// </cmail>
-
-// <qmail>
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::CreateMessageToSendL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::CreateMessageToSendL(
-    const TFSMailMsgId& /*aMailBoxId*/,
-    MFSMailRequestObserver& /*aOperationObserver*/,
-    const TInt /*aRequestId*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
 // -----------------------------------------------------------------------------
 // CFSMailPlugin::CreateForwardMessageL
 // -----------------------------------------------------------------------------
--- a/emailservices/emailframework/inc/CFSMailPluginManager.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPluginManager.h	Fri Sep 03 14:07:42 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"
@@ -50,87 +50,63 @@
 
 public:
 
-  
+
     /**
      * destructor
-     */  
+     */
   	 ~CFSMailPluginManager();
 
     /**
      * two based constructor
      */
   	 static CFSMailPluginManager* NewL(TInt aConfiguration);
-  	
+
     /**
      * two based constructor
      */
   	 static CFSMailPluginManager* NewLC(TInt aConfiguration);
 
     /**
-     * adds new plugin to plugin list
-     *
-     */  
-	 void AppendPluginL(CFSMailPlugin* aPlugin,CImplementationInformation* aPluginInfo);
-
-    /**
      * returns plugin pointer by plugin table index
      *
      * @return plugin pointer
-     */  
+     */
 	 CFSMailPlugin* GetPluginByIndex(TUint aIndex);
 
     /**
-     * get plugin id by plugin table index
-     *
-     */  
-	 TUid GetPluginIdByIndex(TUint aIndex);
-	 	 
-    /**
      * returns count of existing plugins
      *
-     */  
-	 TUint GetPluginCount( );
-	 
-    /**
-     * loads plugin identified by plugin id
-     *
-     */  
-	 void LoadPluginL(TUid aPluginId);
+     */
+	 TUint GetPluginCount();
 
     /**
-     * list ids of existing plugins
-     *
-     */  
-	 void ListPlugins( RArray<TUid>& aPluginList );
-	 
-    /**
      * lists plugin pointers & plugin info
      *
-     */  
+     */
 	 void ListImplementationsL( RPointerArray<CFSMailPlugin>& aImplementations,
 	                            RPointerArray<CImplementationInformation>& aInfo );
-									 
+
 protected:
 
     /**
      * C++ default constructor.
      *
      */
- 
+
   	 CFSMailPluginManager();
 
     /**
      * ConstructL
      */
 	void ConstructL(TInt aConfiguration);
-	
+
 private: // data
 
-    /** plugin information table */  
+    /** plugin information table */
 	 RPointerArray<CImplementationInformation> 	iPluginInfo;
-	 
+
     };
-    
+
 
 #endif  // CFSMAILPLUGINMANAGER_H
 
--- a/emailservices/emailframework/inc/MFSMailBrandManager.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file defines class MFSMailBrandManager.
-*
-*/
-
-
-#ifndef MFSMAILBRANDMANAGER_H
-#define MFSMAILBRANDMANAGER_H
-
-// INCLUDES
-//<cmail>
-#include "MailBrandManager.hrh"
-//</cmail>
-
-// FORWARD DECLARATIONS
-class CGulIcon;
-class TRgb;
-class TFSMailMsgId;
-
-/**
- *  Branding manager.
- *
- *  Branding manager is used to query different branding elements
- *  related to certain mail box.
- *
- *  @lib FSFWCommonLib
- *  @since S60 v3.1
- */
-class MFSMailBrandManager
-{
-
-    public:
-    
-    /**
-     * Destructor.
-     */  
-     virtual ~MFSMailBrandManager() { }
-    
-    /**
-     * Returns a branded graphical element.
-     *
-     * @param aElement Id of the branded element. This identifies which
-     *                 graphic user wishes to retrieve.
-     * @param aMailBoxId mailbox whose branded element is retrieved.
-     *
-     * @return A pointer to a CGulIcon object. The caller of this method is 
-     *         responsible of destroying the object. Returns NULL if the 
-     *         brand doesn't contain the requested branding element.
-     */
-     virtual CGulIcon* GetGraphicL( TFSBrandElement aElement,
-                                    const TFSMailMsgId& aMailboxId ) = 0;
-
-     /**
-      * Returns a branded graphical element.
-      *
-      * @param aElement Id of the branded element. This identifies which
-      *                 graphic user wishes to retrieve.
-      * @param aBrandId is the domain.
-      *
-      * @return A pointer to a CGulIcon object. The caller of this method is 
-      *         responsible of destroying the object. Returns NULL if the 
-      *         brand doesn't contain the requested branding element.
-      */
-      virtual CGulIcon* GetGraphicL( TFSBrandElement aElement,
-                                     const TDesC& aBrandId ) = 0;
-    
-    /**
-     * Returns a branded text element.
-     *
-     * @param aElement Id of the branded element. This identifies which
-     *                 text user wishes to retrieve.
-     * @param aMailBoxId mailbox whose branded element is retrieved.
-     *
-     * @return A TPtrC object. Returns TPtrC to a null descriptor if the
-     *         brand doesn't contain the requested branding element.
-     */
-     virtual TPtrC GetTextL( TFSBrandElement aElement,
-                            const TFSMailMsgId& aMailboxId ) = 0;
-    
-    /**
-     * Returns a branded text element.
-     * This function is for WhiteLabelBranding, because branded mailbox name is
-     * needed before mailbox creation.
-     * 
-     * @param aElement Id of the branded element. This identifies which
-     *                 text user wishes to retrieve.
-     * @param aMailBoxId mailbox whose branded element is retrieved.
-     *
-     * @return A TPtrC object. Returns TPtrC to a null descriptor if the
-     *         brand doesn't contain the requested branding element.
-     */
-     virtual TPtrC GetTextL( TFSBrandElement aElement, 
-                            const TDesC& aBrandId ) = 0;
-    
-    /**
-     * Returns a branded text element.
-     *
-     * @param aElement The id of the branded element. This identifies which
-     *                 color user wishes to retrieve.
-     * @param aMailBoxId mailbox whose branded element is retrieved.
-     * @param aColor A reference to a TRgb object. The color is returned
-     *               using this reference.
-     *
-     * @return Error code. KErrNotFound if the brand doesn't contain the requested
-     *         branding element.
-     */
-     virtual TInt GetColorL( TFSBrandElement aElement,
-                            const TFSMailMsgId& aMailboxId,
-                            TRgb& aColor ) = 0;
-    
-    /**
-     * This function will change 'mailbox name' as branded name.
-     * If aMailboxId is NULL function goes through all mailboxes and check if mailbox is branded.
-     * If it is, function will change 'mailbox name' as branded name.
-     * This function should be called after mailbox settings has changed.
-     * 
-     * @param aMailboxId Id of the mailbox
-     */
-     virtual void UpdateMailboxNamesL(  const TFSMailMsgId aMailboxId ) = 0;
-
-    /**
-     * Returns branded graphic element of given type.
-     *
-     * @param aElementId brand element
-     * @param aMailBoxId mailbox whose branded element is retrieved.     
-     * @param aIconIds Icon path and ids
-     *
-     * @return Error code
-     */
-     virtual TInt GetGraphicIdsL( TFSBrandElement aElement,
-                                  const TFSMailMsgId& aMailboxId,
-                                  TDes& aIconIds  ) = 0;
-
-    /**
-     * Returns branded graphic element of given type.
-     *
-     * @param aElementId brand element
-     * @param aBrandId Domain of email address.     
-     * @param aIconIds Icon path and ids
-     *
-     * @return Error code
-     */
-     virtual TInt GetGraphicIdsL( TFSBrandElement aElement,
-                                  const TDesC& aBrandId,
-                                  TDes& aIconIds  ) = 0;        
-};
-
-
-#endif	// MFSMAILBRANDMANAGER_H
\ No newline at end of file
--- a/emailservices/emailframework/inc/MFSMailPlugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,889 +0,0 @@
-/*
-* Copyright (c) 2006 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:  Defines Framework Plugin API functions.
-*
-*/
-
-
-#ifndef M_FSMAILPLUGINAPI_H
-#define M_FSMAILPLUGINAPI_H
-
-//  INCLUDES
-//<cmail>
-#include "MFSMailRequestObserver.h"
-#include "MFSMailEventObserver.h"
-#include "CFSMailBox.h"
-//</cmail>
-
-// FORWARD DECLARATIONS
-class MDesCArray;
-
-// CLASS DECLARATION
-
-/**
- *  Freestyle email plugin API abstract interface.
- *
- *  Plugin is identified using ecom implementation uid.
- *  Framework searches existing plugins and creates plugin api instance per each plugin.
- *
- *  plugin API provides methods to fetch from plugins service, mailbox,
- *  folder, message and attachment objetcs,
- *  which further contain more detailed data of each object to be read.
- *
- *  When updating data Freestyle framework manipulates corresponding
- *  service, mailbox, folder, message and attachment objetcs and
- *  after manipulation stores manipulated object to plugin by calling
- *  corresponding store method.
- *
- *	Asynchronous requests -> framework gives request id to every async request,
- *  which plugin gives to framework when calling back observer to be matched
- *  request data in framework. Framework gives observer pointer in async request
- *  to be called back.
- *
- *  API allows Symbian leaves from plugins and will trap them, error codes are
- *  expected to be symbian error codes.
- *  @since ...
- */
-class MFSMailPlugin
-  	{
-public: // Data
-
-public: // Methods
-
-	// PLUGIN HANDLING
-    /**
-     * returns plugin capabilities
-     *
-     * @return plugin capabilities data structure
-     */
-  	 virtual const TFSMailPluginCapabilities ReadPluginCapabilitiesL() = 0;
-
-	// MAILBOX HANDLING
-    /**
-     * lists existing mailboxes implemented by given plugin
-     *
-     * @param aPlugin defines which plugin request is accessed to
-     * @param aMailBoxes plugin writes results to this array
-     * owned by framework
-     */
-  	 virtual void ListMailBoxesL( RArray<TFSMailMsgId>& aMailboxes) = 0;
-
-    /**
-     * returns email mailbox object related to given mailbox id
-     * mailbox data set by plugin :
-     *				 - mailbox id
-     *               - mailbox name
-     *               - branding id
-     *               - mailbox capabilities
-     *
-     * @param aMailBoxId defines mailbox id
-     * @return mailBox object ( CFSMailBox ) to be owned by user
-     */
-	 virtual CFSMailBox* GetMailBoxByUidL( const TFSMailMsgId& aMailBoxId) = 0;
-
-    /**
-     * removes mailbox
-     *
-     * @param aMailBoxId defines id of the mailbox to be removed
-     */
-	 virtual void DeleteMailBoxByUidL(const TFSMailMsgId& aMailBoxId) = 0;
-
-    /**
-     * Returns branding id for this mailbox. This function is used by Branding Manager
-     * to associate mailbox to a branding definition. Plugin implementation should
-     * return incoming mail server associated with this mailbox.
-     *
-     * @param aMailBoxId defines the target mailbox
-     * @return branding id
-     */
-     virtual TDesC& GetBrandingIdL(const TFSMailMsgId& aMailboxId) = 0;
-
-    /**
-     * Moves a messages to the given folder.
-     *
-     * @param aMailBoxId defines mailbox id
-     * @param aMessageIds ids of the messages to be transferred
-     * @param aSourceFolderId id of the folder where messages are located
-     * @param aDestinationFolderId destination folder id
-     *
-     */
-     virtual void MoveMessagesL( 	const TFSMailMsgId& aMailBoxId,
-     							 	const RArray<TFSMailMsgId>& aMessageIds,
-                                	const TFSMailMsgId& aSourceFolderId,
-                                	const TFSMailMsgId& aDestinationFolderId ) = 0;
-    /**
-     * Copies a messages from one folder to another.
-     * This function copies a messages to the given folder,
-     * including the properties, content, and all attachments.
-     * (note Only works if the store is in an authenticated state,
-     *  otherwise this function leaves with KErrNotReady)
-     *
-     * @param aMailBoxId defines mailbox id
-     * @param aMessageIds ids of the messages to be copied
-     * @param aNewMessages ids of the copied messages.
-     * @param aSourceFolderId id of the folder where messages are located
-     * @param aDestinationFolderId destination folder id
-     */
-     virtual void CopyMessagesL( const TFSMailMsgId& aMailBoxId,
-     							 const RArray<TFSMailMsgId>& aMessageIds,
-     							 RArray<TFSMailMsgId>& aNewMessages,
-                                 const TFSMailMsgId& aSourceFolderId,
-                                 const TFSMailMsgId& aDestinationFolderId ) = 0;
-
-    /** Get a list of most recently used addresses of desired mailbox.
-     *  Each MRU entry consists of two descriptors placed sequentially
-     *  in the array. First one is the display name and the second
-     *  one is the actual email address. If for example some entry does
-     *  not contain a name at all then a KNullDesC is found in place of
-     *  the name.
-     *
-     *  The function will leave with KErrNotFound if a mailbox with
-     *  given id is not found.
-     *
-     * @param aMailBoxId defines mailbox id
-     * @return Array of descriptors containing MRUs. Ownership
-     *         is transferred. Empty if no entries are found.
-     */
-     virtual MDesCArray* GetMrusL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-	 // old one for building purposes
-     virtual MDesCArray* GetMrusL( TFSMailMsgId aMailBoxId ) const= 0;
-
-    /** Set a list of most recently used addresses for given mailbox.
-     *  Each MRU entry consists of two descriptors placed sequentially
-     *  in the array. First one is the display name and the second
-     *  one is the actual email address. If for example some entry does
-     *  not contain a name at all then a KNullDesC is found in place of
-     *  the name.
-     *
-     *  The function will leave with KErrNotFound if a mailbox with
-     *  given id is not found.
-     *
-     * @param aMailBoxId defines mailbox id
-     * @param aNewMruList Array of descriptors containing MRUs. Empty if no entries are found.
-     */
-     virtual void SetMrusL( const TFSMailMsgId& aMailBoxId,
-     						MDesCArray* aNewMruList ) = 0;
-
-	// MAILBOX SYNC
-    /**
-     * DEPRECATED
-     *
-	 */
-     virtual void GoOnlineL( ) = 0;
-
-    /**
-     * DEPRECATED
-     *
-	 */
-     virtual void GoOfflineL( ) = 0;
-
-    /**
-     * DEPRECATED
-     *
-	 */
-     virtual  TFSProgress GetLastSyncStatusL( ) = 0;
-
-    /**
-     * DEPRECATED
-     *
-	 */
-     virtual TInt RefreshNowL( ) = 0;
-
-    /**
-     * Enables synchronization of identified mailbox. This means
-     * that the plugin can connect toserver to do synchronization
-     * of the mailbox when necessary or stay connected all the time.
-     * The actual functionality depends on user settings and plugin
-     * implementation.
-     *
-     * All collections (mail etc.) supported by the plugin and
-     * enabled by user settings are synchronized.
-     *
-     * This function sets identified mailbox online but it may
-     * have a side effect that also other mailboxes of the same
-     * plugin are set online.
-     *
-     * Connection is set offline normally by using specific function
-     * for this purpose. There are also other reasons for ending up
-     * in offline state like network error or scheduling.
-     *
-     * @param aMailBoxId defines mailbox
-     *
-	 */
-     virtual void GoOnlineL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * Disables mailbox synchronization. Connection by the plugin
-     * to synchronize identified mailbox is not allowed after this.
-     *
-     * If GoOnlineL has effect on other mailboxes of the
-     * same plugin then this function has effect on those
-     * mailboxes also.
-     *
-     * @param aMailBoxId defines mailbox
-     *
-	 */
-     virtual void GoOfflineL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * Returns last sync operation status.
-     *
-     * @param aMailBoxId defines mailbox
-     * @return Last sync operation status
-     *
-	 */
-     virtual const TFSProgress GetLastSyncStatusL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * Forces synchronization of mailbox. This can be called
-     * whether the mailbox is currently offline or online. In
-     * case the mailbox is offline in the beginning, connection
-     * is made up for the time of the synchronization.
-     *
-     * All collections (mail etc.) supported by the plugin and
-     * enabled by user settings are synchronized.
-     *
-     * This is an asynchronous operation and the request id
-     * is returned for cancelling purpose.
-     *
-     * Observer is given as a parameter to enable callbacks
-     * related to this operation. Alternatively user can use
-     * empty implementation of the observer function and rely
-     * only on events. Notice that the event system is not as
-     * comprehensive as the observing way do this.
-     *
-     * @param aMailBoxId defines mailbox
-     * @param aOperationObserver is client provided observer that
-     *        will receive progress notifications during the
-     *        operation.
-     * @param aRequestId identifies asynchronous request
-	 */
-     virtual void RefreshNowL(	const TFSMailMsgId& aMailBoxId,
-         						MFSMailRequestObserver& aOperationObserver,
-         						TInt aRequestId ) = 0;
-
-	// FOLDER HANDLING
-    /**
-     * returns email folder object related to given folder id
-     * folder data set by plugin :
-     *				 - folder id
-     *               - folder name
-     *				 - folder type ; Inbox, Outbox, Sent, Drafts, Deleted, Other
-     *               - message count
-     *               - unread message count
-     *               - mailbox id
-	 *				 - parent folder
-     * @param aMailBoxId defines mailbox id
-     * @param aFolderId defines folder id
-     * @return folder object (CFSMailFolder) to be owned by user
-     */
-	 virtual CFSMailFolder* GetFolderByUidL( const TFSMailMsgId& aMailBoxId,
-	 										 const TFSMailMsgId& aFolderId ) = 0;
-
-    /**
-     * creates new folder
-     *
-     * @param aMailBoxId defines mailbox where folder is created
-     * @param aFolderId defines id of the parent folder
-     * @param aFolderName defines name of the new folder
-     * @param aSync defines if new folder is local only (false)
-     * or if it also should sync to server (true)
-     * @return new folder object CFSMailFolder to be owned by user
-     */
-	 virtual CFSMailFolder* CreateFolderL( 	const TFSMailMsgId& aMailBoxId,
-	 										const TFSMailMsgId& aParentFolderId,
-	 									   	const TDesC& aFolderName,
-	 									   	const TBool aSync ) = 0;
-
-    /**
-     * deletes email folder related to given folder id
-     *
-     * @param aMailBoxId defines mailbox where folder is deleted
-     * @param aFolderId defines id of folder to be deleted
-     */
-	 virtual void DeleteFolderByUidL(	const TFSMailMsgId& aMailBoxId,
-	 									const TFSMailMsgId& aFolderId) = 0;
-
-	/**
-	 * 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 aMailBoxId defines mailbox where parent folder is
-	 * @param aFolderId defines parent folder id. TFSMailId::NullId() for root level list.
-	 * @param aFolderList plugin writes results in this array given by user
-	 */
-	virtual void ListFoldersL(	const TFSMailMsgId& aMailBoxId,
-	    						const TFSMailMsgId& aParentFolderId,
-	    						RPointerArray<CFSMailFolder>& aFolderList) = 0;
-
-	/**
-	 * List all subfolders of given mailbox.
-	 * 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 aMailBoxId defines mailbox
-	 * @param aFolderList plugin writes results in this array given by user.
-	 * Caller must determine tree structure by examining parent id of each returned folder.
-	 */
-	 virtual void ListFoldersL(	const TFSMailMsgId& aMailBoxId,
-	    						RPointerArray<CFSMailFolder>& aFolderList) = 0;
-    /**
-     * return folder id of given folder type
-     *
-     * @param aMailBoxId defines mailbox where folder is
-     * @param aFolderType folder type
-     *
-     * return folder id
-     */
-	 virtual TFSMailMsgId GetStandardFolderIdL( const TFSMailMsgId& aMailBoxId,
-	 											const TFSFolderType aFolderType ) = 0;
-
-	// MESSAGE FETCH AND STORE
-
-    /**
-     * Get message iterator for given folder
-     *
-     * @param aMailBoxId defines mailbox where parent folder is
-     * @param aFolderId defines folder id
-     * @param aDetails describes details requested to CFSMailMessage objects returned by the iterator
-     * @param aSorting describes requested sort criteria. First item in array is primary sort criteria.
-     * @return iterator (remember virtual destructor)
-	 */
-
-     virtual MFSMailIterator* ListMessagesL( const TFSMailMsgId& aMailBoxId,
-        									 const TFSMailMsgId& aFolderId,
-        									 const TFSMailDetails aDetails,
-        									 const RArray<TFSMailSortCriteria>& aSorting ) = 0;
-
-    /**
-     * returns email message object related to given message id
-     *
-     * message info set by plugin :
-     *				  - message id
-     *                - mailbox
-     *				  - parent folder
-     *                - message size
-	 *                - the rest is defined by message attributes ;
-     * @param aMailBoxId defines mailbox where message is
-     * @param aFolderId defines parent folder id where message is
-     * @param aMessageId defines message id
-     *
-     * @param aDetails defines which message parts are included in message
-	 * EFSMsgDataIdOnly  -> Doesn't get any data. The object just contains the ID.
-	 * EFSMsgDataDate    -> 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 -> Like above but when sorting by subject
-	 * EFSMsgDataSender  -> Likewise for sender address.
-	 * EFSMsgDataEnvelope -> Date, subject, Sender, To, Cc at least.
-	 * EFSMsgDataStructure -> the part structure including mime type, size and name headers.
-     *
-     * @return message data (CFSMailMessage), ownership is transferred to user
-     */
-	 virtual CFSMailMessage* GetMessageByUidL( 	const TFSMailMsgId& aMailBoxId,
-	 											const TFSMailMsgId& aParentFolderId,
-	 											const TFSMailMsgId& aMessageId,
-	 											const TFSMailDetails aDetails) = 0;
-
-    /**
-     * deletes email message defined by message id
-     *
-     * @param aMailBoxId defines mailbox
-     * @param aFolderId defines message parent folder id
-     * @param aMessages defines ids of messages to be deleted
-     */
-	 virtual void DeleteMessagesByUidL( const TFSMailMsgId& aMailBoxId,
-	 									const TFSMailMsgId& aFolderId,
-	 									const RArray<TFSMailMsgId>& aMessages ) = 0;
-
-    /**
-     * creates new message template into drafts folder
-     *
-     * @param aMailBoxId defines mailbox where message is created
-     * @return message object to be modified by user (ownership is transferred to user)
-     */
-	 virtual CFSMailMessage* CreateMessageToSendL( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * creates new message template to drafts folder to be forwarded
-     *
-     * @param aMailBoxId defines mailbox where message is created
-     * @param aOriginalMessageId defines original message,which is forwarded
-     * @return message object to be modified by user (ownership is transferred to user)
-     */
-	 virtual CFSMailMessage* CreateForwardMessageL( const TFSMailMsgId& aMailBoxId,
-	 												const TFSMailMsgId& aOriginalMessageId ) = 0;
-
-    /**
-     * creates new reply message template to drafts folder
-     * @param aMailBoxId defines mailbox where message is created
-     * @param aOriginalMessageId defines id of original message,which is replied to
-     * @param aReplyToAll
-     * @return message object to be modified by user (ownership is transferred to user)
-     */
-	 virtual CFSMailMessage* CreateReplyMessageL( const TFSMailMsgId& aMailBoxId,
-	 											  const TFSMailMsgId& aOriginalMessageId,
-	 											  const TBool aReplyToAll ) = 0;
-
-    /**
-     * stores message data to message store after modifications (commit)
-     *
-     * @param aMailBoxId defines mailbox where message is stored
-     * @param aMessage message data to be stored by plugin
-     */
-	 virtual void StoreMessageL( const TFSMailMsgId& aMailBoxId,
-	 							 CFSMailMessage& aMessage ) = 0;
-
-    /**
-     * starts asynchronous message fetching done by plugin
-	 *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aFolderId defines parent folder where message is located
-     * @param aMessageIds defines ids of messages to be fetched
-     *
-     * @param aDetails defines which message parts are included in message
-	 * EFSMsgDataIdOnly  -> Doesn't get any data. The object just contains the ID.
-	 * EFSMsgDataDate    -> 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 -> Like above but when sorting by subject
-	 * EFSMsgDataSender  -> Likewise for sender address.
-	 * EFSMsgDataEnvelope -> Date, subject, Sender, To, Cc at least.
-	 * EFSMsgDataStructure -> the part structure including mime type, size and name headers.
-	 *
-     * @param aObserver defines callback medhod, which plugin calls after
-     *        async request has completed
-     * @param aRequestId identifies asynchronous request
-     */
-     virtual void FetchMessagesL(	const TFSMailMsgId& aMailBoxId,
-     							 	const TFSMailMsgId& aParentFolderId,
-     							 	const RArray<TFSMailMsgId>& aMessageIds,
-     							 	TFSMailDetails aDetails,
-     							 	MFSMailRequestObserver& aObserver,
-     							 	TInt aRequestId) = 0;
-
-    /**
-     * DEPRECATED
-     * Fetches message part contents from server asynchronously.
-     *
-     * @param aMessagePartIds define message part ids of message parts that are asked to be fetched
-     * @param aOperationObserver is FW provided observer that should be used to report progress notifications during the operation.
-     * @param aRequestId identifies asynchronous request
-     */
-     virtual void FetchMessagesPartsL( 	const RArray<TFSMailMsgId>& aMessagePartIds,
-     									MFSMailRequestObserver& aOperationObserver,
-										const TInt aRequestId) = 0;
-
-    /**
-     * Fetches message part contents from server asynchronously.
-     *
-     * @param aMessagePartIds define message part ids of message parts that are asked to be fetched
-     * @param aOperationObserver is FW provided observer that should be used to report
-     *  progress notifications during the operation.
-     * @param aRequestId identifies asynchronous request
-     * @param aPreferredByteCount indicates how much more content for part(s) UI wants to fetch.
-	 * Default value zero indicates that all content should be fetched.
-	 * Actual amount of data fetched may differ from requested (possibly all fetched in any case).
-     */
-     virtual void FetchMessagePartsL( 	const RArray<TFSMailMsgId>& aMessagePartIds,
-        								MFSMailRequestObserver& aOperationObserver,
-										const TInt aRequestId,
-        								const TUint aPreferredByteCount) = 0;
-
-
-    /* synchronous message accessor
-	 *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageIds defines ids of messages to be read from store
- 	 * @param aMessageList plugin writes results into this
-     *
-     * @param aDetails defines which message parts are included in message
-	 * EFSMsgDataIdOnly  -> Doesn't get any data. The object just contains the ID.
-	 * EFSMsgDataDate    -> 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 -> Like above but when sorting by subject
-	 * EFSMsgDataSender  -> Likewise for sender address.
-	 * EFSMsgDataEnvelope -> Date, subject, Sender, To, Cc at least.
-	 * EFSMsgDataStructure -> the part structure including mime type, size and name headers.
- 	 *
-	 */
-     virtual void GetMessagesL(	const TFSMailMsgId& aMailBoxId,
-     							const TFSMailMsgId& aParentFolderId,
-     							const RArray<TFSMailMsgId>& aMessageIds,
-     							RPointerArray<CFSMailMessage>& aMessageList,
-     							const TFSMailDetails aDetails ) = 0;
-
-    /**
-     * Returns child part objects for given message part. Ownership of objects
-     * is transferred to caller.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aParentId gives the id of the parent message part
-     * @param aParts list of child parts of given parent message part
-     */
-     virtual void ChildPartsL( 	const TFSMailMsgId& aMailBoxId,
-     							const TFSMailMsgId& aParentFolderId,
-								const TFSMailMsgId& aMessageId,
-     						   	const TFSMailMsgId& aParentId,
-     						 	RPointerArray<CFSMailMessagePart>& aParts) = 0;
-
-    /**
-     * Creates and adds a new child part to this part.
-     * If aInsertBefore is NULL id then new part is added as last.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aParentPartId parent of the new part
-     * @param aInsertBefore id of existing part that new part should precede.
-     * If NULL id then new part is added as last.
-     */
-     virtual CFSMailMessagePart* NewChildPartL( const TFSMailMsgId& aMailBoxId,
-				     							const TFSMailMsgId& aParentFolderId,
-												const TFSMailMsgId& aMessageId,
-     											const TFSMailMsgId& aParentPartId,
-        										const TFSMailMsgId& aInsertBefore,
-												const TDesC& aContentType) = 0;
-
-    /**
-     * Copies given message as new child part to this part.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aParentPartId parent of the new part
-     * @param aInsertBefore id of existing part that new part should precede.
-     * If NULL id then new part is added as last.
-     * @param aMessage specifies the message that is copied
-     */
-     virtual CFSMailMessagePart* CopyMessageAsChildPartL(const TFSMailMsgId& aMailBoxId,
-						     							 const TFSMailMsgId& aParentFolderId,
-														 const TFSMailMsgId& aMessageId,
-        												 const TFSMailMsgId& aParentPartId,
-        												 const TFSMailMsgId& aInsertBefore,
-        												 const CFSMailMessage& aMessage) = 0;
-
-    /**
-     * Removes child part (and its children, if any) from this part
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aParentPartId parent of the part
-     * @param aPartId part to remove
-     */
-     virtual void RemoveChildPartL(	const TFSMailMsgId& aMailBoxId,
-	     							const TFSMailMsgId& aParentFolderId,
-								 	const TFSMailMsgId& aMessageId,
-        							const TFSMailMsgId& aParentPartId,
-        							const TFSMailMsgId& aPartId) = 0;
-
-    /**
-     * Returns given message part. Ownership of object is transferred to caller.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     */
-     virtual CFSMailMessagePart* MessagePartL(  const TFSMailMsgId& aMailBoxId,
-			         							const TFSMailMsgId& aParentFolderId,
- 												const TFSMailMsgId& aMessageId,
-     											const TFSMailMsgId& aMessagePartId) = 0;
-
-    /**
-     *
-     * Retrieves a read-only file handle for the content file of this message part.
-     * Should return KErrNotSupported if handle can not be given directly. In that case
-     * FW will next ask to copy file to a temporary location so that FW can open the RFile
-     * itself. Ownership of the handle is transferred. Caller is responsible for closing the
-     * handle.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     * @param aFileHandle returns the opened read-only file handle
-     */
-     virtual TInt GetMessagePartFileL(  const TFSMailMsgId& aMailBoxId,
-		      							const TFSMailMsgId& aParentFolderId,
-    									const TFSMailMsgId& aMessageId,
-     									const TFSMailMsgId& aMessagePartId,
-     									RFile& aFileHandle) = 0;
-
-    /**
-     * copies message part to given location
-     *
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     * @param aFilePath message part location
-     */
-     virtual void CopyMessagePartFileL( const TFSMailMsgId& aMailBoxId,
-     	     							const TFSMailMsgId& aParentFolderId,
-										const TFSMailMsgId& aMessageId,
-     									const TFSMailMsgId& aMessagePartId,
-     									const TDesC& aFilePath) = 0;
-
-
-    /**
-     * gets message part content to given buffer
-     *
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     * @param aBuffer
-     * @param aStartOffset
-     */
-	 virtual void GetContentToBufferL(	const TFSMailMsgId& aMailBoxId,
-	 	     							const TFSMailMsgId& aParentFolderId,
-								 		const TFSMailMsgId& aMessageId,
-	 							 		const TFSMailMsgId& aMessagePartId,
-	 							 		TDes& aBuffer,
-	 							 		const TUint aStartOffset) = 0;
-
-    /**
-     * stores message part content
-     *
-     *
-     * @param aBuffer message part content
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     */
-	 virtual void SetContentL(	const TDesC& aBuffer,
-	 						  	const TFSMailMsgId& aMailBoxId,
-     							const TFSMailMsgId& aParentFolderId,
-								const TFSMailMsgId& aMessageId,
-	 							const TFSMailMsgId& aMessagePartId) = 0;
-
-    /**
-     * Removes fetched contents of these parts.
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aPartIds Array of message part ids.
-     */
-     virtual void RemovePartContentL( 	const TFSMailMsgId& aMailBoxId,
-     	     							const TFSMailMsgId& aParentFolderId,
-									  	const TFSMailMsgId& aMessageId,
-     								  	const RArray<TFSMailMsgId>& aPartIds) = 0;
-
-    /**
-     * Sets contents from given file. Possible old contents are replaced.
-     *
-     *
-     * @param aMailBoxId defines mailbox where message is located
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePartId gives the id of the message part
-     * @param aFilePath Path to source file
-     */
-     virtual void SetPartContentFromFileL(	const TFSMailMsgId& aMailBoxId,
-			     							const TFSMailMsgId& aParentFolderId,
-		 									const TFSMailMsgId& aMessageId,
-         									const TFSMailMsgId& aMessagePartId,
-         									const TDesC& aFilePath) = 0;
-    /**
-     * stores message part data to message store after modifications (commit)
-     *
-     * @param aMailBoxId defines mailbox where message part is stored
-     * @param aParentFolderId defines parent folder where message is located
-     * @param aMessageId gives the id of the message that message part belongs to
-     * @param aMessagePart message part data to be stored by plugin
-     */
-     virtual void StoreMessagePartL( const TFSMailMsgId& aMailBoxId,
-   	     							 const TFSMailMsgId& aParentFolderId,
-									 const TFSMailMsgId& aMessageId,
-         							 CFSMailMessagePart& aMessagePart) = 0;
-
-    /**
-     * unregisters plugin request observer to cancel pending events
-     *
-     * @param aRequestId request id of the pending asynchronous request
-     */
-	 virtual void UnregisterRequestObserver(TInt aRequestId) = 0;
-
-    // MESSAGE SENDING
-    /**
-     * DEPRECATED
-     *
-     * starts message sending done by plugin
-     * cancellation is deleting the message from outbox
-     *
-     * @param aMessageId defines message id to be sent
-     */
-     virtual void SendL( TFSMailMsgId aMessageId ) = 0;
-
-    /**
-     * starts message sending done by plugin
-     * cancellation is deleting the message from outbox
-     *
-     * @param aMessage message to be sent
-     */
-     virtual void SendMessageL( CFSMailMessage& aMessage ) = 0;
-
-    /**
-     * method to require pending asynchronous request status
-	 *
-     * @param aRequestId identifies request if parallel requests exists
-     * @return pending request status
-     */
-     virtual TFSProgress StatusL( const TInt aRequestId ) = 0;
-
-    /**
-     * method for canceling pending request
-     * @param aRequestId identifies request if parallel requests exists
-	 */
-     virtual void CancelL( const TInt aRequestId ) = 0;
-
-	// Search API
- 	// OPEN: IDS plugin nippets?
-
-    /**
-     * Asyncronous call for starting search for given string. Only one search can be
-     * performed at a time.
-     *
-     *
-     * This function will search for message's containing the given search string.
-     * The search will be performed on the all message fields: To, Cc, Bcc, subject, body.
-     * The search client will be notified of each found message,
-     * and upon completion of the search.  Only one search can be performed at a time.
-     *
-     * To change the sort order in the search result, use the same search string in the
-     * but change the aSortCriteria parameter.  The store "caches" the search
-     * 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
-     *
-     * @paran aMailBoxId mailbox where messages are to be searched
-     * @param aFolderIds list of folders where messages are to be searched
-     * @param aSearchStrings text strings that will be searched from different message fields.
-	 * @param aSortCriteria sort criteria for the results
-     * @param aSearchObserver client observer that will be notified about search status.
-     *
-     */
-	virtual void SearchL( const TFSMailMsgId& aMailBoxId,
-						  const RArray<TFSMailMsgId>& aFolderIds,
-						  const RPointerArray<TDesC>& aSearchStrings,
-						  const TFSMailSortCriteria& aSortCriteria,
-					      MFSMailBoxSearchObserver& aSearchObserver ) = 0;
-
-
-    /**
-     * Cancels current search. Does nothing if there is not any search.
-     * 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.
-	 *
-     * @paran aMailBoxId mailbox where the search should be cancelled
-	 *
-     */
-	virtual void CancelSearch( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /** Inform the store to clean up its cache for search results.
-     *
-     *  This method cancels the the ongoing search (if exists), and then clean ups store's cache.
-     *
-     *  This function should be called when search results are no longer in display.
-	 *
-     * @paran aMailBoxId mailbox where the search cache should be cleared
-	 *
-    */
-    virtual void ClearSearchResultCache( const TFSMailMsgId& aMailBoxId ) = 0;
-
-    /**
-     * Adds a new event observer. There can be several observers active at the same time.
-     * Caller MUST call RemoveObserver before destroying given observer object.
-     *
-     * @param aObserver observer implementation
-     */
-    virtual void AddObserverL(MFSMailEventObserver& aObserver) = 0;
-
-    /**
-     * Removes observer
-     *
-     * @param aObserver observer implementation
-     */
-    virtual void RemoveObserver(MFSMailEventObserver& aObserver) = 0;
-
-    /**
-     * Subscribes events from given mailbox.
-     * UnsubscribeMailboxEvents MUST be called before destroying given observer object.
-     *
-     * @param aMailboxId id of target mailbox
-     * @param aObserver observer implementation
-     */
-    virtual void SubscribeMailboxEventsL(const TFSMailMsgId& aMailboxId,
-    									 MFSMailEventObserver& aObserver) = 0;
-
-    /**
-     * Unsubscribes events from given mailbox
-     *
-     * @param aMailboxId id of target mailbox
-     * @param aObserver observer implementation
-     */
-    virtual void UnsubscribeMailboxEvents(const TFSMailMsgId& aMailboxId,
-    									  MFSMailEventObserver& aObserver) = 0;
-
-    /**
-     * Returns the current sync state for this mailbox.
-     *
-     * @param aMailboxId id of target mailbox
-     */
-    virtual TSSMailSyncState CurrentSyncState(const TFSMailMsgId& aMailboxId) = 0;
-
-    /**
-     * Sets the mailbox name for this mailbox.
-     *
-     * @param aMailboxId id of target mailbox
-     * @param aMailboxName new name for the mailbox
-     */
-    virtual void SetMailboxName(const TFSMailMsgId& aMailboxId, const TDesC& aMailboxName );
-
-  	};
-
-
-#endif  // M_FSMAILPLUGIN_H
-
-// End of File
--- a/emailservices/emailframework/inc/MailBrandManager.hrh	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* 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"
-* 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:  Branding Manager definitons.
-*
-*/
-
-
-#ifndef MAILBRANDMANAGER_HRH
-#define MAILBRANDMANAGER_HRH
-
-/** branding element */
-enum TFSBrandElement
-	{
-	EFSMailboxIcon,
-	EFSMailboxName,
-	EFSMailboxNameColor,
-	EFSComposeScreenBackground,
-	EFSWatermark,
-	EFSBrandName
-	};
-	
-#endif  // MAILBRANDMANAGER_HRH
-
--- a/emailservices/emailframework/inc/MailBrandManager.rh	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  ES Protocol Framework brand manager 
-*                resource structure definitions 
-*
-*/
-
-
-STRUCT BRANDABLE_GRAPHIC
-	{
-	LONG id;	// enum TFSBrandElement
-	LONG icon_id;
-	LONG mask_id;
-	}
-	
-STRUCT BRANDABLE_TEXT
-	{
-	LONG id;	// enum TFSBrandElement
-	LTEXT text;
-	}
-
-STRUCT BRAND_MATCH_STRING
-    {
-    LTEXT text; // branding match string 
-    }
-	
-STRUCT BRANDABLE_COLOR
-	{
-	LONG id;	// enum TFSBrandElement
-	WORD red;
-	WORD green;
-	WORD blue;
-	WORD alpha;
-	}
-	
-STRUCT BRAND
-	{
-    LTEXT  graphics_file_path;
-	STRUCT brand_id_match_strings[];   // list of match strings
-	STRUCT graphics[];				   // of type BRANDABLE_GRAPHIC
-	STRUCT texts[];					   // of type BRANDABLE_TEXT
-	STRUCT colors[];				   // of type BRANDABLE_COLOR
-	}
-	
-STRUCT BRANDING_DATA
-	{
-	STRUCT list_of_brands[];		// of type BRAND
-	}
-	
-	
--- a/emailservices/emailframework/src/CFSMailBrand.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,406 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: This file implements class CFSMailBrand.
-*
-*/
-
-#include "emailtrace.h"
-
-//<qmail>
-#include <nmcommonheaders.h>
-//</qmail>
-
-#include <barsread.h>
-//<qmail> Commented out in Qmail
-//#include <AknIconUtils.h>
-//</qmail>
-#include <gulicon.h>
-#include <centralrepository.h>
-//<cmail>
-//<qmail> Commented out in Qmail
-//#include "freestyleemailcenrepkeys.h"
-//</qmail>
-//</cmail>
-
-#include "CFSMailBrand.h"
-
-const TInt KElementArrayGranularity = 5;
-//<qmail> Commented out in Qmail
-//const TInt KMaxStringLenFromCenrep = 256;
-//</qmail>
-const TInt KMaxDesLen = 256;
-_LIT(KSpace, " ");
-// -----------------------------------------------------------------------------
-// CFSMailBrand::NewL
-// -----------------------------------------------------------------------------
-CFSMailBrand* CFSMailBrand::NewL( TResourceReader& aReader, TBool aIsWhiteLabel )
-	{
-    NM_FUNCTION;
-    
-	CFSMailBrand* brManager =  CFSMailBrand::NewLC(aReader, aIsWhiteLabel);
-  	CleanupStack:: Pop(brManager);
-  	return brManager;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::NewLC
-// -----------------------------------------------------------------------------
-CFSMailBrand* CFSMailBrand::NewLC( TResourceReader& aReader, TBool aIsWhiteLabel )
-	{
-    NM_FUNCTION;
-    
-    CFSMailBrand* self = new ( ELeave ) CFSMailBrand();
-    CleanupStack::PushL( self );
-    if ( aIsWhiteLabel )
-    	{
-    	self->ConstructFromCenrepL( );
-    	}
-    else
-    	{
-    	self->ConstructFromResourceL( aReader );
-    	}
-    return self;
-	}
-
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::ConstructFromCenrepL
-// -----------------------------------------------------------------------------
-void CFSMailBrand::ConstructFromCenrepL( )
-    {
-    NM_FUNCTION;
-    
-	/*
-    TBuf<KMaxStringLenFromCenrep> tBuf; // Temporary buffer
-    HBufC*    mailboxName;
-
-    iGraphicElements = new ( ELeave )
-        CArrayFixSeg< TBrandedGraphic >( KElementArrayGranularity );
-
-    iTextElements = new ( ELeave )
-        CArrayFixSeg< TBrandedText >( KElementArrayGranularity );
-
-    iTexts = new ( ELeave ) CDesCArraySeg( KElementArrayGranularity );
-
-    CRepository* repository = NULL;
-    TRAPD( ret, repository = CRepository::NewL( KFreestyleEmailCenRep ));
-    if ( ret == KErrNone )
-        {
-        CleanupStack::PushL( repository );
-        TInt err_count = 0;
-        // Read all WLB related parameters from Central Repository
-        TInt err = repository->Get( KFreestyleWLBBrandIdMatchString, tBuf );
-        HBufC* buf = tBuf.AllocL();
-        iBrandMatchStrings.AppendL(buf);
-        if ( err != KErrNone )
-            {
-            err_count++;
-            }
-        err = repository->Get( KFreestyleWLBMailboxName, tBuf );
-        mailboxName = tBuf.AllocLC();
-        if ( err != KErrNone )
-            {
-            err_count++;
-            }
-        err = repository->Get( KFreestyleWLBMIFFilePathWithTargetFilename, tBuf );
-        iIconFilePath = tBuf.AllocL();
-        if ( err != KErrNone )
-            {
-            err_count++;
-            }
-        if ( err_count == 0 )
-            {
-            // Create WLB graphic elements
-            TBrandedGraphic newMailboxIconElement;
-            newMailboxIconElement.iElementId = ( TFSBrandElement ) EFSMailboxIcon;
-            err = repository->Get( KFreestyleWLBMailboxIconID, newMailboxIconElement.iIconId );
-            if ( err != KErrNone )
-                newMailboxIconElement.iIconId = 0x4000; // Use default if Cenrep read fails
-            newMailboxIconElement.iMaskId = newMailboxIconElement.iIconId + 1;      
-            iGraphicElements->AppendL( newMailboxIconElement );
-
-            TBrandedText newMailboxNameElement;
-            newMailboxNameElement.iElementId = ( TFSBrandElement) EFSMailboxName;
-            iTexts->AppendL( *mailboxName );
-            newMailboxNameElement.iText.Set( iTexts->MdcaPoint( iTexts->Count() - 1 ) );
-            iTextElements->AppendL( newMailboxNameElement );
-            }
-        CleanupStack::PopAndDestroy( mailboxName );
-        CleanupStack::PopAndDestroy( repository );
-        }
-		*/
-   }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::ConstructFromResourceL
-// -----------------------------------------------------------------------------
-void CFSMailBrand::ConstructFromResourceL( TResourceReader& aReader )
-    {
-    NM_FUNCTION;
-
-    // read icon filepath
-    iIconFilePath = aReader.ReadHBufCL();
-
-    // read match strings
-    TInt count = aReader.ReadInt16();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        iBrandMatchStrings.AppendL(aReader.ReadHBufCL());        
-        }   
-
-    // read graphics
-    iGraphicElements = new ( ELeave )
-        CArrayFixSeg< TBrandedGraphic >( KElementArrayGranularity );
-    count = aReader.ReadInt16();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        TBrandedGraphic newElement;
-        newElement.iElementId = ( TFSBrandElement ) aReader.ReadInt32();
-        newElement.iIconId = aReader.ReadInt32();
-        newElement.iMaskId = aReader.ReadInt32();
-        iGraphicElements->AppendL( newElement );
-        }
-
-    // read texts
-    iTexts = new ( ELeave ) CDesCArraySeg( KElementArrayGranularity );
-    iTextElements = new ( ELeave )
-        CArrayFixSeg< TBrandedText >( KElementArrayGranularity );
-    count = aReader.ReadInt16();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        TBrandedText newElement;
-        newElement.iElementId = ( TFSBrandElement) aReader.ReadInt32();
-        HBufC* text = aReader.ReadTPtrC().AllocLC();
-        iTexts->AppendL( *text );
-        CleanupStack::PopAndDestroy( text );
-        newElement.iText.Set( iTexts->MdcaPoint( iTexts->Count() - 1 ) );
-        iTextElements->AppendL( newElement );
-        }
-
-    // read colors
-    iColorElements = new ( ELeave )
-        CArrayFixSeg< TBrandedColor >( KElementArrayGranularity );
-    count = aReader.ReadInt16();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        TBrandedColor newElement;
-        newElement.iElementId = ( TFSBrandElement ) aReader.ReadInt32();
-        newElement.iColor.SetRed( aReader.ReadInt16() );
-        newElement.iColor.SetGreen( aReader.ReadInt16() );
-        newElement.iColor.SetBlue( aReader.ReadInt16() );
-        newElement.iColor.SetAlpha( aReader.ReadInt16() );
-        iColorElements->AppendL( newElement );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::~CFSMailBrand()
-// -----------------------------------------------------------------------------
-CFSMailBrand::~CFSMailBrand()
-	{
-    NM_FUNCTION;
-    
-	iBrandMatchStrings.ResetAndDestroy();
-	delete iIconFilePath;
-	delete iGraphicElements;
-	delete iTextElements;
-	delete iColorElements;
-	delete iTexts;
-	delete iEmpty;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::CFSMailBrand()
-// -----------------------------------------------------------------------------
-CFSMailBrand::CFSMailBrand()
-	{
-    NM_FUNCTION;
-    
-		// prepare null empty descriptor
-	iEmpty = HBufC::New(1);
-	iEmpty->Des().Copy(KNullDesC());
-
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::IsMatching
-// -----------------------------------------------------------------------------
-TBool CFSMailBrand::IsMatching( const TDesC& aBrandId )
-    {
-    NM_FUNCTION;
-    const TChar KStar = '*';
-    TBool ret = EFalse;
-    TInt intRet = 0; 
-    TInt count = iBrandMatchStrings.Count();
-    for( TInt i=0;i<count;i++ )
-        {
-        TPtrC brandMatchStringPtr = *iBrandMatchStrings[i];
-        TInt matchPos = aBrandId.MatchC( *iBrandMatchStrings[i] );
-        if ( matchPos >= 0 )
-            {
-        	TPtrC rightPartPtr = aBrandId.Right( aBrandId.Length()-matchPos );
-            TChar isStar = brandMatchStringPtr[0];
-            TInt cut = 0;
-            if ( isStar == KStar )
-                {
-                cut = 1;	
-                }
-            TPtrC matchString = brandMatchStringPtr.Right( brandMatchStringPtr.Length()-cut );
-        	intRet = rightPartPtr.CompareC( matchString );
-            if ( intRet == 0 )
-                {
-        	    ret = ETrue;
-        	    }
-            }
-        }
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::GetText
-// -----------------------------------------------------------------------------
-TDesC& CFSMailBrand::GetText( TFSBrandElement aElementId )
-    {
-    NM_FUNCTION;
-    
-    TInt textCount( iTextElements->Count() );
-
-    for ( TInt i( 0 ); i < textCount; i++ )
-        {
-        if ( iTextElements->At( i ).iElementId == aElementId )
-            {
-            return iTextElements->At( i ).iText;
-            }
-        }
-        
-    return *iEmpty;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::GetColor
-// -----------------------------------------------------------------------------
-TInt CFSMailBrand::GetColor( TFSBrandElement aElementId, TRgb& aColor )
-    {
-    NM_FUNCTION;
-    
-    TInt colorCount( iColorElements->Count() );
-
-    for ( TInt i( 0 ); i < colorCount; i++ )
-        {
-        if ( iColorElements->At( i ).iElementId == aElementId )
-            {
-            aColor = iColorElements->At( i ).iColor;
-            return KErrNone;
-            }
-        }
-    
-    return KErrNotFound;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::GetGraphicL
-// -----------------------------------------------------------------------------
-CGulIcon* CFSMailBrand::GetGraphicL( TFSBrandElement aElementId )
-    {
-    NM_FUNCTION;
-    
-    TInt graphicsCount( iGraphicElements->Count() );
-
-    for ( TInt i( 0 ); i < graphicsCount; i++ )
-        {
-        TBrandedGraphic element = iGraphicElements->At( i );
-
-        if ( element.iElementId == aElementId )
-            {
-            CFbsBitmap* icon( NULL );
-            CFbsBitmap* mask( NULL );            
-
-            if ( iIconFilePath == NULL )
-                {
-                // If graphic element is found but no path is defined it is
-                // deemed as an error situation.
-                User::Leave( KErrNotFound );
-                }
-                
-            TFileName dllFileName;
-            Dll::FileName( dllFileName );
-		 	TParse parse;
-		    User::LeaveIfError( parse.Set( *iIconFilePath, &dllFileName, NULL) );
-		    TFileName iconFileName( parse.FullName() );
-             
-//<qmail>
-            // Get icon and mask with above info
-            /*AknIconUtils::CreateIconLC( icon,
-                                        mask,
-                                        iconFileName,
-                                        element.iIconId,
-                                        element.iMaskId );*/
-//</qmail>
-            CGulIcon* gulIcon = CGulIcon::NewL( icon, mask );
-
-            CleanupStack::Pop( 2 ); // icon, mask
-            
-            return gulIcon;
-            }
-        }
-
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrand::GetGraphicIdsL
-// -----------------------------------------------------------------------------
-TInt CFSMailBrand::GetGraphicIdsL( TFSBrandElement aElementId,
-                                   TDes& aIconIds)
-    {
-    NM_FUNCTION;
-    
-    aIconIds.Zero();
-    TInt graphicsCount( iGraphicElements->Count() );
-
-    for ( TInt i( 0 ); i < graphicsCount; i++ )
-        {
-        TBrandedGraphic element = iGraphicElements->At( i );
-
-        if ( element.iElementId == aElementId )
-            {
-            if ( iIconFilePath == NULL )
-                {
-                // If graphic element is found but no path is defined it is
-                // deemed as an error situation.
-                User::Leave( KErrNotFound );
-                }
-                
-            TFileName dllFileName;
-            Dll::FileName( dllFileName );
-		 	TParse parse;
-		    User::LeaveIfError( parse.Set( *iIconFilePath, &dllFileName, NULL) );
-		    TFileName iconFileName( parse.FullName() );
-            
-		    TBuf<KMaxDesLen> id;
-		    aIconIds.Copy(iconFileName);
-		    aIconIds.Append(KSpace);
-		    id.Num(element.iIconId);
-		    aIconIds.Append(id);
-		    aIconIds.Append(KSpace);
-		    id.Num(element.iMaskId);
-            aIconIds.Append(id);
-            
-            return KErrNone;
-            }
-        }
-
-    return KErrNotFound;
-    }
-
--- a/emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,681 +0,0 @@
-/*
-* 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"
-* 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:  ES Protocol Framework branding manager interface definition
-*
-*/
-
-#include "emailtrace.h"
-
-//<qmail>
-#include <nmcommonheaders.h>
-//</qmail>
-
-#include <fsmailbrandmanager.rsg>
-#include <barsread.h>
-#include <bautils.h>
-#include <mmf/common/mmfcontrollerpluginresolver.h> // CleanupResetAndDestroy
-// <gmail_brand_issue>
-#include <etelmm.h>
-#include <mmtsy_names.h>
-#include <startupdomainpskeys.h>
-#include <tzlocalizer.h> // CTzLocalizer
-#include <centralrepository.h>
-// </gmail_brand_issue>
-//<cmail>
-#include "CFSMailClient.h"
-//</cmail>
-
-#include "CFSMailBrandManagerImpl.h"
-#include "CFSMailBrand.h"
-
-
-const TInt KBrandArrayGranularity = 5;
-_LIT( KResourceFilePath,"\\resource\\fsmailbrandmanager.rsc" );
-
-// The following are needed to convert "Gmail" brand name to "Google Mail"
-// in certain countries.
-// <gmail_brand_issue>
-
-_LIT( KBrandNameGmail, "Gmail" );
-_LIT( KBrandNameGoogleMail, "Google Mail" );
-
-_LIT( KMCCGermany, "262" );
-_LIT( KMCCUK1, "234" );
-_LIT( KMCCUK2, "235" );
-
-const TUint8 KGermanyTzId = 36;
-const TUint8 KUKTzId = 104;
-
-const TInt KMCCValueMaxLength = 3;
-
-#ifdef __WINS__
-LOCAL_C void RetrieveNextToken( TDes8& aContent, TDes& aToken )	
-	{
-    NM_FUNCTION;
-    
-	_LIT8( KComma, "," );
-	TInt pos = aContent.Find( KComma );
-	if ( pos != KErrNotFound ) 
-		{
-		aToken.Copy( aContent.MidTPtr( 0, pos ) );
-		aContent.Copy(
-		    aContent.RightTPtr( aContent.Length() - pos - 1 ) );
-		}
-	}
-#endif // __WINS__
-// </gmail_brand_issue>
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::CFSMailBrandManagerImpl
-// -----------------------------------------------------------------------------
-CFSMailBrandManagerImpl::CFSMailBrandManagerImpl(
-    CFSMailClient& aMailClient ) :
-    iMailClient( aMailClient )
-	{
-    NM_FUNCTION;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::ConstructL
-// -----------------------------------------------------------------------------
-void CFSMailBrandManagerImpl::ConstructL()
-    {
-    NM_FUNCTION;
-
-    // Read resource file, get the drive letter according to the DLL drive
-    TFileName dllFileName;
-    Dll::FileName( dllFileName );
-    
- 	TParse parse;
-    User::LeaveIfError( parse.Set( KResourceFilePath, &dllFileName, NULL ) );
-    TFileName resourceFileName( parse.FullName() );
-
-    if ( !iFsSession.Handle() )
-        {
-        User::LeaveIfError( iFsSession.Connect() );
-        }
-
-    BaflUtils::NearestLanguageFile( iFsSession, resourceFileName );
-    
-    iResourceFile.OpenL( iFsSession, resourceFileName );
-        
-    iResourceFile.ConfirmSignatureL();
-
-    HBufC8* resourceBuffer = iResourceFile.AllocReadLC( R_BRANDING_DATA );
-
-    TResourceReader reader;
-    reader.SetBuffer( resourceBuffer );
-
-	ConstructFromResourceL( reader );
-
-    CleanupStack::PopAndDestroy( resourceBuffer );
-
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::~CFSMailBrandManagerImpl
-// -----------------------------------------------------------------------------
-CFSMailBrandManagerImpl::~CFSMailBrandManagerImpl()
-	{
-    NM_FUNCTION;
-	
-	iResourceFile.Close();
-    iFsSession.Close();
-	
-	if ( iBrands )
-		{
-		iBrands->ResetAndDestroy();
-		}
-	delete iBrands;
-	}
-	
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::NewL
-// -----------------------------------------------------------------------------
-CFSMailBrandManagerImpl* CFSMailBrandManagerImpl::NewL(
-    CFSMailClient& aMailClient )
-    {
-    NM_FUNCTION;
-    
-    CFSMailBrandManagerImpl* self =
-        CFSMailBrandManagerImpl::NewLC( aMailClient );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::NewLC
-// -----------------------------------------------------------------------------
-CFSMailBrandManagerImpl* CFSMailBrandManagerImpl::NewLC(
-    CFSMailClient& aMailClient )
-    {
-    NM_FUNCTION;
-    
-    CFSMailBrandManagerImpl* self =
-        new( ELeave ) CFSMailBrandManagerImpl( aMailClient );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-    
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::UpdateMailboxNamesL
-// -----------------------------------------------------------------------------
-void CFSMailBrandManagerImpl::UpdateMailboxNamesL( const TFSMailMsgId aMailBoxId )
-    {
-    NM_FUNCTION;
-    
-    // list all mailboxes
-    RPointerArray<CFSMailBox> mailBoxes;
-    CleanupResetAndDestroyPushL( mailBoxes );
-    iMailClient.ListMailBoxes( TFSMailMsgId(), mailBoxes );
-    // Check is there need to change the name of the mailbox
-    TPtrC name = GetTextL( EFSMailboxName, aMailBoxId);
-    // <gmail_brand_issue>
-    VerifyMailAccountName( name );
-    // </gmail_brand_issue>
-    if( name.Length() )
-        {
-        // check duplicates
-        TInt orderNumber(2);
-        TBool duplicate(ETrue);
-        HBufC* newName = HBufC::NewL(name.Length()+6);
-        TPtrC brandedName = name;
-        while(duplicate != EFalse)
-            {
-            duplicate = EFalse;
-            for(TInt i = 0; i < mailBoxes.Count( );i++)
-                {
-                if(brandedName == mailBoxes[i]->GetName() && 
-                   aMailBoxId != mailBoxes[i]->GetId( ))
-                    {
-                    duplicate = ETrue;
-                    newName->Des().Copy(name);
-                    newName->Des().Append(' ');
-                    newName->Des().Append('(');
-                    newName->Des().AppendNum(orderNumber++);
-                    newName->Des().Append(')');
-                    brandedName.Set(newName->Des());
-                    break;
-                    }
-                }
-            }
-        iMailClient.SetMailboxName(aMailBoxId,brandedName);
-        delete newName;
-        }
-    CleanupStack::PopAndDestroy( &mailBoxes );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetGraphicL
-// -----------------------------------------------------------------------------
-CGulIcon* CFSMailBrandManagerImpl::GetGraphicL(
-    TFSBrandElement aElement, 
-	const TFSMailMsgId& aMailboxId )
-	{
-    NM_FUNCTION;
-    
-	CFSMailBox* mailBox( NULL );
-	TRAPD( mailboxError,
-	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
-	if ( mailboxError != KErrNone )
-	    {
-	    User::Leave( mailboxError );
-	    }	
-	User::LeaveIfNull( mailBox );
-	
-    CleanupStack::PushL( mailBox );    
-    TDesC& brandId = mailBox->GetBrandingIdL();
-
-	CFSMailBrand* brand = FindMatchingBrandL( brandId );
-	CleanupStack::PopAndDestroy( mailBox );
-	if ( brand == NULL )
-	    {
-	    return NULL;    
-	    }
-	
-	return brand->GetGraphicL( aElement );
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetGraphicL
-// -----------------------------------------------------------------------------
-CGulIcon* CFSMailBrandManagerImpl::GetGraphicL(
-    TFSBrandElement aElement, 
-    const TDesC& aBrandId )
-    {
-    NM_FUNCTION;
-    
-    CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
-    if ( brand == NULL )
-        {
-        return NULL;    
-        }    
-    return brand->GetGraphicL( aElement );
-    }
-    
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetGraphicIdsL
-// -----------------------------------------------------------------------------
-TInt CFSMailBrandManagerImpl::GetGraphicIdsL(
-    TFSBrandElement aElement, 
-	const TFSMailMsgId& aMailboxId,
-    TDes& aIconIds  )
-	{
-    NM_FUNCTION;
-    
-	CFSMailBox* mailBox( NULL );
-	TRAPD( mailboxError,
-	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
-	if ( mailboxError != KErrNone )
-	    {
-	    User::Leave( mailboxError );
-	    }	
-	User::LeaveIfNull( mailBox );
-	
-    CleanupStack::PushL( mailBox );    
-    TDesC& brandId = mailBox->GetBrandingIdL();
-
-	CFSMailBrand* brand = FindMatchingBrandL( brandId );
-	CleanupStack::PopAndDestroy( mailBox );
-
-	if ( brand == NULL )
-	    {
-	    return KErrNotFound;
-	    }
-    return brand->GetGraphicIdsL( aElement, aIconIds );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetGraphicIdsL
-// -----------------------------------------------------------------------------
-TInt CFSMailBrandManagerImpl::GetGraphicIdsL(
-    TFSBrandElement aElement, 
-    const TDesC& aBrandId,
-    TDes& aIconIds  )
-    {
-    NM_FUNCTION;
-
-    CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
-    if ( brand == NULL )
-        {
-        return KErrNotFound;
-        }
-    return brand->GetGraphicIdsL( aElement, aIconIds );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetTextL
-// -----------------------------------------------------------------------------
-TPtrC CFSMailBrandManagerImpl::GetTextL(
-    TFSBrandElement aElement,
-    const TFSMailMsgId& aMailboxId )
-	{
-    NM_FUNCTION;
-    
-	CFSMailBox* mailBox( NULL );
-	TRAPD( mailboxError,
-	       mailBox = iMailClient.GetMailBoxByUidL( aMailboxId ) );
-	if ( mailboxError != KErrNone )
-	    {
-	    User::Leave( mailboxError );
-	    }
-	    
-	User::LeaveIfNull( mailBox );
-    CleanupStack::PushL( mailBox );
-    TDesC& brandId = mailBox->GetBrandingIdL();
-	
-	CFSMailBrand* brand = FindMatchingBrandL( brandId );
-	CleanupStack::PopAndDestroy( mailBox );
-	if ( brand == NULL )
-	    {
-	    return KNullDesC();    
-	    }	
-	
-	return brand->GetText( aElement );
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetTextL
-// -----------------------------------------------------------------------------
-TPtrC CFSMailBrandManagerImpl::GetTextL(
-	TFSBrandElement aElement,
-	const TDesC& aBrandId )
-	{
-    NM_FUNCTION;
-
-	CFSMailBrand* brand = FindMatchingBrandL( aBrandId );
-	if ( brand == NULL )
-	    {
-	    return KNullDesC();    
-	    }	
-
-	return brand->GetText( aElement );
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetColorL
-// -----------------------------------------------------------------------------
-TInt CFSMailBrandManagerImpl::GetColorL(
-    TFSBrandElement aElement,
-    const TFSMailMsgId& aMailboxId,
-    TRgb& aColor )
-	{
-    NM_FUNCTION;
-    
-	CFSMailBox* mailBox = iMailClient.GetMailBoxByUidL( aMailboxId );
-	User::LeaveIfNull( mailBox );
-    CleanupStack::PushL( mailBox );    
-    TDesC& brandId = mailBox->GetBrandingIdL();
-	
-	CFSMailBrand* brand = FindMatchingBrandL( brandId );
-	CleanupStack::PopAndDestroy( mailBox );
-	if ( brand == NULL )
-	    {
-	    return KErrNotFound;  
-	    }
-	    
-    return brand->GetColor( aElement, aColor );
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::ConstructFromResourceL
-// -----------------------------------------------------------------------------
-void CFSMailBrandManagerImpl::ConstructFromResourceL( TResourceReader& aReader )
-	{
-    NM_FUNCTION;
-    
-	iBrands = new ( ELeave )
-				CArrayPtrSeg< CFSMailBrand >( KBrandArrayGranularity );
-						
-	// Read White Label Brand from Cenrep
-	CFSMailBrand* newBrand = CFSMailBrand::NewLC( aReader, true );
-	iBrands->AppendL( newBrand );
-	CleanupStack::Pop( newBrand );
-	
-	
-	// Read general brands from resource file
-	TInt brandCount = aReader.ReadInt16();
-
-	for ( TInt i = 0; i < brandCount; i++ )
-		{
-		CFSMailBrand* newBrand = CFSMailBrand::NewLC( aReader, false );
-		iBrands->AppendL( newBrand );
-		CleanupStack::Pop( newBrand );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::FindMatchingBrandL
-// -----------------------------------------------------------------------------
-CFSMailBrand* CFSMailBrandManagerImpl::FindMatchingBrandL( const TDesC& aBrandId )
-    {
-    NM_FUNCTION;
-    
-    if( aBrandId.Length() )
-        {
-        TInt brandCount( iBrands->Count() );
-        for ( TInt i( 0 ); i < brandCount; i++ )
-            {
-            if ( (*iBrands)[ i ]->IsMatching( aBrandId ) )
-                return (*iBrands)[ i ];
-            }
-        }
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::MailboxMatchingBrandIdL
-// -----------------------------------------------------------------------------
-CFSMailBox* CFSMailBrandManagerImpl::MailboxMatchingBrandIdL(
-    const TDesC& aBrandId ) const
-    {    
-    NM_FUNCTION;
-    
-    RPointerArray<CFSMailBox> mailboxes;
-
-    CleanupResetAndDestroyPushL( mailboxes );
-
-    iMailClient.ListMailBoxes( TFSMailMsgId(), mailboxes );
-
-    TInt mailboxCount( mailboxes.Count() );
-    TInt mailboxIndexer( 0 );
-    while ( mailboxIndexer < mailboxCount )
-        {
-        TDesC* brandId( NULL );
-        TRAPD( brandGetError,
-               brandId = &mailboxes[mailboxIndexer]->GetBrandingIdL() )
-        if ( brandGetError != KErrNone )
-            {
-            mailboxes.ResetAndDestroy();
-            User::Leave( brandGetError );
-            }
-            
-        if ( *brandId == aBrandId )
-            {
-            CFSMailBox* matchingMailbox = mailboxes[mailboxIndexer];
-            mailboxes.Remove( mailboxIndexer );
-            mailboxes.ResetAndDestroy();
-            return matchingMailbox;
-            }
-        
-        ++mailboxIndexer;
-        }
-        
-    CleanupStack::PopAndDestroy( &mailboxes );
-    User::Leave( KErrNotFound );
-    return NULL; // To prevent warning
-    }
-
-// <gmail_brand_issue>
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetMCCValueL
-// -----------------------------------------------------------------------------
-void CFSMailBrandManagerImpl::GetMCCValueL( TDes& aMcc ) const
-    {
-    NM_FUNCTION;
-    
-    aMcc.Zero();
-    
-    TInt err = KErrNone;
-
-#ifndef __WINS__
-
-    TBool isSimPresent = EFalse;
-    
-    TInt simStatus( 0 );
-
-	err = RProperty::Get( KPSUidStartup, KPSSimStatus, simStatus );
-
-	if ( err == KErrNone &&
-	        simStatus != ESimNotPresent &&
-	        simStatus != ESimNotSupported )
-	    {
-	    isSimPresent = ETrue;
-	    }
-
-    if ( isSimPresent )
-        {
-        // We cannot let the method leave here
-        TRAP( err, GetMCCValueFromSIML( aMcc ) );
-
-        // If reading from SIM fails one time try again after 0.5 secs
-        if ( err != KErrNone )
-            {
-            const TInt KHalfSecond = 500000;
-
-            User::After( KHalfSecond );
-            
-            err = KErrNone;
-
-            // We cannot let the method leave here
-            TRAP( err, GetMCCValueFromSIML( aMcc ) );
-            }
-        }
-
-#else // __WINS__
-
-    _LIT( KSIMInfo, "C:\\data\\Settings\\SIMInfo.txt" );
-
-    RFs fs;
-
-    User::LeaveIfError( fs.Connect() );
-
-    RFile simFile;
-
-    err = simFile.Open( fs, KSIMInfo(), EFileShareReadersOnly |
-                                        EFileStream |
-                                        EFileRead );
-    if ( err == KErrNone )
-        {
-        TBuf8<100> content;
-        TBuf<100> dummy;
-
-        simFile.Read( content );
-
-    	simFile.Close();
-
-    	fs.Close();
-
-        if ( content.Length() > 0 )
-        	{
-            RetrieveNextToken( content, dummy );
-            RetrieveNextToken( content, dummy );
-            RetrieveNextToken( content, dummy );
-            RetrieveNextToken( content, dummy );
-
-            RMobilePhone::TMobilePhoneSubscriberId subscriberId;
-
-            RetrieveNextToken( content, subscriberId );
-
-            if ( subscriberId.Length() >= KMCCValueMaxLength )
-                {
-                aMcc = subscriberId.Left( KMCCValueMaxLength );
-                }
-        	}
-        }
-
-#endif // __WINS__
-
-    }
-
-// ----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetMCCValueFromSIML
-// ----------------------------------------------------------------------------
-// 
-void CFSMailBrandManagerImpl::GetMCCValueFromSIML( TDes& aMcc ) const
-    {
-    NM_FUNCTION;
-    
-    RTelServer telServer;
-
-    CleanupClosePushL( telServer );
-
-    User::LeaveIfError( telServer.Connect() );
-
-    User::LeaveIfError( telServer.LoadPhoneModule( KMmTsyModuleName ) );
-    
-    RMobilePhone mobilePhone;
-
-    CleanupClosePushL( mobilePhone );
-
-    User::LeaveIfError( mobilePhone.Open( telServer, KMmTsyPhoneName ) );
-    
-    TRequestStatus status;
-
-    RMobilePhone::TMobilePhoneSubscriberId subscriberId;       
-
-    mobilePhone.GetSubscriberId( status, subscriberId );
-    
-    User::WaitForRequest( status );
-
-    User::LeaveIfError( status.Int() );
-    
-    CleanupStack::PopAndDestroy( &mobilePhone );
-
-    CleanupStack::PopAndDestroy( &telServer );
-
-    if ( subscriberId.Length() >= KMCCValueMaxLength )
-        {
-        aMcc = subscriberId.Left( KMCCValueMaxLength );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::GetCurrentCountryL
-// ----------------------------------------------------------------------------
-// 
-TUint8 CFSMailBrandManagerImpl::GetCurrentCountryL() const
-    {
-    NM_FUNCTION;
-    
-    CTzLocalizer* localizer = CTzLocalizer::NewLC();
-
-    CTzLocalizedCity* city = localizer->GetFrequentlyUsedZoneCityL(
-        CTzLocalizedTimeZone::ECurrentZone );
-        
-    CleanupStack::PushL( city );
-
-    CTzLocalizedCityGroup* cityGroup = 
-        localizer->GetCityGroupL( city->GroupId() );
-
-    TUint8 countryId = cityGroup->Id();
-    
-    delete cityGroup;
-    cityGroup = NULL;
-    
-    CleanupStack::PopAndDestroy( 2, localizer );
-    
-    return countryId;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBrandManagerImpl::VerifyMailAccountName
-// -----------------------------------------------------------------------------
-void CFSMailBrandManagerImpl::VerifyMailAccountName(
-        TPtrC& aBrandedName ) const
-    {
-    NM_FUNCTION;
-    
-    // Due to legal reasons we don't show brand name "Gmail" in Germany and UK
-    if ( !aBrandedName.CompareF( KBrandNameGmail ) )
-        {
-        // First check timezone id
-        TUint8 timeZone = 0;
-        
-        TRAPD( err, timeZone = GetCurrentCountryL() );
-        
-        if ( err == KErrNone && ( timeZone == KGermanyTzId ||
-                                  timeZone == KUKTzId ) )
-            {
-            aBrandedName.Set( KBrandNameGoogleMail );
-            }
-        // Then if necessary check MCC
-        else
-            {
-            TBuf<KMCCValueMaxLength> mcc;
-
-            TRAPD( err2, GetMCCValueL( mcc ) );
-            
-            if ( err2 == KErrNone && ( mcc == KMCCGermany ||
-                                       mcc == KMCCUK1 ||
-                                       mcc == KMCCUK2 ) )
-                {
-                aBrandedName.Set( KBrandNameGoogleMail );
-                }
-            }
-
-        }
-    }
-// </gmail_brand_issue>
--- a/emailservices/emailframework/src/CFSMailClient.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailClient.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -26,7 +26,6 @@
 #include "CFSMailPluginManager.h"
 #include "CFSMailRequestObserver.h"
 #include "CFSMailIterator.h"
-#include "CFSMailBrandManagerImpl.h"
 
 
 // ================= MEMBER FUNCTIONS ==========================================
@@ -57,9 +56,9 @@
     // the reference count is correct if CleanupClosePushL leaves.
     client->IncReferenceCount();
     CleanupClosePushL( *client );
-    
+
     return client;
-} 
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailClient::NewL
@@ -67,7 +66,7 @@
 EXPORT_C CFSMailClient* CFSMailClient::NewL()
 {
     NM_FUNCTION;
-    
+
     CFSMailClient* client =  CFSMailClient::NewLC(EFSLoadPlugins);
     CleanupStack:: Pop(client);
     return client;
@@ -79,7 +78,7 @@
 EXPORT_C CFSMailClient* CFSMailClient::NewL(TInt aConfiguration)
 {
     NM_FUNCTION;
-    
+
     CFSMailClient* client =  CFSMailClient::NewLC(aConfiguration);
     CleanupStack:: Pop(client);
     return client;
@@ -91,7 +90,7 @@
 void CFSMailClient::ConstructL(TInt aConfiguration)
 {
     NM_FUNCTION;
-    
+
 	iFWImplementation = CFSFWImplementation::NewL(aConfiguration);
 }
 
@@ -101,10 +100,9 @@
 CFSMailClient::CFSMailClient()
 {
     NM_FUNCTION;
-    
+
 	// clear pointers
 	iFWImplementation = NULL;
-	iBrandManager = NULL;
 }
 
 
@@ -114,11 +112,6 @@
 EXPORT_C CFSMailClient::~CFSMailClient()
 {
     NM_FUNCTION;
-    
-	if(iBrandManager)
-		{
-		delete iBrandManager;
-		}
 	Close();
 }
 
@@ -128,7 +121,7 @@
 EXPORT_C CFSMailBox* CFSMailClient::GetMailBoxByUidL(const TFSMailMsgId aMailBoxId)
 {
     NM_FUNCTION;
-    
+
 	// select plugin
 	CFSMailBox* mailBox = NULL;
 	CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMailBoxId);
@@ -142,28 +135,15 @@
 }
 
 // -----------------------------------------------------------------------------
-// CFSMailClient::GetMailBoxByUidLC
-// -----------------------------------------------------------------------------
-EXPORT_C CFSMailBox* CFSMailClient::GetMailBoxByUidLC(const TFSMailMsgId aMailBoxId)
-{
-    NM_FUNCTION;
-    CFSMailBox* mailBox = GetMailBoxByUidL( aMailBoxId );
-    CleanupStack::PushL( mailBox );
-    return mailBox;
-}
-
-
-
-// -----------------------------------------------------------------------------
 // CFSMailClient::GetFolderByUidL
 // -----------------------------------------------------------------------------
 EXPORT_C CFSMailFolder* CFSMailClient::GetFolderByUidL( const TFSMailMsgId aMailBoxId,
 													   const TFSMailMsgId aFolderId )
 {
     NM_FUNCTION;
-    
+
 	CFSMailFolder* folder = NULL;
-	
+
 	// select plugin
 	CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aFolderId);
 	if(plugin)
@@ -183,7 +163,7 @@
 														 const TFSMailDetails aDetails)
 {
     NM_FUNCTION;
-    
+
 	CFSMailMessage* message = NULL;
     // select plugin
     CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMessageId);
@@ -204,7 +184,7 @@
 											 	   const RArray<TFSMailMsgId>& aMessages )
 {
     NM_FUNCTION;
-    
+
 	CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMailBoxId);
 	if(plugin)
 	{
@@ -219,7 +199,7 @@
  								  MFSMailRequestObserver& aOperationObserver )
 {
     NM_FUNCTION;
-    
+
 	// select plugin
 	CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMailBoxId);
 	if(plugin)
@@ -229,10 +209,10 @@
 																		aOperationObserver );
 
 		TRAPD(err, plugin->DeleteMailBoxByUidL(aMailBoxId,*request.iObserver,request.iRequestId));
-		
+
 	    if(err != KErrNone)
 		{
-			iFWImplementation->GetPluginManager().CompleteRequest(request.iRequestId);	
+			iFWImplementation->GetPluginManager().CompleteRequest(request.iRequestId);
 		}
 	    return request.iRequestId;
 	}
@@ -250,16 +230,16 @@
 	RArray<TFSMailMsgId> mailBoxList;
 	mailBoxList.Reset();
 	TInt ret = KErrNone;
-	
-    // <cmail>	
-	CFSMailBox *mailBox = NULL;	
-    // </cmail>	
-	
+
+    // <cmail>
+	CFSMailBox *mailBox = NULL;
+    // </cmail>
+
 	if(aPlugin.IsNullId())
 	{
 		for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
 		{
-			CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i);	
+			CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i);
 			TRAPD(err,plugin->ListMailBoxesL(mailBoxList));
 			if(err == KErrNone)
 			{
@@ -289,22 +269,22 @@
 	}
 	else
 	{
-		CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aPlugin);		
+		CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aPlugin);
 		// <cmail>
 		TInt err(KErrNone);
 		if ( plugin )
 		    {
-	        TRAP(err,plugin->ListMailBoxesL(mailBoxList));		    
+	        TRAP(err,plugin->ListMailBoxesL(mailBoxList));
 		    }
 		else
 		    {
 		    err = KErrNotFound;
 		    }
-        // </cmail>		
+        // </cmail>
 		if (err == KErrNone)
 		    {
 			for(TInt i=0;i < mailBoxList.Count(); i++)
-			    {			    
+			    {
                 // <cmail>
                     mailBox = NULL;
 				    TRAP_IGNORE(
@@ -313,7 +293,7 @@
                         {
                         err = aMailBoxes.Append( mailBox );
                         }
-                // </cmail>				
+                // </cmail>
 				if(err != KErrNone)
 				    {
 					ret = err;
@@ -324,9 +304,9 @@
 		    {
 			ret = err;
 		    }
-		mailBoxList.Reset();			
+		mailBoxList.Reset();
 	}
-	
+
 	mailBoxList.Reset();
 	return ret;
 }
@@ -342,7 +322,7 @@
 
 	MFSMailIterator* iterator = NULL;
 	MFSMailIterator* pluginIterator = NULL;
-	
+
 	// select plugin
 	if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aFolderId))
 	{
@@ -353,34 +333,13 @@
 			TRAPD(err,iterator = CFSMailIterator::NewL(*pluginIterator,&iFWImplementation->GetPluginManager()));
 			if(err == KErrNone)
 			{
-				return iterator;				
+				return iterator;
 			}
 		}
 	}
 
 	return iterator;
 }
-	
-// -----------------------------------------------------------------------------
-// CFSMailClient::GetBrandManagerL
-// -----------------------------------------------------------------------------
-EXPORT_C MFSMailBrandManager& CFSMailClient::GetBrandManagerL( void )
-{
-    NM_FUNCTION;
-
-	if(iBrandManager == NULL)
-		{
-		TRAPD( creationError,
-		       iBrandManager = CFSMailBrandManagerImpl::NewL( *this ) );
-		if ( creationError != KErrNone )
-		    {
-		    User::Leave( creationError );
-		    }
-		}
-		
- 	return *iBrandManager;
-
-}
 
 // -----------------------------------------------------------------------------
 // CFSMailClient::AddObserverL
@@ -388,13 +347,13 @@
 EXPORT_C void CFSMailClient::AddObserverL(MFSMailEventObserver& aObserver)
 {
     NM_FUNCTION;
-    
+
 	for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
 		{
 		CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i);
 		if(plugin)
 			{
-			plugin->AddObserverL(aObserver);			
+			plugin->AddObserverL(aObserver);
 			}
 		}
 }
@@ -405,42 +364,25 @@
 EXPORT_C void CFSMailClient::RemoveObserver(MFSMailEventObserver& aObserver)
 {
     NM_FUNCTION;
-    
+
 	for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
 	{
 		CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i);
 		if(plugin)
 		{
-		plugin->RemoveObserver(aObserver);			
+		plugin->RemoveObserver(aObserver);
 		}
 	}
 }
 
 // -----------------------------------------------------------------------------
-// CFSMailClient::UnregisterRequestObserver
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailClient::UnregisterRequestObserver(TInt aRequestId)
-{
-    NM_FUNCTION;
-    
-	for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
-	{
-		if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i))
-			{
-			plugin->UnregisterRequestObserver(aRequestId);
-			iFWImplementation->GetPluginManager().CompleteRequest(aRequestId);
-			}
-	}
-}
-
-// -----------------------------------------------------------------------------
 // CFSMailClient::SubscribeMailboxEventsL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailClient::SubscribeMailboxEventsL(TFSMailMsgId aMailBoxId,
 													 	MFSMailEventObserver& aObserver)
 	{
     NM_FUNCTION;
-    
+
 	// select plugin
 	if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMailBoxId))
 		{
@@ -456,7 +398,7 @@
 														MFSMailEventObserver& aObserver)
 	{
     NM_FUNCTION;
-    
+
 	// select plugin
 	if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid(aMailBoxId))
 		{
@@ -466,118 +408,16 @@
 	}
 
 // -----------------------------------------------------------------------------
-// CFSMailClient::WizardDataAvailableL
-// -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailClient::WizardDataAvailableL()
-	{
-    NM_FUNCTION;
-	
-	TInt ret = KErrNone;
-	for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
-	{
-		if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i))
-			{
-			TInt rcode = plugin->WizardDataAvailableL( );
-			if(rcode != KErrNone)		
-				{
-				ret = KErrGeneral;			
-				}
-			}
-		else
-			{
-			ret = KErrGeneral;
-			}
-	}
-
-	return ret;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailClient::AuthenticateL
-// -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailClient::AuthenticateL(MFSMailRequestObserver& aOperationObserver)
-	{
-    NM_FUNCTION;
-
-	TInt requestId(0);
-	
-	for(TInt i=0;i<iFWImplementation->GetPluginManager().GetPluginCount();i++)
-	{
-		if(CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByIndex(i))
-		{
-		    // get async request id
-		    TUid id = iFWImplementation->GetPluginManager().GetPluginIdByIndex(i);
-    		TFSPendingRequest request = iFWImplementation->GetPluginManager().InitAsyncRequestL(	id,	aOperationObserver);
-    		
-    		// send authentication requests
-			requestId = request.iRequestId;
-			TRAPD(err,plugin->AuthenticateL( *request.iObserver, requestId ));			
-			if(err != KErrNone)
-			{
-				iFWImplementation->GetPluginManager().CompleteRequest(requestId);
-			}
-		}
-	}
-
-	return requestId;
-
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailClient::CleanTempDirL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailClient::CleanTempDirL( )
-	{
-    NM_FUNCTION;
-    
-    iFWImplementation->GetPluginManager().CleanTempDirL();	
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailClient::GetTempDir
-// -----------------------------------------------------------------------------
-EXPORT_C TDesC& CFSMailClient::GetTempDirL( )
-	{
-    NM_FUNCTION;
-    
-	return iFWImplementation->GetPluginManager().GetTempDirL();
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailClient::CancelL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailClient::CancelL( const TInt aRequestId )
 	{
     NM_FUNCTION;
-    
+
 	iFWImplementation->GetPluginManager().CancelRequestL(aRequestId);
 	}
 
 // -----------------------------------------------------------------------------
-// CFSMailClient::CancelAllL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailClient::CancelAllL( )
-	{
-    NM_FUNCTION;
-    
-		iFWImplementation->GetPluginManager().CancelAllRequestsL();
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailClient::SetMailboxName
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailClient::SetMailboxName( const TFSMailMsgId aMailboxId, const TDesC& aMailboxName )
-	{
-    NM_FUNCTION;
-    
-	CFSMailPlugin* plugin = iFWImplementation->GetPluginManager().GetPluginByUid( aMailboxId );
-	if ( plugin )
-		{
-		plugin->SetMailboxName( aMailboxId, aMailboxName );
-		}
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailClient::PrepareMrDescriptionL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailClient::PrepareMrDescriptionL(  const TFSMailMsgId& aMailBoxId,
@@ -590,9 +430,10 @@
         {
         // set MR description from the plugin
         plugin->PrepareMrDescriptionL( aMailBoxId, aMessageId );
-        }  
+        }
     }
 
+// -----------------------------------------------------------------------------
 // <qmail>
 // -----------------------------------------------------------------------------
 // CFSMailClient::GetSignatureL
@@ -601,7 +442,7 @@
     {
     NM_FUNCTION;
     HBufC* ret = NULL;
-    
+
     // select plugin
     CFSMailPlugin* plugin =
         iFWImplementation->GetPluginManager().GetPluginByUid( aMailBoxId );
@@ -620,7 +461,7 @@
 EXPORT_C void CFSMailClient::Close()
 {
     NM_FUNCTION;
-    
+
 	CFSMailClient* instance = Instance();
 	if(!instance)
 	{
@@ -632,20 +473,20 @@
 		if(iFWImplementation)
 		{
 			delete iFWImplementation;
-			iFWImplementation = NULL;		
+			iFWImplementation = NULL;
 		}
 		Dll::FreeTls();
   		delete instance;
 	}
 }
-	
+
 // -----------------------------------------------------------------------------
 // CFSMailClient::Instance
 // -----------------------------------------------------------------------------
 CFSMailClient* CFSMailClient::Instance()
 {
     NM_FUNCTION;
-    
+
 	return static_cast<CFSMailClient*>(Dll::Tls());
 }
 
@@ -655,7 +496,7 @@
 EXPORT_C TInt CFSMailClient::IncReferenceCount()
 {
     NM_FUNCTION;
-    
+
 	return ++iReferenceCount;
 }
 
@@ -665,7 +506,7 @@
 TInt CFSMailClient::DecReferenceCount()
 {
     NM_FUNCTION;
-    
+
 	return --iReferenceCount;
 }
 
@@ -675,7 +516,7 @@
 EXPORT_C void CFSMailClient::ReleaseExtension( CEmailExtension* aExtension )
     {
     NM_FUNCTION;
-    
+
     CExtendableEmail::ReleaseExtension( aExtension );
     }
 
@@ -685,7 +526,7 @@
 EXPORT_C CEmailExtension* CFSMailClient::ExtensionL( const TUid& aInterfaceUid )
     {
     NM_FUNCTION;
-    
+
     return CExtendableEmail::ExtensionL( aInterfaceUid );
     }
-    
+
--- a/emailservices/emailframework/src/CFSMailPluginManager.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailPluginManager.cpp	Fri Sep 03 14:07:42 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"
@@ -39,7 +39,7 @@
 CFSMailPluginManager::~CFSMailPluginManager()
 {
     NM_FUNCTION;
-    
+
 	iPluginInfo.ResetAndDestroy();
 }
 
@@ -50,12 +50,12 @@
 CFSMailPluginManager* CFSMailPluginManager::NewLC(TInt aConfiguration)
 {
     NM_FUNCTION;
-    
+
     CFSMailPluginManager* pluginManager = new (ELeave) CFSMailPluginManager();
     CleanupStack:: PushL(pluginManager);
     pluginManager->ConstructL(aConfiguration);
     return pluginManager;
-} 
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailPluginManager::NewL
@@ -63,7 +63,7 @@
 CFSMailPluginManager* CFSMailPluginManager::NewL(TInt aConfiguration)
 {
     NM_FUNCTION;
-    
+
     CFSMailPluginManager* pluginManager =  CFSMailPluginManager::NewLC(aConfiguration);
     CleanupStack:: Pop(pluginManager);
     return pluginManager;
@@ -81,70 +81,52 @@
 	iPluginInfo.Reset();
 	CFSMailPlugin::ListImplementationsL(iPluginInfo);
 	CFSMailPlugin::Close();
-	
+
 	// load plugins
 	CFSMailPlugin* plugin = NULL;
-    // <cmail>  	
+    // <cmail>
 	TInt tempCount = iPluginInfo.Count();
 	for(TInt i=0;i<tempCount;i++)
-	// </cmail> 	    
+	// </cmail>
 	{
 		TUid id = iPluginInfo[i]->ImplementationUid();
 		if(aConfiguration == EFSLoadPlugins)
 		{
 			TRAPD(err,plugin = CFSMailPlugin::NewL( id ));
 			CFSMailPlugin::Close();		
-			if(err == KErrNone && plugin != NULL)
+			if(err == KErrNone && plugin)
 			{
 				AddPluginL(id,plugin);
 			}
-		}	
+		}
 // <cmail>
 		else
-		    {		    
+		    {
 		    }
-// </cmail>      		
+// </cmail>
 	}
 
 }
 
 // -----------------------------------------------------------------------------
-// CFSMailPluginManager::LoadPluginL
-// -----------------------------------------------------------------------------
-void CFSMailPluginManager::LoadPluginL( TUid /*aPlugin*/ )
-{
-    NM_FUNCTION;
-}
-	
-// -----------------------------------------------------------------------------
 // CFSMailPluginManager::GetPluginByIndex
 // -----------------------------------------------------------------------------
 CFSMailPlugin* CFSMailPluginManager::GetPluginByIndex(TUint aIndex)
 	{
     NM_FUNCTION;
-    
+
 	return iPluginList[aIndex]->iPlugin;
 	}
 
 // -----------------------------------------------------------------------------
-// CFSMailPluginManager::GetPluginIdByIndex
-// -----------------------------------------------------------------------------
-TUid CFSMailPluginManager::GetPluginIdByIndex(TUint aIndex)
-	{
-    NM_FUNCTION;
-    
-	return iPluginList[aIndex]->iPluginId;
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailPluginManager::GetPluginCount
 // -----------------------------------------------------------------------------
 TUint CFSMailPluginManager::GetPluginCount( )
 	{
     NM_FUNCTION;
-    
+
 	return iPluginList.Count();
 	}
-	
 
 
+
--- a/emailservices/emailstore/base_plugin/bwins/basepluginu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/bwins/basepluginu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,227 +1,225 @@
 EXPORTS
-	?CancelL@CBasePlugin@@UAEXH@Z @ 1 NONAME ; void CBasePlugin::CancelL(int)
-	?GetLastSyncStatusL@CBasePlugin@@UAE?BVTFSProgress@@ABVTFSMailMsgId@@@Z @ 2 NONAME ; class TFSProgress const CBasePlugin::GetLastSyncStatusL(class TFSMailMsgId const &)
-	?NewL@CBaseMrAttendee@@SAPAV1@XZ @ 3 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(void)
-	?FindFetchRequestL@CBasePlugin@@IAEHIIIIAAUTOngoingFetchInfo@1@@Z @ 4 NONAME ; int CBasePlugin::FindFetchRequestL(unsigned int, unsigned int, unsigned int, unsigned int, struct CBasePlugin::TOngoingFetchInfo &)
-	?WizardDataAvailableL@CBasePlugin@@UAEHXZ @ 5 NONAME ; int CBasePlugin::WizardDataAvailableL(void)
-	?ReportRequestStatusL@CBasePlugin@@MAEXIIIIH@Z @ 6 NONAME ; void CBasePlugin::ReportRequestStatusL(unsigned int, unsigned int, unsigned int, unsigned int, int)
-	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@HH@Z @ 7 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int, int)
-	?DoCancel@CDelayedOp@@EAEXXZ @ 8 NONAME ; void CDelayedOp::DoCancel(void)
-	??1CBaseMrRecurrenceRule@@UAE@XZ @ 9 NONAME ; CBaseMrRecurrenceRule::~CBaseMrRecurrenceRule(void)
-	?GoOnlineL@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 10 NONAME ; void CBasePlugin::GoOnlineL(class TFSMailMsgId const &)
-	??1CDelayedOp@@UAE@XZ @ 11 NONAME ; CDelayedOp::~CDelayedOp(void)
-	?SetStartTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 12 NONAME ; void CBaseMrInfoObject::SetStartTimeInUtcL(class TTime)
-	?NewL@CBaseMrAttendee@@SAPAV1@ABVMMROrganizer@@@Z @ 13 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(class MMROrganizer const &)
-	?CancelSearch@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 14 NONAME ; void CBasePlugin::CancelSearch(class TFSMailMsgId const &)
-	?RecurrentInterval@CBaseMrRecurrenceRule@@UBEHXZ @ 15 NONAME ; int CBaseMrRecurrenceRule::RecurrentInterval(void) const
-	?CalendarFileName@CBasePlugin@@MBEABVTDesC16@@XZ @ 16 NONAME ; class TDesC16 const & CBasePlugin::CalendarFileName(void) const
-	?AddRecurrenceExceptionL@CBaseMrInfoObject@@UAEXPAVMMRInfoObject@@@Z @ 17 NONAME ; void CBaseMrInfoObject::AddRecurrenceExceptionL(class MMRInfoObject *)
-	?SetRecurrentDaysofMonthL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@UTRecurrentDaysofMonth@MRRecurrenceRule@@@@@Z @ 18 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentDaysofMonthL(class RArray<struct MRRecurrenceRule::TRecurrentDaysofMonth> &)
-	?SetCredentialsL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABVTDesC16@@1@Z @ 19 NONAME ; void CBasePlugin::SetCredentialsL(class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &)
-	?SetAlarmInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 20 NONAME ; void CBaseMrInfoObject::SetAlarmInUtcL(class TTime)
-	?NewL@CBaseMrAttendee@@SAPAV1@ABVMMRAttendee@@@Z @ 21 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(class MMRAttendee const &)
-	?TranslateMsgStoreDayOfWeek@CBasePlugin@@IAEXKAAVTDayOfWeekFtor@@@Z @ 22 NONAME ; void CBasePlugin::TranslateMsgStoreDayOfWeek(unsigned long, class TDayOfWeekFtor &)
-	?GetStandardFolderIdL@CBasePlugin@@UAE?AVTFSMailMsgId@@ABV2@W4TFSFolderType@@@Z @ 23 NONAME ; class TFSMailMsgId CBasePlugin::GetStandardFolderIdL(class TFSMailMsgId const &, enum TFSFolderType)
-	?DeleteFetchRequest@CBasePlugin@@IAEXAAUTOngoingFetchInfo@1@@Z @ 24 NONAME ; void CBasePlugin::DeleteFetchRequest(struct CBasePlugin::TOngoingFetchInfo &)
-	?CommonName@CBaseMrAttendee@@UBEABVTDesC16@@XZ @ 25 NONAME ; class TDesC16 const & CBaseMrAttendee::CommonName(void) const
-	?RecurrentDaysofMonth@CBaseMrRecurrenceRule@@UBEABV?$RArray@UTRecurrentDaysofMonth@MRRecurrenceRule@@@@XZ @ 26 NONAME ; class RArray<struct MRRecurrenceRule::TRecurrentDaysofMonth> const & CBaseMrRecurrenceRule::RecurrentDaysofMonth(void) const
-	?MRSequenceNumberL@CBaseMrInfoObject@@UBEHXZ @ 27 NONAME ; int CBaseMrInfoObject::MRSequenceNumberL(void) const
-	?MRRecurrenceId@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 28 NONAME ; class TTime CBaseMrInfoObject::MRRecurrenceId(void) const
-	?SubjectL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 29 NONAME ; class TDesC16 const & CBaseMrInfoObject::SubjectL(void) const
-	?GetMessageByUidL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 30 NONAME ; class CFSMailMessage * CBasePlugin::GetMessageByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, enum TFSMailDetails)
-	?InvalidateCacheIfNecessary@CBasePlugin@@IAEXIII@Z @ 31 NONAME ; void CBasePlugin::InvalidateCacheIfNecessary(unsigned int, unsigned int, unsigned int)
-	?TranslateEmailFwRecipientsL@CBasePlugin@@IAEXAAVCMsgStoreMessagePart@@ABVTDesC8@@AAV?$RPointerArray@VCFSMailAddress@@@@@Z @ 32 NONAME ; void CBasePlugin::TranslateEmailFwRecipientsL(class CMsgStoreMessagePart &, class TDesC8 const &, class RPointerArray<class CFSMailAddress> &)
-	?SetRecurrenceRuleL@CBaseMrInfoObject@@UAEXABVMRRecurrenceRule@@@Z @ 33 NONAME ; void CBaseMrInfoObject::SetRecurrenceRuleL(class MRRecurrenceRule const &)
-	?Load2L@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 34 NONAME ; class HBufC16 * CResourceLoader::Load2L(int)
-	?RemoveAllPropertiesL@CBasePlugin@@KAXAAVCMsgStorePropertyContainer@@ABVTDesC8@@@Z @ 35 NONAME ; void CBasePlugin::RemoveAllPropertiesL(class CMsgStorePropertyContainer &, class TDesC8 const &)
-	?DoCancelSearchL@CBasePlugin@@IAEXABVTFSMailMsgId@@@Z @ 36 NONAME ; void CBasePlugin::DoCancelSearchL(class TFSMailMsgId const &)
-	?GetMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@AAV?$RPointerArray@VCFSMailMessage@@@@W4TFSMailDetails@@@Z @ 37 NONAME ; void CBasePlugin::GetMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RPointerArray<class CFSMailMessage> &, enum TFSMailDetails)
-	?GetPlugin@CDelayedOp@@IAEAAVCBasePlugin@@XZ @ 38 NONAME ; class CBasePlugin & CDelayedOp::GetPlugin(void)
-	?LoadLC@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 39 NONAME ; class HBufC16 * CResourceLoader::LoadLC(int)
-	?HandleRemovePartContentL@CBasePlugin@@MAEXAAVCMsgStoreMessage@@AAVCMsgStoreMessagePart@@@Z @ 40 NONAME ; void CBasePlugin::HandleRemovePartContentL(class CMsgStoreMessage &, class CMsgStoreMessagePart &)
-	?SetMRRecurrenceIdL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 41 NONAME ; void CBaseMrInfoObject::SetMRRecurrenceIdL(class TTime)
-	?CreateReplyMessageL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0HABVTDesC16@@@Z @ 42 NONAME ; class CFSMailMessage * CBasePlugin::CreateReplyMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, int, class TDesC16 const &)
-	?UnsubscribeMailboxEventsL@CBasePlugin@@IAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 43 NONAME ; void CBasePlugin::UnsubscribeMailboxEventsL(class TFSMailMsgId const &, class MFSMailEventObserver &)
-	?CreateForwardMessageL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0ABVTDesC16@@@Z @ 44 NONAME ; class CFSMailMessage * CBasePlugin::CreateForwardMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
-	?UnregisterRequestObserver@CBasePlugin@@UAEXH@Z @ 45 NONAME ; void CBasePlugin::UnregisterRequestObserver(int)
-	?DeleteFolderByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@0@Z @ 46 NONAME ; void CBasePlugin::DeleteFolderByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?NewL@CBaseMrInfoObject@@SAPAV1@AAVMMRInfoObject@@@Z @ 47 NONAME ; class CBaseMrInfoObject * CBaseMrInfoObject::NewL(class MMRInfoObject &)
-	?GoOfflineL@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 48 NONAME ; void CBasePlugin::GoOfflineL(class TFSMailMsgId const &)
-	?ResponseRequested@CBaseMrAttendee@@UBEHXZ @ 49 NONAME ; int CBaseMrAttendee::ResponseRequested(void) const
-	?GetAccountForMsgBoxL@CBasePlugin@@IAEPAVCMsgStoreAccount@@ABVTFSMailMsgId@@@Z @ 50 NONAME ; class CMsgStoreAccount * CBasePlugin::GetAccountForMsgBoxL(class TFSMailMsgId const &)
-	?GetSignatureL@CBasePlugin@@MAEPAVHBufC16@@VTFSMailMsgId@@@Z @ 51 NONAME ; class HBufC16 * CBasePlugin::GetSignatureL(class TFSMailMsgId)
-	?SearchL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@ABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 52 NONAME ; void CBasePlugin::SearchL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
-	?StoreMessageL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVCFSMailMessage@@@Z @ 53 NONAME ; void CBasePlugin::StoreMessageL(class TFSMailMsgId const &, class CFSMailMessage &)
-	?Fs@CResourceLoader@@QAEAAVRFs@@XZ @ 54 NONAME ; class RFs & CResourceLoader::Fs(void)
-	?ModificationNotifyL@CBasePlugin@@IAEXIW4TMsgStoreOperation@@W4TMsgStoreContainerType@@KIII@Z @ 55 NONAME ; void CBasePlugin::ModificationNotifyL(unsigned int, enum TMsgStoreOperation, enum TMsgStoreContainerType, unsigned long, unsigned int, unsigned int, unsigned int)
-	?SetResponseRequestedL@CBaseMrAttendee@@UAEXH@Z @ 56 NONAME ; void CBaseMrAttendee::SetResponseRequestedL(int)
-	?GetMailboxInfoL@CBasePlugin@@IAEAAVCMailboxInfo@@I@Z @ 57 NONAME ; class CMailboxInfo & CBasePlugin::GetMailboxInfoL(unsigned int)
-	?SetCreationTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 58 NONAME ; void CBaseMrInfoObject::SetCreationTimeInUtcL(class TTime)
-	?FetchMessagePartsL@CBasePlugin@@UAEXABVTFSMailMsgId@@00ABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@HI@Z @ 59 NONAME ; void CBasePlugin::FetchMessagePartsL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, int, unsigned int)
-	?AddAttendeeL@CBaseMrInfoObject@@UAEXPAVMMRAttendee@@@Z @ 60 NONAME ; void CBaseMrInfoObject::AddAttendeeL(class MMRAttendee *)
-	?EndTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 61 NONAME ; class TTime CBaseMrInfoObject::EndTimeInUtcL(void) const
-	?GetBodyPartL@CBasePlugin@@IAEPAVCMsgStoreMessagePart@@AAVCMsgStoreMessage@@ABVTDesC16@@@Z @ 62 NONAME ; class CMsgStoreMessagePart * CBasePlugin::GetBodyPartL(class CMsgStoreMessage &, class TDesC16 const &)
-	?SendMessageL@CBasePlugin@@QAEXAAVCMsgStoreMailBox@@AAVCMsgStoreMessage@@ABVTTime@@@Z @ 63 NONAME ; void CBasePlugin::SendMessageL(class CMsgStoreMailBox &, class CMsgStoreMessage &, class TTime const &)
-	??_ECDelayedOp@@UAE@I@Z @ 64 NONAME ; CDelayedOp::~CDelayedOp(unsigned int)
-	?SetAttendeeRoleL@CBaseMrAttendee@@UAEXW4TAttendeeRole@MMRAttendee@@@Z @ 65 NONAME ; void CBaseMrAttendee::SetAttendeeRoleL(enum MMRAttendee::TAttendeeRole)
-	?RefreshMailboxCacheL@CBasePlugin@@IAEAAVCMailboxInfo@@I@Z @ 66 NONAME ; class CMailboxInfo & CBasePlugin::RefreshMailboxCacheL(unsigned int)
-	?SetRecurrenceStartTimeL@CBaseMrRecurrenceRule@@UAEXVTTime@@@Z @ 67 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceStartTimeL(class TTime)
-	?RecurrentCount@CBaseMrRecurrenceRule@@UBEIXZ @ 68 NONAME ; unsigned int CBaseMrRecurrenceRule::RecurrentCount(void) const
-	?TranslateEmailFwDayOfWeek@CBasePlugin@@IAEXW4TMRRecurrentDay@MRRecurrenceRule@@AAK@Z @ 69 NONAME ; void CBasePlugin::TranslateEmailFwDayOfWeek(enum MRRecurrenceRule::TMRRecurrentDay, unsigned long &)
-	?CopyMessagePartFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@@Z @ 70 NONAME ; void CBasePlugin::CopyMessagePartFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
-	?MRResponse@CBaseMrInfoObject@@UBE?AW4TResponse@MMRInfoObject@@XZ @ 71 NONAME ; enum MMRInfoObject::TResponse CBaseMrInfoObject::MRResponse(void) const
-	?GetCachedMsgL@CBasePlugin@@IAEPAVCMsgStoreMessage@@II@Z @ 72 NONAME ; class CMsgStoreMessage * CBasePlugin::GetCachedMsgL(unsigned int, unsigned int)
-	?SetMethod@CBaseMrInfoObject@@QAEXW4TMRMethod@MMRInfoObject@@@Z @ 73 NONAME ; void CBaseMrInfoObject::SetMethod(enum MMRInfoObject::TMRMethod)
-	??1CBasePlugin@@UAE@XZ @ 74 NONAME ; CBasePlugin::~CBasePlugin(void)
-	?SetSubjectL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 75 NONAME ; void CBaseMrInfoObject::SetSubjectL(class TDesC16 const &)
-	?StoreMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@H@Z @ 76 NONAME ; void CBasePlugin::StoreMessagesL(class TFSMailMsgId const &, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &, int)
-	?MailboxHasCapabilityL@CBasePlugin@@UAEHW4TFSMailBoxCapabilities@@VTFSMailMsgId@@@Z @ 77 NONAME ; int CBasePlugin::MailboxHasCapabilityL(enum TFSMailBoxCapabilities, class TFSMailMsgId)
-	?GetMrusL@CBasePlugin@@UAEPAVMDesC16Array@@ABVTFSMailMsgId@@@Z @ 78 NONAME ; class MDesC16Array * CBasePlugin::GetMrusL(class TFSMailMsgId const &)
-	?StoreMessagePartsL@CBasePlugin@@UAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@AAVMFSMailRequestObserver@@H@Z @ 79 NONAME ; void CBasePlugin::StoreMessagePartsL(class RPointerArray<class CFSMailMessagePart> &, class MFSMailRequestObserver &, int)
-	?AccountEventNotifyL@CBasePlugin@@IAEXW4TMsgStoreAccountEvent@@JABVTDesC16@@1I@Z @ 80 NONAME ; void CBasePlugin::AccountEventNotifyL(enum TMsgStoreAccountEvent, long, class TDesC16 const &, class TDesC16 const &, unsigned int)
-	?SupportedFields@CBaseMrInfoObject@@UBEHAAV?$RArray@W4TESMRInfoField@MMRInfoObject@@@@@Z @ 81 NONAME ; int CBaseMrInfoObject::SupportedFields(class RArray<enum MMRInfoObject::TESMRInfoField> &) const
-	?StatusL@CBasePlugin@@UAE?AVTFSProgress@@H@Z @ 82 NONAME ; class TFSProgress CBasePlugin::StatusL(int)
-	?SetRecurrentMonthsL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@W4TMRRecurrenceMonth@MRRecurrenceRule@@@@@Z @ 83 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentMonthsL(class RArray<enum MRRecurrenceRule::TMRRecurrenceMonth> &)
-	?SetContentL@CBasePlugin@@UAEXABVTDesC16@@ABVTFSMailMsgId@@111@Z @ 84 NONAME ; void CBasePlugin::SetContentL(class TDesC16 const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?GetMailBoxAddressL@CBasePlugin@@MAEPAVHBufC16@@VTFSMailMsgId@@@Z @ 85 NONAME ; class HBufC16 * CBasePlugin::GetMailBoxAddressL(class TFSMailMsgId)
-	?TranslateEmailFwAttendeeL@CBasePlugin@@IAEXAAVMMROrganizer@@AAVRMsgStoreAddress@@@Z @ 86 NONAME ; void CBasePlugin::TranslateEmailFwAttendeeL(class MMROrganizer &, class RMsgStoreAddress &)
-	?GetMailBoxStatus@CBasePlugin@@UAE?AW4TFSMailBoxStatus@@ABVTFSMailMsgId@@@Z @ 87 NONAME ; enum TFSMailBoxStatus CBasePlugin::GetMailBoxStatus(class TFSMailMsgId const &)
-	??1CBaseMrAttendee@@UAE@XZ @ 88 NONAME ; CBaseMrAttendee::~CBaseMrAttendee(void)
-	?BlockCopyMoveFromFoldersL@CBasePlugin@@MAEXVTFSMailMsgId@@W4TFSFolderType@@AAVCFSMailFolder@@@Z @ 89 NONAME ; void CBasePlugin::BlockCopyMoveFromFoldersL(class TFSMailMsgId, enum TFSFolderType, class CFSMailFolder &)
-	?RecurrentMonthDays@CBaseMrRecurrenceRule@@UBEABV?$RArray@H@@XZ @ 90 NONAME ; class RArray<int> const & CBaseMrRecurrenceRule::RecurrentMonthDays(void) const
-	??1CBaseMrInfoProcessor@@UAE@XZ @ 91 NONAME ; CBaseMrInfoProcessor::~CBaseMrInfoProcessor(void)
-	?NewL@CBaseMrRecurrenceRule@@SAPAV1@ABVMRRecurrenceRule@@@Z @ 92 NONAME ; class CBaseMrRecurrenceRule * CBaseMrRecurrenceRule::NewL(class MRRecurrenceRule const &)
-	?ChildPartsL@CBasePlugin@@UAEXABVTFSMailMsgId@@000AAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 93 NONAME ; void CBasePlugin::ChildPartsL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RPointerArray<class CFSMailMessagePart> &)
-	?SetPartContentFromFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@@Z @ 94 NONAME ; void CBasePlugin::SetPartContentFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
-	?ResetBodyCache@CBasePlugin@@IAEXXZ @ 95 NONAME ; void CBasePlugin::ResetBodyCache(void)
-	?Type@CBaseMrRecurrenceRule@@UBE?AW4TMRRecurrenceType@MRRecurrenceRule@@XZ @ 96 NONAME ; enum MRRecurrenceRule::TMRRecurrenceType CBaseMrRecurrenceRule::Type(void) const
-	?ListFoldersL@CBasePlugin@@UAEXABVTFSMailMsgId@@0AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 97 NONAME ; void CBasePlugin::ListFoldersL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RPointerArray<class CFSMailFolder> &)
-	?SetContext@CDelayedOp@@QAEXAAVCBasePlugin@@AAVMDelayedOpsManager@@@Z @ 98 NONAME ; void CDelayedOp::SetContext(class CBasePlugin &, class MDelayedOpsManager &)
-	??_ECBasePlugin@@UAE@I@Z @ 99 NONAME ; CBasePlugin::~CBasePlugin(unsigned int)
-	?ReplyToMeetingRequestL@CBaseMrInfoProcessor@@UAEXABVTFSMailMsgId@@0AAVMMRInfoObject@@AAW4TMRInfoResponseMode@MMRInfoProcessor@@ABVTDesC16@@@Z @ 100 NONAME ; void CBaseMrInfoProcessor::ReplyToMeetingRequestL(class TFSMailMsgId const &, class TFSMailMsgId const &, class MMRInfoObject &, enum MMRInfoProcessor::TMRInfoResponseMode &, class TDesC16 const &)
-	?GetFolderByUidL@CBasePlugin@@UAEPAVCFSMailFolder@@ABVTFSMailMsgId@@0@Z @ 101 NONAME ; class CFSMailFolder * CBasePlugin::GetFolderByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?RecurrenceRuleL@CBaseMrInfoObject@@UBEABVMRRecurrenceRule@@XZ @ 102 NONAME ; class MRRecurrenceRule const & CBaseMrInfoObject::RecurrenceRuleL(void) const
-	?AuthenticateL@CBasePlugin@@UAEXAAVMFSMailRequestObserver@@H@Z @ 103 NONAME ; void CBasePlugin::AuthenticateL(class MFSMailRequestObserver &, int)
-	?DeleteMessagesByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 104 NONAME ; void CBasePlugin::DeleteMessagesByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &)
-	?UnsubscribeMailboxEvents@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 105 NONAME ; void CBasePlugin::UnsubscribeMailboxEvents(class TFSMailMsgId const &, class MFSMailEventObserver &)
-	?SetEndTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 106 NONAME ; void CBaseMrInfoObject::SetEndTimeInUtcL(class TTime)
-	?SetRecurrenceTypeL@CBaseMrRecurrenceRule@@UAEXW4TMRRecurrenceType@MRRecurrenceRule@@@Z @ 107 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceTypeL(enum MRRecurrenceRule::TMRRecurrenceType)
-	?TranslateEmailFwMessageL@CBasePlugin@@MAEXAAVCFSMailMessagePart@@AAVCMsgStoreMessagePart@@H@Z @ 108 NONAME ; void CBasePlugin::TranslateEmailFwMessageL(class CFSMailMessagePart &, class CMsgStoreMessagePart &, int)
-	?GetPluginId@CBasePlugin@@MAEIXZ @ 109 NONAME ; unsigned int CBasePlugin::GetPluginId(void)
-	?CreateForwardReplyMessageL@CBasePlugin@@IAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0HABVTDesC16@@HH@Z @ 110 NONAME ; class CFSMailMessage * CBasePlugin::CreateForwardReplyMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, int, class TDesC16 const &, int, int)
-	?SetCommonNameL@CBaseMrAttendee@@UAEXABVTDesC16@@@Z @ 111 NONAME ; void CBaseMrAttendee::SetCommonNameL(class TDesC16 const &)
-	?CreateMessageToSendL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@@Z @ 112 NONAME ; class CFSMailMessage * CBasePlugin::CreateMessageToSendL(class TFSMailMsgId const &)
-	?MessagePartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000@Z @ 113 NONAME ; class CFSMailMessagePart * CBasePlugin::MessagePartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@HABVTDesC16@@@Z @ 114 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int, class TDesC16 const &)
-	?ResetCache@CBasePlugin@@IAEXXZ @ 115 NONAME ; void CBasePlugin::ResetCache(void)
-	?MRMethodL@CBaseMrInfoObject@@UBE?AW4TMRMethod@MMRInfoObject@@XZ @ 116 NONAME ; enum MMRInfoObject::TMRMethod CBaseMrInfoObject::MRMethodL(void) const
-	?RunL@CDelayedOp@@EAEXXZ @ 117 NONAME ; void CDelayedOp::RunL(void)
-	?RemoveChildPartL@CBasePlugin@@UAEXABVTFSMailMsgId@@0000@Z @ 118 NONAME ; void CBasePlugin::RemoveChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?RecurrenceExceptionsL@CBaseMrInfoObject@@UBEABV?$RPointerArray@VMMRInfoObject@@@@XZ @ 119 NONAME ; class RPointerArray<class MMRInfoObject> const & CBaseMrInfoObject::RecurrenceExceptionsL(void) const
-	?SetRecurrentMonthDaysL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@H@@@Z @ 120 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentMonthDaysL(class RArray<int> &)
-	?SetPriorityL@CBaseMrInfoObject@@UAEXI@Z @ 121 NONAME ; void CBaseMrInfoObject::SetPriorityL(unsigned int)
-	?AttendeesL@CBaseMrInfoObject@@UAEAAV?$RPointerArray@VMMRAttendee@@@@XZ @ 122 NONAME ; class RPointerArray<class MMRAttendee> & CBaseMrInfoObject::AttendeesL(void)
-	?Load2L@CResourceLoader@@QAEPAVHBufC16@@HH@Z @ 123 NONAME ; class HBufC16 * CResourceLoader::Load2L(int, int)
-	?NewL@CBasePlugin@@SAPAV1@XZ @ 124 NONAME ; class CBasePlugin * CBasePlugin::NewL(void)
-	?FetchEmailAddressL@CBasePlugin@@IAEPAVCFSMailAddress@@AAVCMsgStorePropertyContainer@@I@Z @ 125 NONAME ; class CFSMailAddress * CBasePlugin::FetchEmailAddressL(class CMsgStorePropertyContainer &, unsigned int)
-	?NewL@CBaseMrInfoProcessor@@SAPAV1@AAVCBasePlugin@@@Z @ 126 NONAME ; class CBaseMrInfoProcessor * CBaseMrInfoProcessor::NewL(class CBasePlugin &)
-	?CopyMessageAsChildPartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@0000ABVCFSMailMessage@@@Z @ 127 NONAME ; class CFSMailMessagePart * CBasePlugin::CopyMessageAsChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class CFSMailMessage const &)
-	?NotifyGlobalEventL@CBasePlugin@@IAEXW4TFSMailEvent@@VTFSMailMsgId@@PAX22@Z @ 128 NONAME ; void CBasePlugin::NotifyGlobalEventL(enum TFSMailEvent, class TFSMailMsgId, void *, void *, void *)
-	?GetCachedBodyChildrenL@CBasePlugin@@IAEAAV?$RPointerArray@VCMsgStoreMessagePart@@@@XZ @ 129 NONAME ; class RPointerArray<class CMsgStoreMessagePart> & CBasePlugin::GetCachedBodyChildrenL(void)
-	?StartTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 130 NONAME ; class TTime CBaseMrInfoObject::StartTimeInUtcL(void) const
-	?ListMailBoxesL@CBasePlugin@@UAEXAAV?$RArray@VTFSMailMsgId@@@@@Z @ 131 NONAME ; void CBasePlugin::ListMailBoxesL(class RArray<class TFSMailMsgId> &)
-	?SetRecurrenceUntilL@CBaseMrRecurrenceRule@@UAEXVTTime@@@Z @ 132 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceUntilL(class TTime)
-	?GetBrandingIdL@CBasePlugin@@UAEAAVTDesC16@@ABVTFSMailMsgId@@@Z @ 133 NONAME ; class TDesC16 & CBasePlugin::GetBrandingIdL(class TFSMailMsgId const &)
-	?FetchMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@H@Z @ 134 NONAME ; void CBasePlugin::FetchMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &, int)
-	?RemovePartContentL@CBasePlugin@@UAEXABVTFSMailMsgId@@00ABV?$RArray@VTFSMailMsgId@@@@@Z @ 135 NONAME ; void CBasePlugin::RemovePartContentL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &)
-	?ClearSearchResultCache@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 136 NONAME ; void CBasePlugin::ClearSearchResultCache(class TFSMailMsgId const &)
-	?Address@CBaseMrAttendee@@UBEABVTDesC16@@XZ @ 137 NONAME ; class TDesC16 const & CBaseMrAttendee::Address(void) const
-	?NotifyEventL@CBasePlugin@@IAEXIIIW4TFSMailEvent@@I@Z @ 138 NONAME ; void CBasePlugin::NotifyEventL(unsigned int, unsigned int, unsigned int, enum TFSMailEvent, unsigned int)
-	?GetMailBoxByUidL@CBasePlugin@@UAEPAVCFSMailBox@@ABVTFSMailMsgId@@@Z @ 139 NONAME ; class CFSMailBox * CBasePlugin::GetMailBoxByUidL(class TFSMailMsgId const &)
-	?SetDescriptionL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 140 NONAME ; void CBaseMrInfoObject::SetDescriptionL(class TDesC16 const &)
-	?AccountEventNotify@CBasePlugin@@UAEXW4TMsgStoreAccountEvent@@JABVTDesC16@@1I@Z @ 141 NONAME ; void CBasePlugin::AccountEventNotify(enum TMsgStoreAccountEvent, long, class TDesC16 const &, class TDesC16 const &, unsigned int)
-	?SetUidL@CBaseMrInfoObject@@QAEXPAVHBufC16@@@Z @ 142 NONAME ; void CBaseMrInfoObject::SetUidL(class HBufC16 *)
-	?RemoveObserver@CBasePlugin@@UAEXAAVMFSMailEventObserver@@@Z @ 143 NONAME ; void CBasePlugin::RemoveObserver(class MFSMailEventObserver &)
-	?SetRecurrentCountL@CBaseMrRecurrenceRule@@UAEXH@Z @ 144 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentCountL(int)
-	?HandleMailboxDeleteL@CBasePlugin@@MAEXABVTFSMailMsgId@@@Z @ 145 NONAME ; void CBasePlugin::HandleMailboxDeleteL(class TFSMailMsgId const &)
-	?RecurrentMonths@CBaseMrRecurrenceRule@@UBEABV?$RArray@W4TMRRecurrenceMonth@MRRecurrenceRule@@@@XZ @ 146 NONAME ; class RArray<enum MRRecurrenceRule::TMRRecurrenceMonth> const & CBaseMrRecurrenceRule::RecurrentMonths(void) const
-	?AttendeeStatus@CBaseMrAttendee@@UBE?AW4TAttendeeStatus@MMRAttendee@@XZ @ 147 NONAME ; enum MMRAttendee::TAttendeeStatus CBaseMrAttendee::AttendeeStatus(void) const
-	?NewL@CResourceLoader@@SAPAV1@ABVTDesC16@@@Z @ 148 NONAME ; class CResourceLoader * CResourceLoader::NewL(class TDesC16 const &)
-	?SetRecurrentInterval@CBaseMrRecurrenceRule@@UAEXH@Z @ 149 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentInterval(int)
-	?GetDelayedOpsManager@CBasePlugin@@QAEAAVMDelayedOpsManager@@XZ @ 150 NONAME ; class MDelayedOpsManager & CBasePlugin::GetDelayedOpsManager(void)
-	?GetContentToBufferL@CBasePlugin@@UAEXABVTFSMailMsgId@@000AAVTDes16@@I@Z @ 151 NONAME ; void CBasePlugin::GetContentToBufferL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDes16 &, unsigned int)
-	?SetUidL@CBaseMrInfoObject@@QAEXABVTDesC16@@@Z @ 152 NONAME ; void CBaseMrInfoObject::SetUidL(class TDesC16 const &)
-	??1CResourceLoader@@UAE@XZ @ 153 NONAME ; CResourceLoader::~CResourceLoader(void)
-	?CreateFolderL@CBasePlugin@@UAEPAVCFSMailFolder@@ABVTFSMailMsgId@@0ABVTDesC16@@H@Z @ 154 NONAME ; class CFSMailFolder * CBasePlugin::CreateFolderL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, int)
-	?UidL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 155 NONAME ; class TDesC16 const & CBaseMrInfoObject::UidL(void) const
-	?DoClearSearchResultCacheL@CBasePlugin@@IAEXABVTFSMailMsgId@@@Z @ 156 NONAME ; void CBasePlugin::DoClearSearchResultCacheL(class TFSMailMsgId const &)
-	?AddAttachmentsL@CBaseMrInfoObject@@UAEXPAVMMRAttachment@@@Z @ 157 NONAME ; void CBaseMrInfoObject::AddAttachmentsL(class MMRAttachment *)
-	?MoveMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@00@Z @ 158 NONAME ; void CBasePlugin::MoveMessagesL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?SubscribeMailboxEventsL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 159 NONAME ; void CBasePlugin::SubscribeMailboxEventsL(class TFSMailMsgId const &, class MFSMailEventObserver &)
-	?SetMRSequenceNumber@CBaseMrInfoObject@@QAEXH@Z @ 160 NONAME ; void CBaseMrInfoObject::SetMRSequenceNumber(int)
-	?DescriptionL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 161 NONAME ; class TDesC16 const & CBaseMrInfoObject::DescriptionL(void) const
-	?ListFoldersL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 162 NONAME ; void CBasePlugin::ListFoldersL(class TFSMailMsgId const &, class RPointerArray<class CFSMailFolder> &)
-	?SetRecurrentWeekDaysL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@W4TMRRecurrentDay@MRRecurrenceRule@@@@@Z @ 163 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentWeekDaysL(class RArray<enum MRRecurrenceRule::TMRRecurrentDay> &)
-	?CopyMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@AAV3@00@Z @ 164 NONAME ; void CBasePlugin::CopyMessagesL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?AlarmInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 165 NONAME ; class TTime CBaseMrInfoObject::AlarmInUtcL(void) const
-	?SendMessageL@CBasePlugin@@UAEXAAVCFSMailMessage@@@Z @ 166 NONAME ; void CBasePlugin::SendMessageL(class CFSMailMessage &)
-	?SetMrusL@CBasePlugin@@UAEXABVTFSMailMsgId@@PAVMDesC16Array@@@Z @ 167 NONAME ; void CBasePlugin::SetMrusL(class TFSMailMsgId const &, class MDesC16Array *)
-	??0CBasePlugin@@IAE@XZ @ 168 NONAME ; CBasePlugin::CBasePlugin(void)
-	?SetAddressL@CBaseMrAttendee@@UAEXABVTDesC16@@@Z @ 169 NONAME ; void CBaseMrAttendee::SetAddressL(class TDesC16 const &)
-	?RecurrentUntil@CBaseMrRecurrenceRule@@UBE?AVTTime@@XZ @ 170 NONAME ; class TTime CBaseMrRecurrenceRule::RecurrentUntil(void) const
-	?SetMRResponseL@CBaseMrInfoObject@@UAEXW4TResponse@MMRInfoObject@@@Z @ 171 NONAME ; void CBaseMrInfoObject::SetMRResponseL(enum MMRInfoObject::TResponse)
-	?NewL@CBaseMrInfoObject@@SAPAV1@XZ @ 172 NONAME ; class CBaseMrInfoObject * CBaseMrInfoObject::NewL(void)
-	?DoListFoldersL@CBasePlugin@@IAEXVTFSMailMsgId@@IHAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 173 NONAME ; void CBasePlugin::DoListFoldersL(class TFSMailMsgId, unsigned int, int, class RPointerArray<class CFSMailFolder> &)
-	?MROrganizerL@CBaseMrInfoObject@@UAEAAVMMROrganizer@@XZ @ 174 NONAME ; class MMROrganizer & CBaseMrInfoObject::MROrganizerL(void)
-	?NotifyMailboxEventL@CBasePlugin@@MAEXW4TFSMailEvent@@VTFSMailMsgId@@PAX22@Z @ 175 NONAME ; void CBasePlugin::NotifyMailboxEventL(enum TFSMailEvent, class TFSMailMsgId, void *, void *, void *)
-	??0CDelayedOp@@IAE@XZ @ 176 NONAME ; CDelayedOp::CDelayedOp(void)
-	?GetReplyToAddressL@CBasePlugin@@MAEPAVHBufC16@@VTFSMailMsgId@@@Z @ 177 NONAME ; class HBufC16 * CBasePlugin::GetReplyToAddressL(class TFSMailMsgId)
-	?LocationL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 178 NONAME ; class TDesC16 const & CBaseMrInfoObject::LocationL(void) const
-	?DeleteFetchRequestForPart@CBasePlugin@@IAEHAAUTOngoingFetchInfo@1@@Z @ 179 NONAME ; int CBasePlugin::DeleteFetchRequestForPart(struct CBasePlugin::TOngoingFetchInfo &)
-	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 180 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int)
-	?NewChildPartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@0000ABVTDesC16@@@Z @ 181 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
-	?NewL@CBaseMrRecurrenceRule@@SAPAV1@XZ @ 182 NONAME ; class CBaseMrRecurrenceRule * CBaseMrRecurrenceRule::NewL(void)
-	?SetAttendeeStatusL@CBaseMrAttendee@@UAEXAAW4TAttendeeStatus@MMRAttendee@@@Z @ 183 NONAME ; void CBaseMrAttendee::SetAttendeeStatusL(enum MMRAttendee::TAttendeeStatus &)
-	?DeleteMailBoxByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@H@Z @ 184 NONAME ; void CBasePlugin::DeleteMailBoxByUidL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
-	?TranslateMsgStoreMrL@CBasePlugin@@MAEXABVTFSMailMsgId@@AAVCMsgStorePropertyContainer@@1AAVCFSMailMessagePart@@@Z @ 185 NONAME ; void CBasePlugin::TranslateMsgStoreMrL(class TFSMailMsgId const &, class CMsgStorePropertyContainer &, class CMsgStorePropertyContainer &, class CFSMailMessagePart &)
-	?GetMessagePartFileL@CBasePlugin@@UAEHABVTFSMailMsgId@@000AAVRFile@@@Z @ 186 NONAME ; int CBasePlugin::GetMessagePartFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RFile &)
-	?SystemEventNotifyL@CBasePlugin@@IAEXW4TMsgStoreSystemEvent@@@Z @ 187 NONAME ; void CBasePlugin::SystemEventNotifyL(enum TMsgStoreSystemEvent)
-	??1CBaseMrInfoObject@@UAE@XZ @ 188 NONAME ; CBaseMrInfoObject::~CBaseMrInfoObject(void)
-	?StoreMessagePartL@CBasePlugin@@UAEXABVTFSMailMsgId@@00AAVCFSMailMessagePart@@@Z @ 189 NONAME ; void CBasePlugin::StoreMessagePartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class CFSMailMessagePart &)
-	?CreateMessageToSendL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@H@Z @ 190 NONAME ; void CBasePlugin::CreateMessageToSendL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
-	?AttachmentsL@CBaseMrInfoObject@@UBEABV?$RPointerArray@VMMRAttachment@@@@XZ @ 191 NONAME ; class RPointerArray<class MMRAttachment> const & CBaseMrInfoObject::AttachmentsL(void) const
-	?RecurrenceStartTime@CBaseMrRecurrenceRule@@UBE?AVTTime@@XZ @ 192 NONAME ; class TTime CBaseMrRecurrenceRule::RecurrenceStartTime(void) const
-	?CreationTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 193 NONAME ; class TTime CBaseMrInfoObject::CreationTimeInUtcL(void) const
-	?SetReplyOrForwardToFieldL@CBasePlugin@@IAEXAAVCMsgStoreMessage@@@Z @ 194 NONAME ; void CBasePlugin::SetReplyOrForwardToFieldL(class CMsgStoreMessage &)	
-	?RefreshNowL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@HH@Z @ 195 NONAME ; void CBasePlugin::RefreshNowL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int, int)
-	?CreateResourceReaderLC@CResourceLoader@@QBEPAVHBufC8@@AAVTResourceReader@@H@Z @ 196 NONAME ; class HBufC8 * CResourceLoader::CreateResourceReaderLC(class TResourceReader &, int) const
-	?ModificationNotify@CBasePlugin@@UAEXIW4TMsgStoreOperation@@W4TMsgStoreContainerType@@KIII@Z @ 197 NONAME ; void CBasePlugin::ModificationNotify(unsigned int, enum TMsgStoreOperation, enum TMsgStoreContainerType, unsigned long, unsigned int, unsigned int, unsigned int)
-	?SystemEventNotify@CBasePlugin@@UAEXW4TMsgStoreSystemEvent@@@Z @ 198 NONAME ; void CBasePlugin::SystemEventNotify(enum TMsgStoreSystemEvent)
-	?GetCachedMsgChildrenL@CBasePlugin@@IAEAAV?$RPointerArray@VCMsgStoreMessagePart@@@@XZ @ 199 NONAME ; class RPointerArray<class CMsgStoreMessagePart> & CBasePlugin::GetCachedMsgChildrenL(void)
-	?CreateMrReplyMessageL@CBasePlugin@@MAEPAVCFSMailMessage@@ABVTFSMailMsgId@@AAVMMRInfoObject@@0@Z @ 200 NONAME ; class CFSMailMessage * CBasePlugin::CreateMrReplyMessageL(class TFSMailMsgId const &, class MMRInfoObject &, class TFSMailMsgId const &)
-	?SetLocationL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 201 NONAME ; void CBaseMrInfoObject::SetLocationL(class TDesC16 const &)
-	?NewChildPartFromFilePathOrHandleL@CBasePlugin@@IAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@1HAAVRFile@@@Z @ 202 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFilePathOrHandleL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &, int, class RFile &)
-	?TranslateEmailFwMrL@CBasePlugin@@MAEXAAVMMRInfoObject@@AAVCMsgStorePropertyContainer@@@Z @ 203 NONAME ; void CBasePlugin::TranslateEmailFwMrL(class MMRInfoObject &, class CMsgStorePropertyContainer &)
-	?ConstructL@CBasePlugin@@IAEXXZ @ 204 NONAME ; void CBasePlugin::ConstructL(void)
-	?NewChildPartFromFileL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@1@Z @ 205 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &)
-	?CancelSyncL@CBasePlugin@@UAEHABVTFSMailMsgId@@@Z @ 206 NONAME ; int CBasePlugin::CancelSyncL(class TFSMailMsgId const &)
-	?RefreshCachedMailBoxDisplayNameL@CBasePlugin@@IAEXAAHABI@Z @ 207 NONAME ; void CBasePlugin::RefreshCachedMailBoxDisplayNameL(int &, unsigned int const &)
-	?CurrentSyncState@CBasePlugin@@UAE?AW4TSSMailSyncState@@ABVTFSMailMsgId@@@Z @ 208 NONAME ; enum TSSMailSyncState CBasePlugin::CurrentSyncState(class TFSMailMsgId const &)
-	?AddObserverL@CBasePlugin@@UAEXAAVMFSMailEventObserver@@@Z @ 209 NONAME ; void CBasePlugin::AddObserverL(class MFSMailEventObserver &)
-	?AttendeeRole@CBaseMrAttendee@@UBE?AW4TAttendeeRole@MMRAttendee@@XZ @ 210 NONAME ; enum MMRAttendee::TAttendeeRole CBaseMrAttendee::AttendeeRole(void) const
-	?GetCachedBodyL@CBasePlugin@@IAEPAVCMsgStoreMessagePart@@I@Z @ 211 NONAME ; class CMsgStoreMessagePart * CBasePlugin::GetCachedBodyL(unsigned int)
-	?PriorityL@CBaseMrInfoObject@@UBEIXZ @ 212 NONAME ; unsigned int CBaseMrInfoObject::PriorityL(void) const
-	?RecurrentWeekDays@CBaseMrRecurrenceRule@@UBEABV?$RArray@W4TMRRecurrentDay@MRRecurrenceRule@@@@XZ @ 213 NONAME ; class RArray<enum MRRecurrenceRule::TMRRecurrentDay> const & CBaseMrRecurrenceRule::RecurrentWeekDays(void) const
-	?ListMessagesL@CBasePlugin@@UAEPAVMFSMailIterator@@ABVTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 214 NONAME ; class MFSMailIterator * CBasePlugin::ListMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
-	?Load2L@CResourceLoader@@QAEPAVHBufC16@@HABVTDesC16@@@Z @ 215 NONAME ; class HBufC16 * CResourceLoader::Load2L(int, class TDesC16 const &)
-	?NewChildPartFromFileL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@AAVRFile@@@Z @ 216 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class RFile &)
-	?SetMailboxName@CBasePlugin@@UAEXABVTFSMailMsgId@@ABVTDesC16@@@Z @ 217 NONAME ; void CBasePlugin::SetMailboxName(class TFSMailMsgId const &, class TDesC16 const &)
-	?NewLC@CBasePlugin@@SAPAV1@XZ @ 218 NONAME ; class CBasePlugin * CBasePlugin::NewLC(void)
-	?ExtensionL@CBaseMrInfoObject@@UAEPAXVTUid@@@Z @ 219 NONAME ; void * CBaseMrInfoObject::ExtensionL(class TUid)
-	?TranslateMsgStorePropsL@CBasePlugin@@MAEXABVTFSMailMsgId@@AAVCMsgStorePropertyContainer@@AAVCFSMailMessagePart@@W4TFSMailDetails@@@Z @ 220 NONAME ; void CBasePlugin::TranslateMsgStorePropsL(class TFSMailMsgId const &, class CMsgStorePropertyContainer &, class CFSMailMessagePart &, enum TFSMailDetails)
-	?GetMailboxDisplayNameL@CBasePlugin@@IAEXIAAVRBuf16@@@Z @ 221 NONAME ; void CBasePlugin::GetMailboxDisplayNameL(unsigned int, class RBuf16 &)
-	?NewChildPartFromFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@1AAVMFSMailRequestObserver@@H@Z @ 222 NONAME ; void CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &, class MFSMailRequestObserver &, int)
-	?RemoveChildPartL@CBasePlugin@@UAEXABVTFSMailMsgId@@0000AAVMFSMailRequestObserver@@H@Z @ 223 NONAME ; void CBasePlugin::RemoveChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
-	?StartOp@CDelayedOp@@QAEXXZ @ 224 NONAME ; void CDelayedOp::StartOp(void)
-	?DeleteDelayedOpsManager@CBasePlugin@@QAEXXZ @ 225 NONAME ; void CBasePlugin::DeleteDelayedOpsManager(void)
+	?NewL@CBasePlugin@@SAPAV1@XZ @ 1 NONAME ; class CBasePlugin * CBasePlugin::NewL(void)
+	?AlarmInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 2 NONAME ; class TTime CBaseMrInfoObject::AlarmInUtcL(void) const
+	?AttendeesL@CBaseMrInfoObject@@UAEAAV?$RPointerArray@VMMRAttendee@@@@XZ @ 3 NONAME ; class RPointerArray<class MMRAttendee> & CBaseMrInfoObject::AttendeesL(void)
+	?NewChildPartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@0000ABVTDesC16@@@Z @ 4 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
+	?AccountEventNotify@CBasePlugin@@UAEXW4TMsgStoreAccountEvent@@JABVTDesC16@@1I@Z @ 5 NONAME ; void CBasePlugin::AccountEventNotify(enum TMsgStoreAccountEvent, long, class TDesC16 const &, class TDesC16 const &, unsigned int)
+	?MRResponse@CBaseMrInfoObject@@UBE?AW4TResponse@MMRInfoObject@@XZ @ 6 NONAME ; enum MMRInfoObject::TResponse CBaseMrInfoObject::MRResponse(void) const
+	?SetDescriptionL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 7 NONAME ; void CBaseMrInfoObject::SetDescriptionL(class TDesC16 const &)
+	?RefreshNowL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@HH@Z @ 8 NONAME ; void CBasePlugin::RefreshNowL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int, int)
+	?RecurrenceStartTime@CBaseMrRecurrenceRule@@UBE?AVTTime@@XZ @ 9 NONAME ; class TTime CBaseMrRecurrenceRule::RecurrenceStartTime(void) const
+	?NewL@CResourceLoader@@SAPAV1@ABVTDesC16@@@Z @ 10 NONAME ; class CResourceLoader * CResourceLoader::NewL(class TDesC16 const &)
+	?MRSequenceNumberL@CBaseMrInfoObject@@UBEHXZ @ 11 NONAME ; int CBaseMrInfoObject::MRSequenceNumberL(void) const
+	?SetMRRecurrenceIdL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 12 NONAME ; void CBaseMrInfoObject::SetMRRecurrenceIdL(class TTime)
+	?RemoveChildPartL@CBasePlugin@@UAEXABVTFSMailMsgId@@0000@Z @ 13 NONAME ; void CBasePlugin::RemoveChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?TranslateEmailFwMessageL@CBasePlugin@@MAEXAAVCFSMailMessagePart@@AAVCMsgStoreMessagePart@@H@Z @ 14 NONAME ; void CBasePlugin::TranslateEmailFwMessageL(class CFSMailMessagePart &, class CMsgStoreMessagePart &, int)
+	?GetAccountForMsgBoxL@CBasePlugin@@IAEPAVCMsgStoreAccount@@ABVTFSMailMsgId@@@Z @ 15 NONAME ; class CMsgStoreAccount * CBasePlugin::GetAccountForMsgBoxL(class TFSMailMsgId const &)
+	?TranslateEmailFwAttendeeL@CBasePlugin@@IAEXAAVMMROrganizer@@AAVRMsgStoreAddress@@@Z @ 16 NONAME ; void CBasePlugin::TranslateEmailFwAttendeeL(class MMROrganizer &, class RMsgStoreAddress &)
+	?RecurrentMonths@CBaseMrRecurrenceRule@@UBEABV?$RArray@W4TMRRecurrenceMonth@MRRecurrenceRule@@@@XZ @ 17 NONAME ; class RArray<enum MRRecurrenceRule::TMRRecurrenceMonth> const & CBaseMrRecurrenceRule::RecurrentMonths(void) const
+	?SetRecurrenceStartTimeL@CBaseMrRecurrenceRule@@UAEXVTTime@@@Z @ 18 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceStartTimeL(class TTime)
+	?RecurrentMonthDays@CBaseMrRecurrenceRule@@UBEABV?$RArray@H@@XZ @ 19 NONAME ; class RArray<int> const & CBaseMrRecurrenceRule::RecurrentMonthDays(void) const
+	?ListFoldersL@CBasePlugin@@UAEXABVTFSMailMsgId@@0AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 20 NONAME ; void CBasePlugin::ListFoldersL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RPointerArray<class CFSMailFolder> &)
+	?GetStandardFolderIdL@CBasePlugin@@UAE?AVTFSMailMsgId@@ABV2@W4TFSFolderType@@@Z @ 21 NONAME ; class TFSMailMsgId CBasePlugin::GetStandardFolderIdL(class TFSMailMsgId const &, enum TFSFolderType)
+	?DeleteMailBoxByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@H@Z @ 22 NONAME ; void CBasePlugin::DeleteMailBoxByUidL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
+	?NewChildPartFromFileL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@1@Z @ 23 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &)
+	?CopyMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@AAV3@00@Z @ 24 NONAME ; void CBasePlugin::CopyMessagesL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?RefreshCachedMailBoxDisplayNameL@CBasePlugin@@IAEXAAHABI@Z @ 25 NONAME ; void CBasePlugin::RefreshCachedMailBoxDisplayNameL(int &, unsigned int const &)
+	?StatusL@CBasePlugin@@UAE?AVTFSProgress@@H@Z @ 26 NONAME ; class TFSProgress CBasePlugin::StatusL(int)
+	?CurrentSyncState@CBasePlugin@@UAE?AW4TSSMailSyncState@@ABVTFSMailMsgId@@@Z @ 27 NONAME ; enum TSSMailSyncState CBasePlugin::CurrentSyncState(class TFSMailMsgId const &)
+	?CreateFolderL@CBasePlugin@@UAEPAVCFSMailFolder@@ABVTFSMailMsgId@@0ABVTDesC16@@H@Z @ 28 NONAME ; class CFSMailFolder * CBasePlugin::CreateFolderL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, int)
+	?AccountEventNotifyL@CBasePlugin@@IAEXW4TMsgStoreAccountEvent@@JABVTDesC16@@1I@Z @ 29 NONAME ; void CBasePlugin::AccountEventNotifyL(enum TMsgStoreAccountEvent, long, class TDesC16 const &, class TDesC16 const &, unsigned int)
+	?NotifyEventL@CBasePlugin@@IAEXIIIW4TFSMailEvent@@I@Z @ 30 NONAME ; void CBasePlugin::NotifyEventL(unsigned int, unsigned int, unsigned int, enum TFSMailEvent, unsigned int)
+	?ResetBodyCache@CBasePlugin@@IAEXXZ @ 31 NONAME ; void CBasePlugin::ResetBodyCache(void)
+	?UnsubscribeMailboxEventsL@CBasePlugin@@IAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 32 NONAME ; void CBasePlugin::UnsubscribeMailboxEventsL(class TFSMailMsgId const &, class MFSMailEventObserver &)
+	?SetAttendeeStatusL@CBaseMrAttendee@@UAEXAAW4TAttendeeStatus@MMRAttendee@@@Z @ 33 NONAME ; void CBaseMrAttendee::SetAttendeeStatusL(enum MMRAttendee::TAttendeeStatus &)
+	?GetCachedBodyChildrenL@CBasePlugin@@IAEAAV?$RPointerArray@VCMsgStoreMessagePart@@@@XZ @ 34 NONAME ; class RPointerArray<class CMsgStoreMessagePart> & CBasePlugin::GetCachedBodyChildrenL(void)
+	?DoCancel@CDelayedOp@@EAEXXZ @ 35 NONAME ; void CDelayedOp::DoCancel(void)
+	?AttachmentsL@CBaseMrInfoObject@@UBEABV?$RPointerArray@VMMRAttachment@@@@XZ @ 36 NONAME ; class RPointerArray<class MMRAttachment> const & CBaseMrInfoObject::AttachmentsL(void) const
+	??1CBaseMrInfoObject@@UAE@XZ @ 37 NONAME ; CBaseMrInfoObject::~CBaseMrInfoObject(void)
+	??_ECBasePlugin@@UAE@I@Z @ 38 NONAME ; CBasePlugin::~CBasePlugin(unsigned int)
+	?GetSignatureL@CBasePlugin@@MAEPAVHBufC16@@ABVTFSMailMsgId@@@Z @ 39 NONAME ; class HBufC16 * CBasePlugin::GetSignatureL(class TFSMailMsgId const &)
+	?GetBrandingIdL@CBasePlugin@@UAEAAVTDesC16@@ABVTFSMailMsgId@@@Z @ 40 NONAME ; class TDesC16 & CBasePlugin::GetBrandingIdL(class TFSMailMsgId const &)
+	?StoreMessagePartsL@CBasePlugin@@UAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@AAVMFSMailRequestObserver@@H@Z @ 41 NONAME ; void CBasePlugin::StoreMessagePartsL(class RPointerArray<class CFSMailMessagePart> &, class MFSMailRequestObserver &, int)
+	??1CBasePlugin@@UAE@XZ @ 42 NONAME ; CBasePlugin::~CBasePlugin(void)
+	?SetRecurrenceTypeL@CBaseMrRecurrenceRule@@UAEXW4TMRRecurrenceType@MRRecurrenceRule@@@Z @ 43 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceTypeL(enum MRRecurrenceRule::TMRRecurrenceType)
+	?FetchEmailAddressL@CBasePlugin@@IAEPAVCFSMailAddress@@AAVCMsgStorePropertyContainer@@I@Z @ 44 NONAME ; class CFSMailAddress * CBasePlugin::FetchEmailAddressL(class CMsgStorePropertyContainer &, unsigned int)
+	?ConstructL@CBasePlugin@@IAEXXZ @ 45 NONAME ; void CBasePlugin::ConstructL(void)
+	?ExtensionL@CBaseMrInfoObject@@UAEPAXVTUid@@@Z @ 46 NONAME ; void * CBaseMrInfoObject::ExtensionL(class TUid)
+	?LoadLC@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 47 NONAME ; class HBufC16 * CResourceLoader::LoadLC(int)
+	?SetAlarmInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 48 NONAME ; void CBaseMrInfoObject::SetAlarmInUtcL(class TTime)
+	?HandleRemovePartContentL@CBasePlugin@@MAEXAAVCMsgStoreMessage@@AAVCMsgStoreMessagePart@@@Z @ 49 NONAME ; void CBasePlugin::HandleRemovePartContentL(class CMsgStoreMessage &, class CMsgStoreMessagePart &)
+	?CancelSyncL@CBasePlugin@@UAEHABVTFSMailMsgId@@@Z @ 50 NONAME ; int CBasePlugin::CancelSyncL(class TFSMailMsgId const &)
+	?BlockCopyMoveFromFoldersL@CBasePlugin@@MAEXVTFSMailMsgId@@W4TFSFolderType@@AAVCFSMailFolder@@@Z @ 51 NONAME ; void CBasePlugin::BlockCopyMoveFromFoldersL(class TFSMailMsgId, enum TFSFolderType, class CFSMailFolder &)
+	?NewL@CBaseMrRecurrenceRule@@SAPAV1@XZ @ 52 NONAME ; class CBaseMrRecurrenceRule * CBaseMrRecurrenceRule::NewL(void)
+	?NewL@CBaseMrAttendee@@SAPAV1@XZ @ 53 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(void)
+	?ModificationNotifyL@CBasePlugin@@IAEXIW4TMsgStoreOperation@@W4TMsgStoreContainerType@@KIII@Z @ 54 NONAME ; void CBasePlugin::ModificationNotifyL(unsigned int, enum TMsgStoreOperation, enum TMsgStoreContainerType, unsigned long, unsigned int, unsigned int, unsigned int)
+	?MRRecurrenceId@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 55 NONAME ; class TTime CBaseMrInfoObject::MRRecurrenceId(void) const
+	?AddAttendeeL@CBaseMrInfoObject@@UAEXPAVMMRAttendee@@@Z @ 56 NONAME ; void CBaseMrInfoObject::AddAttendeeL(class MMRAttendee *)
+	?SetAddressL@CBaseMrAttendee@@UAEXABVTDesC16@@@Z @ 57 NONAME ; void CBaseMrAttendee::SetAddressL(class TDesC16 const &)
+	?GetPluginId@CBasePlugin@@MAEIXZ @ 58 NONAME ; unsigned int CBasePlugin::GetPluginId(void)
+	?NewChildPartFromFilePathOrHandleL@CBasePlugin@@IAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@1HAAVRFile@@@Z @ 59 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFilePathOrHandleL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &, int, class RFile &)
+	?NewL@CBaseMrInfoObject@@SAPAV1@AAVMMRInfoObject@@@Z @ 60 NONAME ; class CBaseMrInfoObject * CBaseMrInfoObject::NewL(class MMRInfoObject &)
+	??1CBaseMrRecurrenceRule@@UAE@XZ @ 61 NONAME ; CBaseMrRecurrenceRule::~CBaseMrRecurrenceRule(void)
+	?SetCommonNameL@CBaseMrAttendee@@UAEXABVTDesC16@@@Z @ 62 NONAME ; void CBaseMrAttendee::SetCommonNameL(class TDesC16 const &)
+	?SetMethod@CBaseMrInfoObject@@QAEXW4TMRMethod@MMRInfoObject@@@Z @ 63 NONAME ; void CBaseMrInfoObject::SetMethod(enum MMRInfoObject::TMRMethod)
+	?NewL@CBaseMrInfoObject@@SAPAV1@XZ @ 64 NONAME ; class CBaseMrInfoObject * CBaseMrInfoObject::NewL(void)
+	?StoreMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@H@Z @ 65 NONAME ; void CBasePlugin::StoreMessagesL(class TFSMailMsgId const &, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &, int)
+	?SetRecurrentDaysofMonthL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@UTRecurrentDaysofMonth@MRRecurrenceRule@@@@@Z @ 66 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentDaysofMonthL(class RArray<struct MRRecurrenceRule::TRecurrentDaysofMonth> &)
+	?DoClearSearchResultCacheL@CBasePlugin@@IAEXABVTFSMailMsgId@@@Z @ 67 NONAME ; void CBasePlugin::DoClearSearchResultCacheL(class TFSMailMsgId const &)
+	?SupportedFields@CBaseMrInfoObject@@UBEHAAV?$RArray@W4TESMRInfoField@MMRInfoObject@@@@@Z @ 68 NONAME ; int CBaseMrInfoObject::SupportedFields(class RArray<enum MMRInfoObject::TESMRInfoField> &) const
+	?SetPriorityL@CBaseMrInfoObject@@UAEXI@Z @ 69 NONAME ; void CBaseMrInfoObject::SetPriorityL(unsigned int)
+	?SetMRResponseL@CBaseMrInfoObject@@UAEXW4TResponse@MMRInfoObject@@@Z @ 70 NONAME ; void CBaseMrInfoObject::SetMRResponseL(enum MMRInfoObject::TResponse)
+	?SetContext@CDelayedOp@@QAEXAAVCBasePlugin@@AAVMDelayedOpsManager@@@Z @ 71 NONAME ; void CDelayedOp::SetContext(class CBasePlugin &, class MDelayedOpsManager &)
+	?CreateForwardReplyMessageL@CBasePlugin@@IAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0HABVTDesC16@@HH@Z @ 72 NONAME ; class CFSMailMessage * CBasePlugin::CreateForwardReplyMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, int, class TDesC16 const &, int, int)
+	?StoreMessagePartL@CBasePlugin@@UAEXABVTFSMailMsgId@@00AAVCFSMailMessagePart@@@Z @ 73 NONAME ; void CBasePlugin::StoreMessagePartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class CFSMailMessagePart &)
+	?GetCachedMsgChildrenL@CBasePlugin@@IAEAAV?$RPointerArray@VCMsgStoreMessagePart@@@@XZ @ 74 NONAME ; class RPointerArray<class CMsgStoreMessagePart> & CBasePlugin::GetCachedMsgChildrenL(void)
+	?GetCachedBodyL@CBasePlugin@@IAEPAVCMsgStoreMessagePart@@I@Z @ 75 NONAME ; class CMsgStoreMessagePart * CBasePlugin::GetCachedBodyL(unsigned int)
+	?CreationTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 76 NONAME ; class TTime CBaseMrInfoObject::CreationTimeInUtcL(void) const
+	?RecurrentCount@CBaseMrRecurrenceRule@@UBEIXZ @ 77 NONAME ; unsigned int CBaseMrRecurrenceRule::RecurrentCount(void) const
+	?NewL@CBaseMrRecurrenceRule@@SAPAV1@ABVMRRecurrenceRule@@@Z @ 78 NONAME ; class CBaseMrRecurrenceRule * CBaseMrRecurrenceRule::NewL(class MRRecurrenceRule const &)
+	??1CDelayedOp@@UAE@XZ @ 79 NONAME ; CDelayedOp::~CDelayedOp(void)
+	?ResponseRequested@CBaseMrAttendee@@UBEHXZ @ 80 NONAME ; int CBaseMrAttendee::ResponseRequested(void) const
+	?ListFoldersL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 81 NONAME ; void CBasePlugin::ListFoldersL(class TFSMailMsgId const &, class RPointerArray<class CFSMailFolder> &)
+	?TranslateEmailFwMrL@CBasePlugin@@MAEXAAVMMRInfoObject@@AAVCMsgStorePropertyContainer@@@Z @ 82 NONAME ; void CBasePlugin::TranslateEmailFwMrL(class MMRInfoObject &, class CMsgStorePropertyContainer &)
+	?Load2L@CResourceLoader@@QAEPAVHBufC16@@HH@Z @ 83 NONAME ; class HBufC16 * CResourceLoader::Load2L(int, int)
+	?SetRecurrentMonthsL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@W4TMRRecurrenceMonth@MRRecurrenceRule@@@@@Z @ 84 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentMonthsL(class RArray<enum MRRecurrenceRule::TMRRecurrenceMonth> &)
+	?GoOfflineL@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 85 NONAME ; void CBasePlugin::GoOfflineL(class TFSMailMsgId const &)
+	?FetchMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@H@Z @ 86 NONAME ; void CBasePlugin::FetchMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &, int)
+	?SetRecurrentMonthDaysL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@H@@@Z @ 87 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentMonthDaysL(class RArray<int> &)
+	?MoveMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@00@Z @ 88 NONAME ; void CBasePlugin::MoveMessagesL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 89 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int)
+	?DeleteFolderByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@0@Z @ 90 NONAME ; void CBasePlugin::DeleteFolderByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &)
+	??_ECDelayedOp@@UAE@I@Z @ 91 NONAME ; CDelayedOp::~CDelayedOp(unsigned int)
+	?SetRecurrentWeekDaysL@CBaseMrRecurrenceRule@@UAEXAAV?$RArray@W4TMRRecurrentDay@MRRecurrenceRule@@@@@Z @ 92 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentWeekDaysL(class RArray<enum MRRecurrenceRule::TMRRecurrentDay> &)
+	?Load2L@CResourceLoader@@QAEPAVHBufC16@@HABVTDesC16@@@Z @ 93 NONAME ; class HBufC16 * CResourceLoader::Load2L(int, class TDesC16 const &)
+	?StoreMessageL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVCFSMailMessage@@@Z @ 94 NONAME ; void CBasePlugin::StoreMessageL(class TFSMailMsgId const &, class CFSMailMessage &)
+	?ReportRequestStatusL@CBasePlugin@@MAEXIIIIH@Z @ 95 NONAME ; void CBasePlugin::ReportRequestStatusL(unsigned int, unsigned int, unsigned int, unsigned int, int)
+	?CreateMrReplyMessageL@CBasePlugin@@MAEPAVCFSMailMessage@@ABVTFSMailMsgId@@AAVMMRInfoObject@@0@Z @ 96 NONAME ; class CFSMailMessage * CBasePlugin::CreateMrReplyMessageL(class TFSMailMsgId const &, class MMRInfoObject &, class TFSMailMsgId const &)
+	?SetRecurrentCountL@CBaseMrRecurrenceRule@@UAEXH@Z @ 97 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentCountL(int)
+	?MRMethodL@CBaseMrInfoObject@@UBE?AW4TMRMethod@MMRInfoObject@@XZ @ 98 NONAME ; enum MMRInfoObject::TMRMethod CBaseMrInfoObject::MRMethodL(void) const
+	?UnsubscribeMailboxEvents@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 99 NONAME ; void CBasePlugin::UnsubscribeMailboxEvents(class TFSMailMsgId const &, class MFSMailEventObserver &)
+	?FetchMessagePartsL@CBasePlugin@@UAEXABVTFSMailMsgId@@00ABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@HI@Z @ 100 NONAME ; void CBasePlugin::FetchMessagePartsL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, int, unsigned int)
+	?CancelL@CBasePlugin@@UAEXH@Z @ 101 NONAME ; void CBasePlugin::CancelL(int)
+	?AddAttachmentsL@CBaseMrInfoObject@@UAEXPAVMMRAttachment@@@Z @ 102 NONAME ; void CBaseMrInfoObject::AddAttachmentsL(class MMRAttachment *)
+	?MailboxHasCapabilityL@CBasePlugin@@UAEHW4TFSMailBoxCapabilities@@VTFSMailMsgId@@@Z @ 103 NONAME ; int CBasePlugin::MailboxHasCapabilityL(enum TFSMailBoxCapabilities, class TFSMailMsgId)
+	?LocationL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 104 NONAME ; class TDesC16 const & CBaseMrInfoObject::LocationL(void) const
+	?DoListFoldersL@CBasePlugin@@IAEXVTFSMailMsgId@@IHAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 105 NONAME ; void CBasePlugin::DoListFoldersL(class TFSMailMsgId, unsigned int, int, class RPointerArray<class CFSMailFolder> &)
+	?SetUidL@CBaseMrInfoObject@@QAEXPAVHBufC16@@@Z @ 106 NONAME ; void CBaseMrInfoObject::SetUidL(class HBufC16 *)
+	?GetContentToBufferL@CBasePlugin@@UAEXABVTFSMailMsgId@@000AAVTDes16@@I@Z @ 107 NONAME ; void CBasePlugin::GetContentToBufferL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDes16 &, unsigned int)
+	?CreateMessageToSendL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailRequestObserver@@H@Z @ 108 NONAME ; void CBasePlugin::CreateMessageToSendL(class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
+	?SendMessageL@CBasePlugin@@QAEXAAVCMsgStoreMailBox@@AAVCMsgStoreMessage@@ABVTTime@@@Z @ 109 NONAME ; void CBasePlugin::SendMessageL(class CMsgStoreMailBox &, class CMsgStoreMessage &, class TTime const &)
+	?GetMessagesL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@AAV?$RPointerArray@VCFSMailMessage@@@@W4TFSMailDetails@@@Z @ 110 NONAME ; void CBasePlugin::GetMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RPointerArray<class CFSMailMessage> &, enum TFSMailDetails)
+	?GetFolderByUidL@CBasePlugin@@UAEPAVCFSMailFolder@@ABVTFSMailMsgId@@0@Z @ 111 NONAME ; class CFSMailFolder * CBasePlugin::GetFolderByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?DeleteFetchRequest@CBasePlugin@@IAEXAAUTOngoingFetchInfo@1@@Z @ 112 NONAME ; void CBasePlugin::DeleteFetchRequest(struct CBasePlugin::TOngoingFetchInfo &)
+	?ResetCache@CBasePlugin@@IAEXXZ @ 113 NONAME ; void CBasePlugin::ResetCache(void)
+	?NewL@CBaseMrInfoProcessor@@SAPAV1@AAVCBasePlugin@@@Z @ 114 NONAME ; class CBaseMrInfoProcessor * CBaseMrInfoProcessor::NewL(class CBasePlugin &)
+	?NewChildPartFromFileL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000ABVTDesC16@@AAVRFile@@@Z @ 115 NONAME ; class CFSMailMessagePart * CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class RFile &)
+	?GetBodyPartL@CBasePlugin@@IAEPAVCMsgStoreMessagePart@@AAVCMsgStoreMessage@@ABVTDesC16@@@Z @ 116 NONAME ; class CMsgStoreMessagePart * CBasePlugin::GetBodyPartL(class CMsgStoreMessage &, class TDesC16 const &)
+	?GoOnlineL@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 117 NONAME ; void CBasePlugin::GoOnlineL(class TFSMailMsgId const &)
+	?InvalidateCacheIfNecessary@CBasePlugin@@IAEXIII@Z @ 118 NONAME ; void CBasePlugin::InvalidateCacheIfNecessary(unsigned int, unsigned int, unsigned int)
+	?TranslateMsgStoreDayOfWeek@CBasePlugin@@IAEXKAAVTDayOfWeekFtor@@@Z @ 119 NONAME ; void CBasePlugin::TranslateMsgStoreDayOfWeek(unsigned long, class TDayOfWeekFtor &)
+	?SetRecurrentInterval@CBaseMrRecurrenceRule@@UAEXH@Z @ 120 NONAME ; void CBaseMrRecurrenceRule::SetRecurrentInterval(int)
+	?SetEndTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 121 NONAME ; void CBaseMrInfoObject::SetEndTimeInUtcL(class TTime)
+	?GetDelayedOpsManager@CBasePlugin@@QAEAAVMDelayedOpsManager@@XZ @ 122 NONAME ; class MDelayedOpsManager & CBasePlugin::GetDelayedOpsManager(void)
+	?CreateReplyMessageL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0HABVTDesC16@@@Z @ 123 NONAME ; class CFSMailMessage * CBasePlugin::CreateReplyMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, int, class TDesC16 const &)
+	?GetCachedMsgL@CBasePlugin@@IAEPAVCMsgStoreMessage@@II@Z @ 124 NONAME ; class CMsgStoreMessage * CBasePlugin::GetCachedMsgL(unsigned int, unsigned int)
+	?UnregisterRequestObserver@CBasePlugin@@UAEXH@Z @ 125 NONAME ; void CBasePlugin::UnregisterRequestObserver(int)
+	?ClearSearchResultCache@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 126 NONAME ; void CBasePlugin::ClearSearchResultCache(class TFSMailMsgId const &)
+	??1CResourceLoader@@UAE@XZ @ 127 NONAME ; CResourceLoader::~CResourceLoader(void)
+	?CommonName@CBaseMrAttendee@@UBEABVTDesC16@@XZ @ 128 NONAME ; class TDesC16 const & CBaseMrAttendee::CommonName(void) const
+	?GetMailboxDisplayNameL@CBasePlugin@@IAEXIAAVRBuf16@@@Z @ 129 NONAME ; void CBasePlugin::GetMailboxDisplayNameL(unsigned int, class RBuf16 &)
+	?Address@CBaseMrAttendee@@UBEABVTDesC16@@XZ @ 130 NONAME ; class TDesC16 const & CBaseMrAttendee::Address(void) const
+	?GetReplyToAddressL@CBasePlugin@@MAEPAVHBufC16@@VTFSMailMsgId@@@Z @ 131 NONAME ; class HBufC16 * CBasePlugin::GetReplyToAddressL(class TFSMailMsgId)
+	?GetMailboxInfoL@CBasePlugin@@IAEAAVCMailboxInfo@@I@Z @ 132 NONAME ; class CMailboxInfo & CBasePlugin::GetMailboxInfoL(unsigned int)
+	?HandleMailboxDeleteL@CBasePlugin@@MAEXABVTFSMailMsgId@@@Z @ 133 NONAME ; void CBasePlugin::HandleMailboxDeleteL(class TFSMailMsgId const &)
+	?SetPartContentFromFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@@Z @ 134 NONAME ; void CBasePlugin::SetPartContentFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
+	?DeleteMessagesByUidL@CBasePlugin@@UAEXABVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 135 NONAME ; void CBasePlugin::DeleteMessagesByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &)
+	?SetRecurrenceRuleL@CBaseMrInfoObject@@UAEXABVMRRecurrenceRule@@@Z @ 136 NONAME ; void CBaseMrInfoObject::SetRecurrenceRuleL(class MRRecurrenceRule const &)
+	?SetCreationTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 137 NONAME ; void CBaseMrInfoObject::SetCreationTimeInUtcL(class TTime)
+	?AttendeeRole@CBaseMrAttendee@@UBE?AW4TAttendeeRole@MMRAttendee@@XZ @ 138 NONAME ; enum MMRAttendee::TAttendeeRole CBaseMrAttendee::AttendeeRole(void) const
+	?RecurrentUntil@CBaseMrRecurrenceRule@@UBE?AVTTime@@XZ @ 139 NONAME ; class TTime CBaseMrRecurrenceRule::RecurrentUntil(void) const
+	?AttendeeStatus@CBaseMrAttendee@@UBE?AW4TAttendeeStatus@MMRAttendee@@XZ @ 140 NONAME ; enum MMRAttendee::TAttendeeStatus CBaseMrAttendee::AttendeeStatus(void) const
+	?ListMailBoxesL@CBasePlugin@@UAEXAAV?$RArray@VTFSMailMsgId@@@@@Z @ 141 NONAME ; void CBasePlugin::ListMailBoxesL(class RArray<class TFSMailMsgId> &)
+	?WizardDataAvailableL@CBasePlugin@@UAEHXZ @ 142 NONAME ; int CBasePlugin::WizardDataAvailableL(void)
+	?CancelSearch@CBasePlugin@@UAEXABVTFSMailMsgId@@@Z @ 143 NONAME ; void CBasePlugin::CancelSearch(class TFSMailMsgId const &)
+	?RemoveChildPartL@CBasePlugin@@UAEXABVTFSMailMsgId@@0000AAVMFSMailRequestObserver@@H@Z @ 144 NONAME ; void CBasePlugin::RemoveChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class MFSMailRequestObserver &, int)
+	??0CDelayedOp@@IAE@XZ @ 145 NONAME ; CDelayedOp::CDelayedOp(void)
+	?NotifyMailboxEventL@CBasePlugin@@MAEXW4TFSMailEvent@@VTFSMailMsgId@@PAX22@Z @ 146 NONAME ; void CBasePlugin::NotifyMailboxEventL(enum TFSMailEvent, class TFSMailMsgId, void *, void *, void *)
+	?MROrganizerL@CBaseMrInfoObject@@UAEAAVMMROrganizer@@XZ @ 147 NONAME ; class MMROrganizer & CBaseMrInfoObject::MROrganizerL(void)
+	?CalendarFileName@CBasePlugin@@MBEABVTDesC16@@XZ @ 148 NONAME ; class TDesC16 const & CBasePlugin::CalendarFileName(void) const
+	?DeleteDelayedOpsManager@CBasePlugin@@QAEXXZ @ 149 NONAME ; void CBasePlugin::DeleteDelayedOpsManager(void)
+	?NewL@CBaseMrAttendee@@SAPAV1@ABVMMROrganizer@@@Z @ 150 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(class MMROrganizer const &)
+	?TranslateEmailFwRecipientsL@CBasePlugin@@IAEXAAVCMsgStoreMessagePart@@ABVTDesC8@@AAV?$RPointerArray@VCFSMailAddress@@@@@Z @ 151 NONAME ; void CBasePlugin::TranslateEmailFwRecipientsL(class CMsgStoreMessagePart &, class TDesC8 const &, class RPointerArray<class CFSMailAddress> &)
+	?NotifyGlobalEventL@CBasePlugin@@IAEXW4TFSMailEvent@@VTFSMailMsgId@@PAX22@Z @ 152 NONAME ; void CBasePlugin::NotifyGlobalEventL(enum TFSMailEvent, class TFSMailMsgId, void *, void *, void *)
+	?CreateMessageToSendL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@@Z @ 153 NONAME ; class CFSMailMessage * CBasePlugin::CreateMessageToSendL(class TFSMailMsgId const &)
+	?DescriptionL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 154 NONAME ; class TDesC16 const & CBaseMrInfoObject::DescriptionL(void) const
+	?SetMRSequenceNumber@CBaseMrInfoObject@@QAEXH@Z @ 155 NONAME ; void CBaseMrInfoObject::SetMRSequenceNumber(int)
+	?TranslateEmailFwDayOfWeek@CBasePlugin@@IAEXW4TMRRecurrentDay@MRRecurrenceRule@@AAK@Z @ 156 NONAME ; void CBasePlugin::TranslateEmailFwDayOfWeek(enum MRRecurrenceRule::TMRRecurrentDay, unsigned long &)
+	?GetMailBoxStatus@CBasePlugin@@UAE?AW4TFSMailBoxStatus@@ABVTFSMailMsgId@@@Z @ 157 NONAME ; enum TFSMailBoxStatus CBasePlugin::GetMailBoxStatus(class TFSMailMsgId const &)
+	?ListMessagesL@CBasePlugin@@UAEPAVMFSMailIterator@@ABVTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 158 NONAME ; class MFSMailIterator * CBasePlugin::ListMessagesL(class TFSMailMsgId const &, class TFSMailMsgId const &, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
+	?Type@CBaseMrRecurrenceRule@@UBE?AW4TMRRecurrenceType@MRRecurrenceRule@@XZ @ 159 NONAME ; enum MRRecurrenceRule::TMRRecurrenceType CBaseMrRecurrenceRule::Type(void) const
+	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@HH@Z @ 160 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int, int)
+	?CopyMessageAsChildPartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@0000ABVCFSMailMessage@@@Z @ 161 NONAME ; class CFSMailMessagePart * CBasePlugin::CopyMessageAsChildPartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class CFSMailMessage const &)
+	?TranslateMsgStoreMrL@CBasePlugin@@MAEXABVTFSMailMsgId@@AAVCMsgStorePropertyContainer@@1AAVCFSMailMessagePart@@@Z @ 162 NONAME ; void CBasePlugin::TranslateMsgStoreMrL(class TFSMailMsgId const &, class CMsgStorePropertyContainer &, class CMsgStorePropertyContainer &, class CFSMailMessagePart &)
+	?SetSubjectL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 163 NONAME ; void CBaseMrInfoObject::SetSubjectL(class TDesC16 const &)
+	?SetStartTimeInUtcL@CBaseMrInfoObject@@UAEXVTTime@@@Z @ 164 NONAME ; void CBaseMrInfoObject::SetStartTimeInUtcL(class TTime)
+	?RecurrentWeekDays@CBaseMrRecurrenceRule@@UBEABV?$RArray@W4TMRRecurrentDay@MRRecurrenceRule@@@@XZ @ 165 NONAME ; class RArray<enum MRRecurrenceRule::TMRRecurrentDay> const & CBaseMrRecurrenceRule::RecurrentWeekDays(void) const
+	?GetLastSyncStatusL@CBasePlugin@@QAE?BVTFSProgress@@ABVTFSMailMsgId@@@Z @ 166 NONAME ; class TFSProgress const CBasePlugin::GetLastSyncStatusL(class TFSMailMsgId const &)
+	?PriorityL@CBaseMrInfoObject@@UBEIXZ @ 167 NONAME ; unsigned int CBaseMrInfoObject::PriorityL(void) const
+	?GetMailBoxByUidL@CBasePlugin@@UAEPAVCFSMailBox@@ABVTFSMailMsgId@@@Z @ 168 NONAME ; class CFSMailBox * CBasePlugin::GetMailBoxByUidL(class TFSMailMsgId const &)
+	?ReplyToMeetingRequestL@CBaseMrInfoProcessor@@UAEXABVTFSMailMsgId@@0AAVMMRInfoObject@@AAW4TMRInfoResponseMode@MMRInfoProcessor@@ABVTDesC16@@@Z @ 169 NONAME ; void CBaseMrInfoProcessor::ReplyToMeetingRequestL(class TFSMailMsgId const &, class TFSMailMsgId const &, class MMRInfoObject &, enum MMRInfoProcessor::TMRInfoResponseMode &, class TDesC16 const &)
+	?AuthenticateL@CBasePlugin@@UAEXAAVMFSMailRequestObserver@@H@Z @ 170 NONAME ; void CBasePlugin::AuthenticateL(class MFSMailRequestObserver &, int)
+	?MessagePartL@CBasePlugin@@UAEPAVCFSMailMessagePart@@ABVTFSMailMsgId@@000@Z @ 171 NONAME ; class CFSMailMessagePart * CBasePlugin::MessagePartL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?AddRecurrenceExceptionL@CBaseMrInfoObject@@UAEXPAVMMRInfoObject@@@Z @ 172 NONAME ; void CBaseMrInfoObject::AddRecurrenceExceptionL(class MMRInfoObject *)
+	?SearchL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABV?$RArray@VTFSMailMsgId@@@@ABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 173 NONAME ; void CBasePlugin::SearchL(class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &, class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
+	?EndTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 174 NONAME ; class TTime CBaseMrInfoObject::EndTimeInUtcL(void) const
+	?RunL@CDelayedOp@@EAEXXZ @ 175 NONAME ; void CDelayedOp::RunL(void)
+	?SetContentL@CBasePlugin@@UAEXABVTDesC16@@ABVTFSMailMsgId@@111@Z @ 176 NONAME ; void CBasePlugin::SetContentL(class TDesC16 const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &)
+	?DeleteFetchRequestForPart@CBasePlugin@@IAEHAAUTOngoingFetchInfo@1@@Z @ 177 NONAME ; int CBasePlugin::DeleteFetchRequestForPart(struct CBasePlugin::TOngoingFetchInfo &)
+	?ModificationNotify@CBasePlugin@@UAEXIW4TMsgStoreOperation@@W4TMsgStoreContainerType@@KIII@Z @ 178 NONAME ; void CBasePlugin::ModificationNotify(unsigned int, enum TMsgStoreOperation, enum TMsgStoreContainerType, unsigned long, unsigned int, unsigned int, unsigned int)
+	?StartOp@CDelayedOp@@QAEXXZ @ 179 NONAME ; void CDelayedOp::StartOp(void)
+	?SetReplyOrForwardToFieldL@CBasePlugin@@IAEXAAVCMsgStoreMessage@@@Z @ 180 NONAME ; void CBasePlugin::SetReplyOrForwardToFieldL(class CMsgStoreMessage &)
+	?FindFetchRequestL@CBasePlugin@@IAEHIIIIAAUTOngoingFetchInfo@1@@Z @ 181 NONAME ; int CBasePlugin::FindFetchRequestL(unsigned int, unsigned int, unsigned int, unsigned int, struct CBasePlugin::TOngoingFetchInfo &)
+	?RemovePartContentL@CBasePlugin@@UAEXABVTFSMailMsgId@@00ABV?$RArray@VTFSMailMsgId@@@@@Z @ 182 NONAME ; void CBasePlugin::RemovePartContentL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RArray<class TFSMailMsgId> const &)
+	?RecurrenceRuleL@CBaseMrInfoObject@@UBEABVMRRecurrenceRule@@XZ @ 183 NONAME ; class MRRecurrenceRule const & CBaseMrInfoObject::RecurrenceRuleL(void) const
+	?Load2L@CResourceLoader@@QAEPAVHBufC16@@H@Z @ 184 NONAME ; class HBufC16 * CResourceLoader::Load2L(int)
+	?CreateForwardMessageL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@0ABVTDesC16@@@Z @ 185 NONAME ; class CFSMailMessage * CBasePlugin::CreateForwardMessageL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
+	?Fs@CResourceLoader@@QAEAAVRFs@@XZ @ 186 NONAME ; class RFs & CResourceLoader::Fs(void)
+	?NewLC@CBasePlugin@@SAPAV1@XZ @ 187 NONAME ; class CBasePlugin * CBasePlugin::NewLC(void)
+	?NewL@CBaseMrAttendee@@SAPAV1@ABVMMRAttendee@@@Z @ 188 NONAME ; class CBaseMrAttendee * CBaseMrAttendee::NewL(class MMRAttendee const &)
+	?RecurrenceExceptionsL@CBaseMrInfoObject@@UBEABV?$RPointerArray@VMMRInfoObject@@@@XZ @ 189 NONAME ; class RPointerArray<class MMRInfoObject> const & CBaseMrInfoObject::RecurrenceExceptionsL(void) const
+	?SubscribeMailboxEventsL@CBasePlugin@@UAEXABVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 190 NONAME ; void CBasePlugin::SubscribeMailboxEventsL(class TFSMailMsgId const &, class MFSMailEventObserver &)
+	?SetLocationL@CBaseMrInfoObject@@UAEXABVTDesC16@@@Z @ 191 NONAME ; void CBaseMrInfoObject::SetLocationL(class TDesC16 const &)
+	?RecurrentDaysofMonth@CBaseMrRecurrenceRule@@UBEABV?$RArray@UTRecurrentDaysofMonth@MRRecurrenceRule@@@@XZ @ 192 NONAME ; class RArray<struct MRRecurrenceRule::TRecurrentDaysofMonth> const & CBaseMrRecurrenceRule::RecurrentDaysofMonth(void) const
+	?ChildPartsL@CBasePlugin@@UAEXABVTFSMailMsgId@@000AAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 193 NONAME ; void CBasePlugin::ChildPartsL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RPointerArray<class CFSMailMessagePart> &)
+	?SetUidL@CBaseMrInfoObject@@QAEXABVTDesC16@@@Z @ 194 NONAME ; void CBaseMrInfoObject::SetUidL(class TDesC16 const &)
+	??1CBaseMrInfoProcessor@@UAE@XZ @ 195 NONAME ; CBaseMrInfoProcessor::~CBaseMrInfoProcessor(void)
+	??1CBaseMrAttendee@@UAE@XZ @ 196 NONAME ; CBaseMrAttendee::~CBaseMrAttendee(void)
+	?SubjectL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 197 NONAME ; class TDesC16 const & CBaseMrInfoObject::SubjectL(void) const
+	?UidL@CBaseMrInfoObject@@UBEABVTDesC16@@XZ @ 198 NONAME ; class TDesC16 const & CBaseMrInfoObject::UidL(void) const
+	?RefreshMailboxCacheL@CBasePlugin@@IAEAAVCMailboxInfo@@I@Z @ 199 NONAME ; class CMailboxInfo & CBasePlugin::RefreshMailboxCacheL(unsigned int)
+	?SystemEventNotifyL@CBasePlugin@@IAEXW4TMsgStoreSystemEvent@@@Z @ 200 NONAME ; void CBasePlugin::SystemEventNotifyL(enum TMsgStoreSystemEvent)
+	?SetResponseRequestedL@CBaseMrAttendee@@UAEXH@Z @ 201 NONAME ; void CBaseMrAttendee::SetResponseRequestedL(int)
+	?RecurrentInterval@CBaseMrRecurrenceRule@@UBEHXZ @ 202 NONAME ; int CBaseMrRecurrenceRule::RecurrentInterval(void) const
+	?SetMailboxName@CBasePlugin@@UAEXABVTFSMailMsgId@@ABVTDesC16@@@Z @ 203 NONAME ; void CBasePlugin::SetMailboxName(class TFSMailMsgId const &, class TDesC16 const &)
+	?GetMessagePartFileL@CBasePlugin@@UAEHABVTFSMailMsgId@@000AAVRFile@@@Z @ 204 NONAME ; int CBasePlugin::GetMessagePartFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class RFile &)
+	?RemoveObserver@CBasePlugin@@UAEXAAVMFSMailEventObserver@@@Z @ 205 NONAME ; void CBasePlugin::RemoveObserver(class MFSMailEventObserver &)
+	?DoCancelSearchL@CBasePlugin@@IAEXABVTFSMailMsgId@@@Z @ 206 NONAME ; void CBasePlugin::DoCancelSearchL(class TFSMailMsgId const &)
+	?NewChildPartFromFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@1AAVMFSMailRequestObserver@@H@Z @ 207 NONAME ; void CBasePlugin::NewChildPartFromFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &, class MFSMailRequestObserver &, int)
+	?AddObserverL@CBasePlugin@@UAEXAAVMFSMailEventObserver@@@Z @ 208 NONAME ; void CBasePlugin::AddObserverL(class MFSMailEventObserver &)
+	?Load2LC@CResourceLoader@@QAEPAVHBufC16@@HABVTDesC16@@@Z @ 209 NONAME ; class HBufC16 * CResourceLoader::Load2LC(int, class TDesC16 const &)
+	?GetMailBoxAddressL@CBasePlugin@@MAEPAVHBufC16@@VTFSMailMsgId@@@Z @ 210 NONAME ; class HBufC16 * CBasePlugin::GetMailBoxAddressL(class TFSMailMsgId)
+	?SystemEventNotify@CBasePlugin@@UAEXW4TMsgStoreSystemEvent@@@Z @ 211 NONAME ; void CBasePlugin::SystemEventNotify(enum TMsgStoreSystemEvent)
+	?GetPlugin@CDelayedOp@@IAEAAVCBasePlugin@@XZ @ 212 NONAME ; class CBasePlugin & CDelayedOp::GetPlugin(void)
+	?TranslateMsgStorePropsL@CBasePlugin@@MAEXABVTFSMailMsgId@@AAVCMsgStorePropertyContainer@@AAVCFSMailMessagePart@@W4TFSMailDetails@@@Z @ 213 NONAME ; void CBasePlugin::TranslateMsgStorePropsL(class TFSMailMsgId const &, class CMsgStorePropertyContainer &, class CFSMailMessagePart &, enum TFSMailDetails)
+	?SetAttendeeRoleL@CBaseMrAttendee@@UAEXW4TAttendeeRole@MMRAttendee@@@Z @ 214 NONAME ; void CBaseMrAttendee::SetAttendeeRoleL(enum MMRAttendee::TAttendeeRole)
+	?SendMessageL@CBasePlugin@@UAEXAAVCFSMailMessage@@@Z @ 215 NONAME ; void CBasePlugin::SendMessageL(class CFSMailMessage &)
+	??0CBasePlugin@@IAE@XZ @ 216 NONAME ; CBasePlugin::CBasePlugin(void)
+	?SetRecurrenceUntilL@CBaseMrRecurrenceRule@@UAEXVTTime@@@Z @ 217 NONAME ; void CBaseMrRecurrenceRule::SetRecurrenceUntilL(class TTime)
+	?CreateResourceReaderLC@CResourceLoader@@QBEPAVHBufC8@@AAVTResourceReader@@H@Z @ 218 NONAME ; class HBufC8 * CResourceLoader::CreateResourceReaderLC(class TResourceReader &, int) const
+	?RemoveAllPropertiesL@CBasePlugin@@KAXAAVCMsgStorePropertyContainer@@ABVTDesC8@@@Z @ 219 NONAME ; void CBasePlugin::RemoveAllPropertiesL(class CMsgStorePropertyContainer &, class TDesC8 const &)
+	?CopyMessagePartFileL@CBasePlugin@@UAEXABVTFSMailMsgId@@000ABVTDesC16@@@Z @ 220 NONAME ; void CBasePlugin::CopyMessagePartFileL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, class TDesC16 const &)
+	?StartTimeInUtcL@CBaseMrInfoObject@@UBE?AVTTime@@XZ @ 221 NONAME ; class TTime CBaseMrInfoObject::StartTimeInUtcL(void) const
+	?GetMessageByUidL@CBasePlugin@@UAEPAVCFSMailMessage@@ABVTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 222 NONAME ; class CFSMailMessage * CBasePlugin::GetMessageByUidL(class TFSMailMsgId const &, class TFSMailMsgId const &, class TFSMailMsgId const &, enum TFSMailDetails)
+	?SetCredentialsL@CBasePlugin@@UAEXABVTFSMailMsgId@@ABVTDesC16@@1@Z @ 223 NONAME ; void CBasePlugin::SetCredentialsL(class TFSMailMsgId const &, class TDesC16 const &, class TDesC16 const &)
 
--- a/emailservices/emailstore/base_plugin/eabi/basepluginu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/eabi/basepluginu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,314 +1,312 @@
 EXPORTS
 	_ZN10CDelayedOp10SetContextER11CBasePluginR18MDelayedOpsManager @ 1 NONAME
 	_ZN10CDelayedOp4RunLEv @ 2 NONAME
-	_ZN10CDelayedOp8DoCancelEv @ 3 NONAME
-	_ZN10CDelayedOp9GetPluginEv @ 4 NONAME
-	_ZN10CDelayedOpC2Ev @ 5 NONAME
-	_ZN10CDelayedOpD0Ev @ 6 NONAME
-	_ZN10CDelayedOpD1Ev @ 7 NONAME
-	_ZN10CDelayedOpD2Ev @ 8 NONAME
-	_ZN11CBasePlugin10ConstructLEv @ 9 NONAME
-	_ZN11CBasePlugin10GoOfflineLERK12TFSMailMsgId @ 10 NONAME
-	_ZN11CBasePlugin10ResetCacheEv @ 11 NONAME
-	_ZN11CBasePlugin11CancelSyncLERK12TFSMailMsgId @ 12 NONAME
-	_ZN11CBasePlugin11ChildPartsLERK12TFSMailMsgIdS2_S2_S2_R13RPointerArrayI18CFSMailMessagePartE @ 13 NONAME
-	_ZN11CBasePlugin11GetPluginIdEv @ 14 NONAME
-	_ZN11CBasePlugin11RefreshNowLERK12TFSMailMsgIdR22MFSMailRequestObserverii @ 15 NONAME
-	_ZN11CBasePlugin11SetContentLERK7TDesC16RK12TFSMailMsgIdS5_S5_S5_ @ 16 NONAME
-	_ZN11CBasePlugin12AddObserverLER20MFSMailEventObserver @ 17 NONAME
-	_ZN11CBasePlugin12CancelSearchERK12TFSMailMsgId @ 18 NONAME
-	_ZN11CBasePlugin12GetBodyPartLER16CMsgStoreMessageRK7TDesC16 @ 19 NONAME
-	_ZN11CBasePlugin12GetMessagesLERK12TFSMailMsgIdS2_RK6RArrayIS0_ER13RPointerArrayI14CFSMailMessageE14TFSMailDetails @ 20 NONAME
-	_ZN11CBasePlugin12ListFoldersLERK12TFSMailMsgIdR13RPointerArrayI13CFSMailFolderE @ 21 NONAME
-	_ZN11CBasePlugin12ListFoldersLERK12TFSMailMsgIdS2_R13RPointerArrayI13CFSMailFolderE @ 22 NONAME
-	_ZN11CBasePlugin12MessagePartLERK12TFSMailMsgIdS2_S2_S2_ @ 23 NONAME
-	_ZN11CBasePlugin12NotifyEventLEjjj12TFSMailEventj @ 24 NONAME
-	_ZN11CBasePlugin12SendMessageLER14CFSMailMessage @ 25 NONAME
-	_ZN11CBasePlugin12SendMessageLER16CMsgStoreMailBoxR16CMsgStoreMessageRK5TTime @ 26 NONAME
-	_ZN11CBasePlugin13AuthenticateLER22MFSMailRequestObserveri @ 27 NONAME
-	_ZN11CBasePlugin13CopyMessagesLERK12TFSMailMsgIdRK6RArrayIS0_ERS4_S2_S2_ @ 28 NONAME
-	_ZN11CBasePlugin13CreateFolderLERK12TFSMailMsgIdS2_RK7TDesC16i @ 29 NONAME
-	_ZN11CBasePlugin13GetCachedMsgLEjj @ 30 NONAME
-	_ZN11CBasePlugin13ListMessagesLERK12TFSMailMsgIdS2_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 31 NONAME
-	_ZN11CBasePlugin13MoveMessagesLERK12TFSMailMsgIdRK6RArrayIS0_ES2_S2_ @ 32 NONAME
-	_ZN11CBasePlugin13NewChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_RK7TDesC16 @ 33 NONAME
-	_ZN11CBasePlugin13StoreMessageLERK12TFSMailMsgIdR14CFSMailMessage @ 34 NONAME
-	_ZN11CBasePlugin14DoListFoldersLE12TFSMailMsgIdjiR13RPointerArrayI13CFSMailFolderE @ 35 NONAME
-	_ZN11CBasePlugin14FetchMessagesLERK12TFSMailMsgIdS2_RK6RArrayIS0_E14TFSMailDetailsR22MFSMailRequestObserveri @ 36 NONAME
-	_ZN11CBasePlugin14GetBrandingIdLERK12TFSMailMsgId @ 37 NONAME
-	_ZN11CBasePlugin14GetCachedBodyLEj @ 38 NONAME
-	_ZN11CBasePlugin14ListMailBoxesLER6RArrayI12TFSMailMsgIdE @ 39 NONAME
-	_ZN11CBasePlugin14RemoveObserverER20MFSMailEventObserver @ 40 NONAME
-	_ZN11CBasePlugin14ResetBodyCacheEv @ 41 NONAME
-	_ZN11CBasePlugin14SetMailboxNameERK12TFSMailMsgIdRK7TDesC16 @ 42 NONAME
-	_ZN11CBasePlugin14StoreMessagesLERK12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserveri @ 43 NONAME
-	_ZN11CBasePlugin15DoCancelSearchLERK12TFSMailMsgId @ 44 NONAME
-	_ZN11CBasePlugin15GetFolderByUidLERK12TFSMailMsgIdS2_ @ 45 NONAME
-	_ZN11CBasePlugin15GetMailboxInfoLEj @ 46 NONAME
-	_ZN11CBasePlugin15SetCredentialsLERK12TFSMailMsgIdRK7TDesC16S5_ @ 47 NONAME
-	_ZN11CBasePlugin16CurrentSyncStateERK12TFSMailMsgId @ 48 NONAME
-	_ZN11CBasePlugin16GetMailBoxByUidLERK12TFSMailMsgId @ 49 NONAME
-	_ZN11CBasePlugin16GetMailBoxStatusERK12TFSMailMsgId @ 50 NONAME
-	_ZN11CBasePlugin16GetMessageByUidLERK12TFSMailMsgIdS2_S2_14TFSMailDetails @ 51 NONAME
-	_ZN11CBasePlugin16RemoveChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_ @ 52 NONAME
-	_ZN11CBasePlugin17FindFetchRequestLEjjjjRNS_17TOngoingFetchInfoE @ 53 NONAME
-	_ZN11CBasePlugin17StoreMessagePartLERK12TFSMailMsgIdS2_S2_R18CFSMailMessagePart @ 54 NONAME
-	_ZN11CBasePlugin17SystemEventNotifyE20TMsgStoreSystemEvent @ 55 NONAME
-	_ZN11CBasePlugin18AccountEventNotifyE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 56 NONAME
-	_ZN11CBasePlugin18DeleteFetchRequestERNS_17TOngoingFetchInfoE @ 57 NONAME
-	_ZN11CBasePlugin18DeleteFolderByUidLERK12TFSMailMsgIdS2_ @ 58 NONAME
-	_ZN11CBasePlugin18FetchEmailAddressLER26CMsgStorePropertyContainerj @ 59 NONAME
-	_ZN11CBasePlugin18FetchMessagePartsLERK12TFSMailMsgIdS2_S2_RK6RArrayIS0_ER22MFSMailRequestObserverij @ 60 NONAME
-	_ZN11CBasePlugin18GetLastSyncStatusLERK12TFSMailMsgId @ 61 NONAME
-	_ZN11CBasePlugin18ModificationNotifyEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 62 NONAME
-	_ZN11CBasePlugin18NotifyGlobalEventLE12TFSMailEvent12TFSMailMsgIdPvS2_S2_ @ 63 NONAME
-	_ZN11CBasePlugin18RemovePartContentLERK12TFSMailMsgIdS2_S2_RK6RArrayIS0_E @ 64 NONAME
-	_ZN11CBasePlugin18StoreMessagePartsLER13RPointerArrayI18CFSMailMessagePartER22MFSMailRequestObserveri @ 65 NONAME
-	_ZN11CBasePlugin18SystemEventNotifyLE20TMsgStoreSystemEvent @ 66 NONAME
-	_ZN11CBasePlugin19AccountEventNotifyLE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 67 NONAME
-	_ZN11CBasePlugin19CreateReplyMessageLERK12TFSMailMsgIdS2_iRK7TDesC16 @ 68 NONAME
-	_ZN11CBasePlugin19DeleteMailBoxByUidLERK12TFSMailMsgIdR22MFSMailRequestObserveri @ 69 NONAME
-	_ZN11CBasePlugin19GetContentToBufferLERK12TFSMailMsgIdS2_S2_S2_R6TDes16j @ 70 NONAME
-	_ZN11CBasePlugin19GetMessagePartFileLERK12TFSMailMsgIdS2_S2_S2_R5RFile @ 71 NONAME
-	_ZN11CBasePlugin19ModificationNotifyLEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 72 NONAME
-	_ZN11CBasePlugin19NotifyMailboxEventLE12TFSMailEvent12TFSMailMsgIdPvS2_S2_ @ 73 NONAME
-	_ZN11CBasePlugin19TranslateEmailFwMrLER13MMRInfoObjectR26CMsgStorePropertyContainer @ 74 NONAME
-	_ZN11CBasePlugin20CopyMessagePartFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16 @ 75 NONAME
-	_ZN11CBasePlugin20CreateMessageToSendLERK12TFSMailMsgId @ 76 NONAME
-	_ZN11CBasePlugin20CreateMessageToSendLERK12TFSMailMsgIdR22MFSMailRequestObserveri @ 77 NONAME
-	_ZN11CBasePlugin20DeleteMessagesByUidLERK12TFSMailMsgIdS2_RK6RArrayIS0_E @ 78 NONAME
-	_ZN11CBasePlugin20GetAccountForMsgBoxLERK12TFSMailMsgId @ 79 NONAME
-	_ZN11CBasePlugin20GetDelayedOpsManagerEv @ 80 NONAME
-	_ZN11CBasePlugin20GetStandardFolderIdLERK12TFSMailMsgId13TFSFolderType @ 81 NONAME
-	_ZN11CBasePlugin20HandleMailboxDeleteLERK12TFSMailMsgId @ 82 NONAME
-	_ZN11CBasePlugin20RefreshMailboxCacheLEj @ 83 NONAME
-	_ZN11CBasePlugin20RemoveAllPropertiesLER26CMsgStorePropertyContainerRK6TDesC8 @ 84 NONAME
-	_ZN11CBasePlugin20ReportRequestStatusLEjjjji @ 85 NONAME
-	_ZN11CBasePlugin20TranslateMsgStoreMrLERK12TFSMailMsgIdR26CMsgStorePropertyContainerS4_R18CFSMailMessagePart @ 86 NONAME
-	_ZN11CBasePlugin20WizardDataAvailableLEv @ 87 NONAME
-	_ZN11CBasePlugin21CreateForwardMessageLERK12TFSMailMsgIdS2_RK7TDesC16 @ 88 NONAME
-	_ZN11CBasePlugin21CreateMrReplyMessageLERK12TFSMailMsgIdR13MMRInfoObjectS2_ @ 89 NONAME
-	_ZN11CBasePlugin21GetCachedMsgChildrenLEv @ 90 NONAME
-	_ZN11CBasePlugin21MailboxHasCapabilityLE22TFSMailBoxCapabilities12TFSMailMsgId @ 91 NONAME
-	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16R5RFile @ 92 NONAME
-	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_ @ 93 NONAME
-	_ZN11CBasePlugin22ClearSearchResultCacheERK12TFSMailMsgId @ 94 NONAME
-	_ZN11CBasePlugin22GetCachedBodyChildrenLEv @ 95 NONAME
-	_ZN11CBasePlugin22GetMailboxDisplayNameLEjR6RBuf16 @ 96 NONAME
-	_ZN11CBasePlugin23CopyMessageAsChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_RK14CFSMailMessage @ 97 NONAME
-	_ZN11CBasePlugin23SetPartContentFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16 @ 98 NONAME
-	_ZN11CBasePlugin23SubscribeMailboxEventsLERK12TFSMailMsgIdR20MFSMailEventObserver @ 99 NONAME
-	_ZN11CBasePlugin23TranslateMsgStorePropsLERK12TFSMailMsgIdR26CMsgStorePropertyContainerR18CFSMailMessagePart14TFSMailDetails @ 100 NONAME
-	_ZN11CBasePlugin24HandleRemovePartContentLER16CMsgStoreMessageR20CMsgStoreMessagePart @ 101 NONAME
-	_ZN11CBasePlugin24TranslateEmailFwMessageLER18CFSMailMessagePartR20CMsgStoreMessageParti @ 102 NONAME
-	_ZN11CBasePlugin24UnsubscribeMailboxEventsERK12TFSMailMsgIdR20MFSMailEventObserver @ 103 NONAME
-	_ZN11CBasePlugin25DeleteFetchRequestForPartERNS_17TOngoingFetchInfoE @ 104 NONAME
-	_ZN11CBasePlugin25DoClearSearchResultCacheLERK12TFSMailMsgId @ 105 NONAME
-	_ZN11CBasePlugin25SetReplyOrForwardToFieldLER16CMsgStoreMessage @ 106 NONAME
-	_ZN11CBasePlugin25TranslateEmailFwAttendeeLER12MMROrganizerR16RMsgStoreAddress @ 107 NONAME
-	_ZN11CBasePlugin25TranslateEmailFwDayOfWeekEN16MRRecurrenceRule15TMRRecurrentDayERm @ 108 NONAME
-	_ZN11CBasePlugin25UnregisterRequestObserverEi @ 109 NONAME
-	_ZN11CBasePlugin25UnsubscribeMailboxEventsLERK12TFSMailMsgIdR20MFSMailEventObserver @ 110 NONAME
-	_ZN11CBasePlugin26CreateForwardReplyMessageLERK12TFSMailMsgIdS2_iRK7TDesC16ii @ 111 NONAME
-	_ZN11CBasePlugin26InvalidateCacheIfNecessaryEjjj @ 112 NONAME
-	_ZN11CBasePlugin26TranslateMsgStoreDayOfWeekEmR14TDayOfWeekFtor @ 113 NONAME
-	_ZN11CBasePlugin27TranslateEmailFwRecipientsLER20CMsgStoreMessagePartRK6TDesC8R13RPointerArrayI14CFSMailAddressE @ 114 NONAME
-	_ZN11CBasePlugin32RefreshCachedMailBoxDisplayNameLERiRKj @ 115 NONAME
-	_ZN11CBasePlugin33NewChildPartFromFilePathOrHandleLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_iR5RFile @ 116 NONAME
-	_ZN11CBasePlugin4NewLEv @ 117 NONAME
-	_ZN11CBasePlugin5NewLCEv @ 118 NONAME
-	_ZN11CBasePlugin7CancelLEi @ 119 NONAME
-	_ZN11CBasePlugin7SearchLERK12TFSMailMsgIdRK6RArrayIS0_ERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 120 NONAME
-	_ZN11CBasePlugin7StatusLEi @ 121 NONAME
-	_ZN11CBasePlugin8GetMrusLERK12TFSMailMsgId @ 122 NONAME
-	_ZN11CBasePlugin8SetMrusLERK12TFSMailMsgIdP12MDesC16Array @ 123 NONAME
-	_ZN11CBasePlugin9GoOnlineLERK12TFSMailMsgId @ 124 NONAME
-	_ZN11CBasePluginC1Ev @ 125 NONAME
-	_ZN11CBasePluginC2Ev @ 126 NONAME
-	_ZN11CBasePluginD0Ev @ 127 NONAME
-	_ZN11CBasePluginD1Ev @ 128 NONAME
-	_ZN11CBasePluginD2Ev @ 129 NONAME
-	_ZN15CBaseMrAttendee11SetAddressLERK7TDesC16 @ 130 NONAME
-	_ZN15CBaseMrAttendee14SetCommonNameLERK7TDesC16 @ 131 NONAME
-	_ZN15CBaseMrAttendee16SetAttendeeRoleLEN11MMRAttendee13TAttendeeRoleE @ 132 NONAME
-	_ZN15CBaseMrAttendee18SetAttendeeStatusLERN11MMRAttendee15TAttendeeStatusE @ 133 NONAME
-	_ZN15CBaseMrAttendee21SetResponseRequestedLEi @ 134 NONAME
-	_ZN15CBaseMrAttendee4NewLERK11MMRAttendee @ 135 NONAME
-	_ZN15CBaseMrAttendee4NewLERK12MMROrganizer @ 136 NONAME
-	_ZN15CBaseMrAttendee4NewLEv @ 137 NONAME
-	_ZN15CBaseMrAttendeeD0Ev @ 138 NONAME
-	_ZN15CBaseMrAttendeeD1Ev @ 139 NONAME
-	_ZN15CBaseMrAttendeeD2Ev @ 140 NONAME
-	_ZN15CResourceLoader2FsEv @ 141 NONAME
-	_ZN15CResourceLoader4NewLERK7TDesC16 @ 142 NONAME
-	_ZN15CResourceLoader6Load2LEi @ 143 NONAME
-	_ZN15CResourceLoader6Load2LEiRK7TDesC16 @ 144 NONAME
-	_ZN15CResourceLoader6Load2LEii @ 145 NONAME
-	_ZN15CResourceLoader6LoadLCEi @ 146 NONAME
-	_ZN15CResourceLoader7Load2LCEi @ 147 NONAME
-	_ZN15CResourceLoader7Load2LCEiRK7TDesC16 @ 148 NONAME
-	_ZN15CResourceLoader7Load2LCEii @ 149 NONAME
-	_ZN15CResourceLoaderD0Ev @ 150 NONAME
-	_ZN15CResourceLoaderD1Ev @ 151 NONAME
-	_ZN15CResourceLoaderD2Ev @ 152 NONAME
-	_ZN17CBaseMrInfoObject10AttendeesLEv @ 153 NONAME
-	_ZN17CBaseMrInfoObject10ExtensionLE4TUid @ 154 NONAME
-	_ZN17CBaseMrInfoObject11SetSubjectLERK7TDesC16 @ 155 NONAME
-	_ZN17CBaseMrInfoObject12AddAttendeeLEP11MMRAttendee @ 156 NONAME
-	_ZN17CBaseMrInfoObject12MROrganizerLEv @ 157 NONAME
-	_ZN17CBaseMrInfoObject12SetLocationLERK7TDesC16 @ 158 NONAME
-	_ZN17CBaseMrInfoObject12SetPriorityLEj @ 159 NONAME
-	_ZN17CBaseMrInfoObject14SetAlarmInUtcLE5TTime @ 160 NONAME
-	_ZN17CBaseMrInfoObject14SetMRResponseLEN13MMRInfoObject9TResponseE @ 161 NONAME
-	_ZN17CBaseMrInfoObject15AddAttachmentsLEP13MMRAttachment @ 162 NONAME
-	_ZN17CBaseMrInfoObject15SetDescriptionLERK7TDesC16 @ 163 NONAME
-	_ZN17CBaseMrInfoObject16SetEndTimeInUtcLE5TTime @ 164 NONAME
-	_ZN17CBaseMrInfoObject18SetMRRecurrenceIdLE5TTime @ 165 NONAME
-	_ZN17CBaseMrInfoObject18SetRecurrenceRuleLERK16MRRecurrenceRule @ 166 NONAME
-	_ZN17CBaseMrInfoObject18SetStartTimeInUtcLE5TTime @ 167 NONAME
-	_ZN17CBaseMrInfoObject19SetMRSequenceNumberEi @ 168 NONAME
-	_ZN17CBaseMrInfoObject21SetCreationTimeInUtcLE5TTime @ 169 NONAME
-	_ZN17CBaseMrInfoObject23AddRecurrenceExceptionLEP13MMRInfoObject @ 170 NONAME
-	_ZN17CBaseMrInfoObject4NewLER13MMRInfoObject @ 171 NONAME
-	_ZN17CBaseMrInfoObject4NewLEv @ 172 NONAME
-	_ZN17CBaseMrInfoObject7SetUidLEP7HBufC16 @ 173 NONAME
-	_ZN17CBaseMrInfoObject7SetUidLERK7TDesC16 @ 174 NONAME
-	_ZN17CBaseMrInfoObject9SetMethodEN13MMRInfoObject9TMRMethodE @ 175 NONAME
-	_ZN17CBaseMrInfoObjectD0Ev @ 176 NONAME
-	_ZN17CBaseMrInfoObjectD1Ev @ 177 NONAME
-	_ZN17CBaseMrInfoObjectD2Ev @ 178 NONAME
-	_ZN20CBaseMrInfoProcessor22ReplyToMeetingRequestLERK12TFSMailMsgIdS2_R13MMRInfoObjectRN16MMRInfoProcessor19TMRInfoResponseModeERK7TDesC16 @ 179 NONAME
-	_ZN20CBaseMrInfoProcessor4NewLER11CBasePlugin @ 180 NONAME
-	_ZN20CBaseMrInfoProcessorD0Ev @ 181 NONAME
-	_ZN20CBaseMrInfoProcessorD1Ev @ 182 NONAME
-	_ZN20CBaseMrInfoProcessorD2Ev @ 183 NONAME
-	_ZN21CBaseMrRecurrenceRule18SetRecurrenceTypeLEN16MRRecurrenceRule17TMRRecurrenceTypeE @ 184 NONAME
-	_ZN21CBaseMrRecurrenceRule18SetRecurrentCountLEi @ 185 NONAME
-	_ZN21CBaseMrRecurrenceRule19SetRecurrenceUntilLE5TTime @ 186 NONAME
-	_ZN21CBaseMrRecurrenceRule19SetRecurrentMonthsLER6RArrayIN16MRRecurrenceRule18TMRRecurrenceMonthEE @ 187 NONAME
-	_ZN21CBaseMrRecurrenceRule20SetRecurrentIntervalEi @ 188 NONAME
-	_ZN21CBaseMrRecurrenceRule21SetRecurrentWeekDaysLER6RArrayIN16MRRecurrenceRule15TMRRecurrentDayEE @ 189 NONAME
-	_ZN21CBaseMrRecurrenceRule22SetRecurrentMonthDaysLER6RArrayIiE @ 190 NONAME
-	_ZN21CBaseMrRecurrenceRule23SetRecurrenceStartTimeLE5TTime @ 191 NONAME
-	_ZN21CBaseMrRecurrenceRule24SetRecurrentDaysofMonthLER6RArrayIN16MRRecurrenceRule21TRecurrentDaysofMonthEE @ 192 NONAME
-	_ZN21CBaseMrRecurrenceRule4NewLERK16MRRecurrenceRule @ 193 NONAME
-	_ZN21CBaseMrRecurrenceRule4NewLEv @ 194 NONAME
-	_ZN21CBaseMrRecurrenceRuleD0Ev @ 195 NONAME
-	_ZN21CBaseMrRecurrenceRuleD1Ev @ 196 NONAME
-	_ZN21CBaseMrRecurrenceRuleD2Ev @ 197 NONAME
-	_ZNK11CBasePlugin16CalendarFileNameEv @ 198 NONAME
-	_ZNK15CBaseMrAttendee10CommonNameEv @ 199 NONAME
-	_ZNK15CBaseMrAttendee12AttendeeRoleEv @ 200 NONAME
-	_ZNK15CBaseMrAttendee14AttendeeStatusEv @ 201 NONAME
-	_ZNK15CBaseMrAttendee17ResponseRequestedEv @ 202 NONAME
-	_ZNK15CBaseMrAttendee7AddressEv @ 203 NONAME
-	_ZNK15CResourceLoader22CreateResourceReaderLCER15TResourceReaderi @ 204 NONAME
-	_ZNK17CBaseMrInfoObject10MRResponseEv @ 205 NONAME
-	_ZNK17CBaseMrInfoObject11AlarmInUtcLEv @ 206 NONAME
-	_ZNK17CBaseMrInfoObject12AttachmentsLEv @ 207 NONAME
-	_ZNK17CBaseMrInfoObject12DescriptionLEv @ 208 NONAME
-	_ZNK17CBaseMrInfoObject13EndTimeInUtcLEv @ 209 NONAME
-	_ZNK17CBaseMrInfoObject14MRRecurrenceIdEv @ 210 NONAME
-	_ZNK17CBaseMrInfoObject15RecurrenceRuleLEv @ 211 NONAME
-	_ZNK17CBaseMrInfoObject15StartTimeInUtcLEv @ 212 NONAME
-	_ZNK17CBaseMrInfoObject15SupportedFieldsER6RArrayIN13MMRInfoObject14TESMRInfoFieldEE @ 213 NONAME
-	_ZNK17CBaseMrInfoObject17MRSequenceNumberLEv @ 214 NONAME
-	_ZNK17CBaseMrInfoObject18CreationTimeInUtcLEv @ 215 NONAME
-	_ZNK17CBaseMrInfoObject21RecurrenceExceptionsLEv @ 216 NONAME
-	_ZNK17CBaseMrInfoObject4UidLEv @ 217 NONAME
-	_ZNK17CBaseMrInfoObject8SubjectLEv @ 218 NONAME
-	_ZNK17CBaseMrInfoObject9LocationLEv @ 219 NONAME
-	_ZNK17CBaseMrInfoObject9MRMethodLEv @ 220 NONAME
-	_ZNK17CBaseMrInfoObject9PriorityLEv @ 221 NONAME
-	_ZNK21CBaseMrRecurrenceRule14RecurrentCountEv @ 222 NONAME
-	_ZNK21CBaseMrRecurrenceRule14RecurrentUntilEv @ 223 NONAME
-	_ZNK21CBaseMrRecurrenceRule15RecurrentMonthsEv @ 224 NONAME
-	_ZNK21CBaseMrRecurrenceRule17RecurrentIntervalEv @ 225 NONAME
-	_ZNK21CBaseMrRecurrenceRule17RecurrentWeekDaysEv @ 226 NONAME
-	_ZNK21CBaseMrRecurrenceRule18RecurrentMonthDaysEv @ 227 NONAME
-	_ZNK21CBaseMrRecurrenceRule19RecurrenceStartTimeEv @ 228 NONAME
-	_ZNK21CBaseMrRecurrenceRule20RecurrentDaysofMonthEv @ 229 NONAME
-	_ZNK21CBaseMrRecurrenceRule4TypeEv @ 230 NONAME
-	_ZTI10CDelayedOp @ 231 NONAME
-	_ZTI11CBasePlugin @ 232 NONAME
-	_ZTV10CDelayedOp @ 233 NONAME
-	_ZTV11CBasePlugin @ 234 NONAME
-	_ZThn32_N11CBasePlugin17SystemEventNotifyE20TMsgStoreSystemEvent @ 235 NONAME
-	_ZThn32_N11CBasePlugin18AccountEventNotifyE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 236 NONAME
-	_ZThn36_N11CBasePlugin18ModificationNotifyEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 237 NONAME
-	_ZThn4_N15CBaseMrAttendee11SetAddressLERK7TDesC16 @ 238 NONAME
-	_ZThn4_N15CBaseMrAttendee14SetCommonNameLERK7TDesC16 @ 239 NONAME
-	_ZThn4_N15CBaseMrAttendee16SetAttendeeRoleLEN11MMRAttendee13TAttendeeRoleE @ 240 NONAME
-	_ZThn4_N15CBaseMrAttendee18SetAttendeeStatusLERN11MMRAttendee15TAttendeeStatusE @ 241 NONAME
-	_ZThn4_N15CBaseMrAttendee21SetResponseRequestedLEi @ 242 NONAME
-	_ZThn4_N15CBaseMrAttendeeD0Ev @ 243 NONAME
-	_ZThn4_N15CBaseMrAttendeeD1Ev @ 244 NONAME
-	_ZThn4_N17CBaseMrInfoObject10AttendeesLEv @ 245 NONAME
-	_ZThn4_N17CBaseMrInfoObject10ExtensionLE4TUid @ 246 NONAME
-	_ZThn4_N17CBaseMrInfoObject11SetSubjectLERK7TDesC16 @ 247 NONAME
-	_ZThn4_N17CBaseMrInfoObject12AddAttendeeLEP11MMRAttendee @ 248 NONAME
-	_ZThn4_N17CBaseMrInfoObject12MROrganizerLEv @ 249 NONAME
-	_ZThn4_N17CBaseMrInfoObject12SetLocationLERK7TDesC16 @ 250 NONAME
-	_ZThn4_N17CBaseMrInfoObject12SetPriorityLEj @ 251 NONAME
-	_ZThn4_N17CBaseMrInfoObject14SetAlarmInUtcLE5TTime @ 252 NONAME
-	_ZThn4_N17CBaseMrInfoObject14SetMRResponseLEN13MMRInfoObject9TResponseE @ 253 NONAME
-	_ZThn4_N17CBaseMrInfoObject15AddAttachmentsLEP13MMRAttachment @ 254 NONAME
-	_ZThn4_N17CBaseMrInfoObject15SetDescriptionLERK7TDesC16 @ 255 NONAME
-	_ZThn4_N17CBaseMrInfoObject16SetEndTimeInUtcLE5TTime @ 256 NONAME
-	_ZThn4_N17CBaseMrInfoObject18SetMRRecurrenceIdLE5TTime @ 257 NONAME
-	_ZThn4_N17CBaseMrInfoObject18SetRecurrenceRuleLERK16MRRecurrenceRule @ 258 NONAME
-	_ZThn4_N17CBaseMrInfoObject18SetStartTimeInUtcLE5TTime @ 259 NONAME
-	_ZThn4_N17CBaseMrInfoObject21SetCreationTimeInUtcLE5TTime @ 260 NONAME
-	_ZThn4_N17CBaseMrInfoObject23AddRecurrenceExceptionLEP13MMRInfoObject @ 261 NONAME
-	_ZThn4_N17CBaseMrInfoObjectD0Ev @ 262 NONAME
-	_ZThn4_N17CBaseMrInfoObjectD1Ev @ 263 NONAME
-	_ZThn4_N20CBaseMrInfoProcessor22ReplyToMeetingRequestLERK12TFSMailMsgIdS2_R13MMRInfoObjectRN16MMRInfoProcessor19TMRInfoResponseModeERK7TDesC16 @ 264 NONAME
-	_ZThn4_N20CBaseMrInfoProcessorD0Ev @ 265 NONAME
-	_ZThn4_N20CBaseMrInfoProcessorD1Ev @ 266 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule18SetRecurrenceTypeLEN16MRRecurrenceRule17TMRRecurrenceTypeE @ 267 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule18SetRecurrentCountLEi @ 268 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule19SetRecurrenceUntilLE5TTime @ 269 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule19SetRecurrentMonthsLER6RArrayIN16MRRecurrenceRule18TMRRecurrenceMonthEE @ 270 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule20SetRecurrentIntervalEi @ 271 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule21SetRecurrentWeekDaysLER6RArrayIN16MRRecurrenceRule15TMRRecurrentDayEE @ 272 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule22SetRecurrentMonthDaysLER6RArrayIiE @ 273 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule23SetRecurrenceStartTimeLE5TTime @ 274 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRule24SetRecurrentDaysofMonthLER6RArrayIN16MRRecurrenceRule21TRecurrentDaysofMonthEE @ 275 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRuleD0Ev @ 276 NONAME
-	_ZThn4_N21CBaseMrRecurrenceRuleD1Ev @ 277 NONAME
-	_ZThn4_NK15CBaseMrAttendee10CommonNameEv @ 278 NONAME
-	_ZThn4_NK15CBaseMrAttendee12AttendeeRoleEv @ 279 NONAME
-	_ZThn4_NK15CBaseMrAttendee14AttendeeStatusEv @ 280 NONAME
-	_ZThn4_NK15CBaseMrAttendee17ResponseRequestedEv @ 281 NONAME
-	_ZThn4_NK15CBaseMrAttendee7AddressEv @ 282 NONAME
-	_ZThn4_NK17CBaseMrInfoObject10MRResponseEv @ 283 NONAME
-	_ZThn4_NK17CBaseMrInfoObject11AlarmInUtcLEv @ 284 NONAME
-	_ZThn4_NK17CBaseMrInfoObject12AttachmentsLEv @ 285 NONAME
-	_ZThn4_NK17CBaseMrInfoObject12DescriptionLEv @ 286 NONAME
-	_ZThn4_NK17CBaseMrInfoObject13EndTimeInUtcLEv @ 287 NONAME
-	_ZThn4_NK17CBaseMrInfoObject14MRRecurrenceIdEv @ 288 NONAME
-	_ZThn4_NK17CBaseMrInfoObject15RecurrenceRuleLEv @ 289 NONAME
-	_ZThn4_NK17CBaseMrInfoObject15StartTimeInUtcLEv @ 290 NONAME
-	_ZThn4_NK17CBaseMrInfoObject15SupportedFieldsER6RArrayIN13MMRInfoObject14TESMRInfoFieldEE @ 291 NONAME
-	_ZThn4_NK17CBaseMrInfoObject17MRSequenceNumberLEv @ 292 NONAME
-	_ZThn4_NK17CBaseMrInfoObject18CreationTimeInUtcLEv @ 293 NONAME
-	_ZThn4_NK17CBaseMrInfoObject21RecurrenceExceptionsLEv @ 294 NONAME
-	_ZThn4_NK17CBaseMrInfoObject4UidLEv @ 295 NONAME
-	_ZThn4_NK17CBaseMrInfoObject8SubjectLEv @ 296 NONAME
-	_ZThn4_NK17CBaseMrInfoObject9LocationLEv @ 297 NONAME
-	_ZThn4_NK17CBaseMrInfoObject9MRMethodLEv @ 298 NONAME
-	_ZThn4_NK17CBaseMrInfoObject9PriorityLEv @ 299 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule14RecurrentCountEv @ 300 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule14RecurrentUntilEv @ 301 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule15RecurrentMonthsEv @ 302 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule17RecurrentIntervalEv @ 303 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule17RecurrentWeekDaysEv @ 304 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule18RecurrentMonthDaysEv @ 305 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule19RecurrenceStartTimeEv @ 306 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule20RecurrentDaysofMonthEv @ 307 NONAME
-	_ZThn4_NK21CBaseMrRecurrenceRule4TypeEv @ 308 NONAME
-	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_R22MFSMailRequestObserveri @ 309 NONAME
-	_ZN11CBasePlugin16RemoveChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_R22MFSMailRequestObserveri @ 310 NONAME
-	_ZN10CDelayedOp7StartOpEv @ 311 NONAME
-	_ZN11CBasePlugin23DeleteDelayedOpsManagerEv @ 312 NONAME
+	_ZN10CDelayedOp7StartOpEv @ 3 NONAME
+	_ZN10CDelayedOp8DoCancelEv @ 4 NONAME
+	_ZN10CDelayedOp9GetPluginEv @ 5 NONAME
+	_ZN10CDelayedOpC2Ev @ 6 NONAME
+	_ZN10CDelayedOpD0Ev @ 7 NONAME
+	_ZN10CDelayedOpD1Ev @ 8 NONAME
+	_ZN10CDelayedOpD2Ev @ 9 NONAME
+	_ZN11CBasePlugin10ConstructLEv @ 10 NONAME
+	_ZN11CBasePlugin10GoOfflineLERK12TFSMailMsgId @ 11 NONAME
+	_ZN11CBasePlugin10ResetCacheEv @ 12 NONAME
+	_ZN11CBasePlugin11CancelSyncLERK12TFSMailMsgId @ 13 NONAME
+	_ZN11CBasePlugin11ChildPartsLERK12TFSMailMsgIdS2_S2_S2_R13RPointerArrayI18CFSMailMessagePartE @ 14 NONAME
+	_ZN11CBasePlugin11GetPluginIdEv @ 15 NONAME
+	_ZN11CBasePlugin11RefreshNowLERK12TFSMailMsgIdR22MFSMailRequestObserverii @ 16 NONAME
+	_ZN11CBasePlugin11SetContentLERK7TDesC16RK12TFSMailMsgIdS5_S5_S5_ @ 17 NONAME
+	_ZN11CBasePlugin12AddObserverLER20MFSMailEventObserver @ 18 NONAME
+	_ZN11CBasePlugin12CancelSearchERK12TFSMailMsgId @ 19 NONAME
+	_ZN11CBasePlugin12GetBodyPartLER16CMsgStoreMessageRK7TDesC16 @ 20 NONAME
+	_ZN11CBasePlugin12GetMessagesLERK12TFSMailMsgIdS2_RK6RArrayIS0_ER13RPointerArrayI14CFSMailMessageE14TFSMailDetails @ 21 NONAME
+	_ZN11CBasePlugin12ListFoldersLERK12TFSMailMsgIdR13RPointerArrayI13CFSMailFolderE @ 22 NONAME
+	_ZN11CBasePlugin12ListFoldersLERK12TFSMailMsgIdS2_R13RPointerArrayI13CFSMailFolderE @ 23 NONAME
+	_ZN11CBasePlugin12MessagePartLERK12TFSMailMsgIdS2_S2_S2_ @ 24 NONAME
+	_ZN11CBasePlugin12NotifyEventLEjjj12TFSMailEventj @ 25 NONAME
+	_ZN11CBasePlugin12SendMessageLER14CFSMailMessage @ 26 NONAME
+	_ZN11CBasePlugin12SendMessageLER16CMsgStoreMailBoxR16CMsgStoreMessageRK5TTime @ 27 NONAME
+	_ZN11CBasePlugin13AuthenticateLER22MFSMailRequestObserveri @ 28 NONAME
+	_ZN11CBasePlugin13CopyMessagesLERK12TFSMailMsgIdRK6RArrayIS0_ERS4_S2_S2_ @ 29 NONAME
+	_ZN11CBasePlugin13CreateFolderLERK12TFSMailMsgIdS2_RK7TDesC16i @ 30 NONAME
+	_ZN11CBasePlugin13GetCachedMsgLEjj @ 31 NONAME
+	_ZN11CBasePlugin13ListMessagesLERK12TFSMailMsgIdS2_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 32 NONAME
+	_ZN11CBasePlugin13MoveMessagesLERK12TFSMailMsgIdRK6RArrayIS0_ES2_S2_ @ 33 NONAME
+	_ZN11CBasePlugin13NewChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_RK7TDesC16 @ 34 NONAME
+	_ZN11CBasePlugin13StoreMessageLERK12TFSMailMsgIdR14CFSMailMessage @ 35 NONAME
+	_ZN11CBasePlugin14DoListFoldersLE12TFSMailMsgIdjiR13RPointerArrayI13CFSMailFolderE @ 36 NONAME
+	_ZN11CBasePlugin14FetchMessagesLERK12TFSMailMsgIdS2_RK6RArrayIS0_E14TFSMailDetailsR22MFSMailRequestObserveri @ 37 NONAME
+	_ZN11CBasePlugin14GetBrandingIdLERK12TFSMailMsgId @ 38 NONAME
+	_ZN11CBasePlugin14GetCachedBodyLEj @ 39 NONAME
+	_ZN11CBasePlugin14ListMailBoxesLER6RArrayI12TFSMailMsgIdE @ 40 NONAME
+	_ZN11CBasePlugin14RemoveObserverER20MFSMailEventObserver @ 41 NONAME
+	_ZN11CBasePlugin14ResetBodyCacheEv @ 42 NONAME
+	_ZN11CBasePlugin14SetMailboxNameERK12TFSMailMsgIdRK7TDesC16 @ 43 NONAME
+	_ZN11CBasePlugin14StoreMessagesLERK12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserveri @ 44 NONAME
+	_ZN11CBasePlugin15DoCancelSearchLERK12TFSMailMsgId @ 45 NONAME
+	_ZN11CBasePlugin15GetFolderByUidLERK12TFSMailMsgIdS2_ @ 46 NONAME
+	_ZN11CBasePlugin15GetMailboxInfoLEj @ 47 NONAME
+	_ZN11CBasePlugin15SetCredentialsLERK12TFSMailMsgIdRK7TDesC16S5_ @ 48 NONAME
+	_ZN11CBasePlugin16CurrentSyncStateERK12TFSMailMsgId @ 49 NONAME
+	_ZN11CBasePlugin16GetMailBoxByUidLERK12TFSMailMsgId @ 50 NONAME
+	_ZN11CBasePlugin16GetMailBoxStatusERK12TFSMailMsgId @ 51 NONAME
+	_ZN11CBasePlugin16GetMessageByUidLERK12TFSMailMsgIdS2_S2_14TFSMailDetails @ 52 NONAME
+	_ZN11CBasePlugin16RemoveChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_ @ 53 NONAME
+	_ZN11CBasePlugin16RemoveChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_R22MFSMailRequestObserveri @ 54 NONAME
+	_ZN11CBasePlugin17FindFetchRequestLEjjjjRNS_17TOngoingFetchInfoE @ 55 NONAME
+	_ZN11CBasePlugin17StoreMessagePartLERK12TFSMailMsgIdS2_S2_R18CFSMailMessagePart @ 56 NONAME
+	_ZN11CBasePlugin17SystemEventNotifyE20TMsgStoreSystemEvent @ 57 NONAME
+	_ZN11CBasePlugin18AccountEventNotifyE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 58 NONAME
+	_ZN11CBasePlugin18DeleteFetchRequestERNS_17TOngoingFetchInfoE @ 59 NONAME
+	_ZN11CBasePlugin18DeleteFolderByUidLERK12TFSMailMsgIdS2_ @ 60 NONAME
+	_ZN11CBasePlugin18FetchEmailAddressLER26CMsgStorePropertyContainerj @ 61 NONAME
+	_ZN11CBasePlugin18FetchMessagePartsLERK12TFSMailMsgIdS2_S2_RK6RArrayIS0_ER22MFSMailRequestObserverij @ 62 NONAME
+	_ZN11CBasePlugin18GetLastSyncStatusLERK12TFSMailMsgId @ 63 NONAME
+	_ZN11CBasePlugin18ModificationNotifyEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 64 NONAME
+	_ZN11CBasePlugin18NotifyGlobalEventLE12TFSMailEvent12TFSMailMsgIdPvS2_S2_ @ 65 NONAME
+	_ZN11CBasePlugin18RemovePartContentLERK12TFSMailMsgIdS2_S2_RK6RArrayIS0_E @ 66 NONAME
+	_ZN11CBasePlugin18StoreMessagePartsLER13RPointerArrayI18CFSMailMessagePartER22MFSMailRequestObserveri @ 67 NONAME
+	_ZN11CBasePlugin18SystemEventNotifyLE20TMsgStoreSystemEvent @ 68 NONAME
+	_ZN11CBasePlugin19AccountEventNotifyLE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 69 NONAME
+	_ZN11CBasePlugin19CreateReplyMessageLERK12TFSMailMsgIdS2_iRK7TDesC16 @ 70 NONAME
+	_ZN11CBasePlugin19DeleteMailBoxByUidLERK12TFSMailMsgIdR22MFSMailRequestObserveri @ 71 NONAME
+	_ZN11CBasePlugin19GetContentToBufferLERK12TFSMailMsgIdS2_S2_S2_R6TDes16j @ 72 NONAME
+	_ZN11CBasePlugin19GetMessagePartFileLERK12TFSMailMsgIdS2_S2_S2_R5RFile @ 73 NONAME
+	_ZN11CBasePlugin19ModificationNotifyLEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 74 NONAME
+	_ZN11CBasePlugin19NotifyMailboxEventLE12TFSMailEvent12TFSMailMsgIdPvS2_S2_ @ 75 NONAME
+	_ZN11CBasePlugin19TranslateEmailFwMrLER13MMRInfoObjectR26CMsgStorePropertyContainer @ 76 NONAME
+	_ZN11CBasePlugin20CopyMessagePartFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16 @ 77 NONAME
+	_ZN11CBasePlugin20CreateMessageToSendLERK12TFSMailMsgId @ 78 NONAME
+	_ZN11CBasePlugin20CreateMessageToSendLERK12TFSMailMsgIdR22MFSMailRequestObserveri @ 79 NONAME
+	_ZN11CBasePlugin20DeleteMessagesByUidLERK12TFSMailMsgIdS2_RK6RArrayIS0_E @ 80 NONAME
+	_ZN11CBasePlugin20GetAccountForMsgBoxLERK12TFSMailMsgId @ 81 NONAME
+	_ZN11CBasePlugin20GetDelayedOpsManagerEv @ 82 NONAME
+	_ZN11CBasePlugin20GetStandardFolderIdLERK12TFSMailMsgId13TFSFolderType @ 83 NONAME
+	_ZN11CBasePlugin20HandleMailboxDeleteLERK12TFSMailMsgId @ 84 NONAME
+	_ZN11CBasePlugin20RefreshMailboxCacheLEj @ 85 NONAME
+	_ZN11CBasePlugin20RemoveAllPropertiesLER26CMsgStorePropertyContainerRK6TDesC8 @ 86 NONAME
+	_ZN11CBasePlugin20ReportRequestStatusLEjjjji @ 87 NONAME
+	_ZN11CBasePlugin20TranslateMsgStoreMrLERK12TFSMailMsgIdR26CMsgStorePropertyContainerS4_R18CFSMailMessagePart @ 88 NONAME
+	_ZN11CBasePlugin20WizardDataAvailableLEv @ 89 NONAME
+	_ZN11CBasePlugin21CreateForwardMessageLERK12TFSMailMsgIdS2_RK7TDesC16 @ 90 NONAME
+	_ZN11CBasePlugin21CreateMrReplyMessageLERK12TFSMailMsgIdR13MMRInfoObjectS2_ @ 91 NONAME
+	_ZN11CBasePlugin21GetCachedMsgChildrenLEv @ 92 NONAME
+	_ZN11CBasePlugin21MailboxHasCapabilityLE22TFSMailBoxCapabilities12TFSMailMsgId @ 93 NONAME
+	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16R5RFile @ 94 NONAME
+	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_ @ 95 NONAME
+	_ZN11CBasePlugin21NewChildPartFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_R22MFSMailRequestObserveri @ 96 NONAME
+	_ZN11CBasePlugin22ClearSearchResultCacheERK12TFSMailMsgId @ 97 NONAME
+	_ZN11CBasePlugin22GetCachedBodyChildrenLEv @ 98 NONAME
+	_ZN11CBasePlugin22GetMailboxDisplayNameLEjR6RBuf16 @ 99 NONAME
+	_ZN11CBasePlugin23CopyMessageAsChildPartLERK12TFSMailMsgIdS2_S2_S2_S2_RK14CFSMailMessage @ 100 NONAME
+	_ZN11CBasePlugin23DeleteDelayedOpsManagerEv @ 101 NONAME
+	_ZN11CBasePlugin23SetPartContentFromFileLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16 @ 102 NONAME
+	_ZN11CBasePlugin23SubscribeMailboxEventsLERK12TFSMailMsgIdR20MFSMailEventObserver @ 103 NONAME
+	_ZN11CBasePlugin23TranslateMsgStorePropsLERK12TFSMailMsgIdR26CMsgStorePropertyContainerR18CFSMailMessagePart14TFSMailDetails @ 104 NONAME
+	_ZN11CBasePlugin24HandleRemovePartContentLER16CMsgStoreMessageR20CMsgStoreMessagePart @ 105 NONAME
+	_ZN11CBasePlugin24TranslateEmailFwMessageLER18CFSMailMessagePartR20CMsgStoreMessageParti @ 106 NONAME
+	_ZN11CBasePlugin24UnsubscribeMailboxEventsERK12TFSMailMsgIdR20MFSMailEventObserver @ 107 NONAME
+	_ZN11CBasePlugin25DeleteFetchRequestForPartERNS_17TOngoingFetchInfoE @ 108 NONAME
+	_ZN11CBasePlugin25DoClearSearchResultCacheLERK12TFSMailMsgId @ 109 NONAME
+	_ZN11CBasePlugin25SetReplyOrForwardToFieldLER16CMsgStoreMessage @ 110 NONAME
+	_ZN11CBasePlugin25TranslateEmailFwAttendeeLER12MMROrganizerR16RMsgStoreAddress @ 111 NONAME
+	_ZN11CBasePlugin25TranslateEmailFwDayOfWeekEN16MRRecurrenceRule15TMRRecurrentDayERm @ 112 NONAME
+	_ZN11CBasePlugin25UnregisterRequestObserverEi @ 113 NONAME
+	_ZN11CBasePlugin25UnsubscribeMailboxEventsLERK12TFSMailMsgIdR20MFSMailEventObserver @ 114 NONAME
+	_ZN11CBasePlugin26CreateForwardReplyMessageLERK12TFSMailMsgIdS2_iRK7TDesC16ii @ 115 NONAME
+	_ZN11CBasePlugin26InvalidateCacheIfNecessaryEjjj @ 116 NONAME
+	_ZN11CBasePlugin26TranslateMsgStoreDayOfWeekEmR14TDayOfWeekFtor @ 117 NONAME
+	_ZN11CBasePlugin27TranslateEmailFwRecipientsLER20CMsgStoreMessagePartRK6TDesC8R13RPointerArrayI14CFSMailAddressE @ 118 NONAME
+	_ZN11CBasePlugin32RefreshCachedMailBoxDisplayNameLERiRKj @ 119 NONAME
+	_ZN11CBasePlugin33NewChildPartFromFilePathOrHandleLERK12TFSMailMsgIdS2_S2_S2_RK7TDesC16S5_iR5RFile @ 120 NONAME
+	_ZN11CBasePlugin4NewLEv @ 121 NONAME
+	_ZN11CBasePlugin5NewLCEv @ 122 NONAME
+	_ZN11CBasePlugin7CancelLEi @ 123 NONAME
+	_ZN11CBasePlugin7SearchLERK12TFSMailMsgIdRK6RArrayIS0_ERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 124 NONAME
+	_ZN11CBasePlugin7StatusLEi @ 125 NONAME
+	_ZN11CBasePlugin9GoOnlineLERK12TFSMailMsgId @ 126 NONAME
+	_ZN11CBasePluginC1Ev @ 127 NONAME
+	_ZN11CBasePluginC2Ev @ 128 NONAME
+	_ZN11CBasePluginD0Ev @ 129 NONAME
+	_ZN11CBasePluginD1Ev @ 130 NONAME
+	_ZN11CBasePluginD2Ev @ 131 NONAME
+	_ZN15CBaseMrAttendee11SetAddressLERK7TDesC16 @ 132 NONAME
+	_ZN15CBaseMrAttendee14SetCommonNameLERK7TDesC16 @ 133 NONAME
+	_ZN15CBaseMrAttendee16SetAttendeeRoleLEN11MMRAttendee13TAttendeeRoleE @ 134 NONAME
+	_ZN15CBaseMrAttendee18SetAttendeeStatusLERN11MMRAttendee15TAttendeeStatusE @ 135 NONAME
+	_ZN15CBaseMrAttendee21SetResponseRequestedLEi @ 136 NONAME
+	_ZN15CBaseMrAttendee4NewLERK11MMRAttendee @ 137 NONAME
+	_ZN15CBaseMrAttendee4NewLERK12MMROrganizer @ 138 NONAME
+	_ZN15CBaseMrAttendee4NewLEv @ 139 NONAME
+	_ZN15CBaseMrAttendeeD0Ev @ 140 NONAME
+	_ZN15CBaseMrAttendeeD1Ev @ 141 NONAME
+	_ZN15CBaseMrAttendeeD2Ev @ 142 NONAME
+	_ZN15CResourceLoader2FsEv @ 143 NONAME
+	_ZN15CResourceLoader4NewLERK7TDesC16 @ 144 NONAME
+	_ZN15CResourceLoader6Load2LEi @ 145 NONAME
+	_ZN15CResourceLoader6Load2LEiRK7TDesC16 @ 146 NONAME
+	_ZN15CResourceLoader6Load2LEii @ 147 NONAME
+	_ZN15CResourceLoader6LoadLCEi @ 148 NONAME
+	_ZN15CResourceLoader7Load2LCEi @ 149 NONAME
+	_ZN15CResourceLoader7Load2LCEiRK7TDesC16 @ 150 NONAME
+	_ZN15CResourceLoader7Load2LCEii @ 151 NONAME
+	_ZN15CResourceLoaderD0Ev @ 152 NONAME
+	_ZN15CResourceLoaderD1Ev @ 153 NONAME
+	_ZN15CResourceLoaderD2Ev @ 154 NONAME
+	_ZN17CBaseMrInfoObject10AttendeesLEv @ 155 NONAME
+	_ZN17CBaseMrInfoObject10ExtensionLE4TUid @ 156 NONAME
+	_ZN17CBaseMrInfoObject11SetSubjectLERK7TDesC16 @ 157 NONAME
+	_ZN17CBaseMrInfoObject12AddAttendeeLEP11MMRAttendee @ 158 NONAME
+	_ZN17CBaseMrInfoObject12MROrganizerLEv @ 159 NONAME
+	_ZN17CBaseMrInfoObject12SetLocationLERK7TDesC16 @ 160 NONAME
+	_ZN17CBaseMrInfoObject12SetPriorityLEj @ 161 NONAME
+	_ZN17CBaseMrInfoObject14SetAlarmInUtcLE5TTime @ 162 NONAME
+	_ZN17CBaseMrInfoObject14SetMRResponseLEN13MMRInfoObject9TResponseE @ 163 NONAME
+	_ZN17CBaseMrInfoObject15AddAttachmentsLEP13MMRAttachment @ 164 NONAME
+	_ZN17CBaseMrInfoObject15SetDescriptionLERK7TDesC16 @ 165 NONAME
+	_ZN17CBaseMrInfoObject16SetEndTimeInUtcLE5TTime @ 166 NONAME
+	_ZN17CBaseMrInfoObject18SetMRRecurrenceIdLE5TTime @ 167 NONAME
+	_ZN17CBaseMrInfoObject18SetRecurrenceRuleLERK16MRRecurrenceRule @ 168 NONAME
+	_ZN17CBaseMrInfoObject18SetStartTimeInUtcLE5TTime @ 169 NONAME
+	_ZN17CBaseMrInfoObject19SetMRSequenceNumberEi @ 170 NONAME
+	_ZN17CBaseMrInfoObject21SetCreationTimeInUtcLE5TTime @ 171 NONAME
+	_ZN17CBaseMrInfoObject23AddRecurrenceExceptionLEP13MMRInfoObject @ 172 NONAME
+	_ZN17CBaseMrInfoObject4NewLER13MMRInfoObject @ 173 NONAME
+	_ZN17CBaseMrInfoObject4NewLEv @ 174 NONAME
+	_ZN17CBaseMrInfoObject7SetUidLEP7HBufC16 @ 175 NONAME
+	_ZN17CBaseMrInfoObject7SetUidLERK7TDesC16 @ 176 NONAME
+	_ZN17CBaseMrInfoObject9SetMethodEN13MMRInfoObject9TMRMethodE @ 177 NONAME
+	_ZN17CBaseMrInfoObjectD0Ev @ 178 NONAME
+	_ZN17CBaseMrInfoObjectD1Ev @ 179 NONAME
+	_ZN17CBaseMrInfoObjectD2Ev @ 180 NONAME
+	_ZN20CBaseMrInfoProcessor22ReplyToMeetingRequestLERK12TFSMailMsgIdS2_R13MMRInfoObjectRN16MMRInfoProcessor19TMRInfoResponseModeERK7TDesC16 @ 181 NONAME
+	_ZN20CBaseMrInfoProcessor4NewLER11CBasePlugin @ 182 NONAME
+	_ZN20CBaseMrInfoProcessorD0Ev @ 183 NONAME
+	_ZN20CBaseMrInfoProcessorD1Ev @ 184 NONAME
+	_ZN20CBaseMrInfoProcessorD2Ev @ 185 NONAME
+	_ZN21CBaseMrRecurrenceRule18SetRecurrenceTypeLEN16MRRecurrenceRule17TMRRecurrenceTypeE @ 186 NONAME
+	_ZN21CBaseMrRecurrenceRule18SetRecurrentCountLEi @ 187 NONAME
+	_ZN21CBaseMrRecurrenceRule19SetRecurrenceUntilLE5TTime @ 188 NONAME
+	_ZN21CBaseMrRecurrenceRule19SetRecurrentMonthsLER6RArrayIN16MRRecurrenceRule18TMRRecurrenceMonthEE @ 189 NONAME
+	_ZN21CBaseMrRecurrenceRule20SetRecurrentIntervalEi @ 190 NONAME
+	_ZN21CBaseMrRecurrenceRule21SetRecurrentWeekDaysLER6RArrayIN16MRRecurrenceRule15TMRRecurrentDayEE @ 191 NONAME
+	_ZN21CBaseMrRecurrenceRule22SetRecurrentMonthDaysLER6RArrayIiE @ 192 NONAME
+	_ZN21CBaseMrRecurrenceRule23SetRecurrenceStartTimeLE5TTime @ 193 NONAME
+	_ZN21CBaseMrRecurrenceRule24SetRecurrentDaysofMonthLER6RArrayIN16MRRecurrenceRule21TRecurrentDaysofMonthEE @ 194 NONAME
+	_ZN21CBaseMrRecurrenceRule4NewLERK16MRRecurrenceRule @ 195 NONAME
+	_ZN21CBaseMrRecurrenceRule4NewLEv @ 196 NONAME
+	_ZN21CBaseMrRecurrenceRuleD0Ev @ 197 NONAME
+	_ZN21CBaseMrRecurrenceRuleD1Ev @ 198 NONAME
+	_ZN21CBaseMrRecurrenceRuleD2Ev @ 199 NONAME
+	_ZNK11CBasePlugin16CalendarFileNameEv @ 200 NONAME
+	_ZNK15CBaseMrAttendee10CommonNameEv @ 201 NONAME
+	_ZNK15CBaseMrAttendee12AttendeeRoleEv @ 202 NONAME
+	_ZNK15CBaseMrAttendee14AttendeeStatusEv @ 203 NONAME
+	_ZNK15CBaseMrAttendee17ResponseRequestedEv @ 204 NONAME
+	_ZNK15CBaseMrAttendee7AddressEv @ 205 NONAME
+	_ZNK15CResourceLoader22CreateResourceReaderLCER15TResourceReaderi @ 206 NONAME
+	_ZNK17CBaseMrInfoObject10MRResponseEv @ 207 NONAME
+	_ZNK17CBaseMrInfoObject11AlarmInUtcLEv @ 208 NONAME
+	_ZNK17CBaseMrInfoObject12AttachmentsLEv @ 209 NONAME
+	_ZNK17CBaseMrInfoObject12DescriptionLEv @ 210 NONAME
+	_ZNK17CBaseMrInfoObject13EndTimeInUtcLEv @ 211 NONAME
+	_ZNK17CBaseMrInfoObject14MRRecurrenceIdEv @ 212 NONAME
+	_ZNK17CBaseMrInfoObject15RecurrenceRuleLEv @ 213 NONAME
+	_ZNK17CBaseMrInfoObject15StartTimeInUtcLEv @ 214 NONAME
+	_ZNK17CBaseMrInfoObject15SupportedFieldsER6RArrayIN13MMRInfoObject14TESMRInfoFieldEE @ 215 NONAME
+	_ZNK17CBaseMrInfoObject17MRSequenceNumberLEv @ 216 NONAME
+	_ZNK17CBaseMrInfoObject18CreationTimeInUtcLEv @ 217 NONAME
+	_ZNK17CBaseMrInfoObject21RecurrenceExceptionsLEv @ 218 NONAME
+	_ZNK17CBaseMrInfoObject4UidLEv @ 219 NONAME
+	_ZNK17CBaseMrInfoObject8SubjectLEv @ 220 NONAME
+	_ZNK17CBaseMrInfoObject9LocationLEv @ 221 NONAME
+	_ZNK17CBaseMrInfoObject9MRMethodLEv @ 222 NONAME
+	_ZNK17CBaseMrInfoObject9PriorityLEv @ 223 NONAME
+	_ZNK21CBaseMrRecurrenceRule14RecurrentCountEv @ 224 NONAME
+	_ZNK21CBaseMrRecurrenceRule14RecurrentUntilEv @ 225 NONAME
+	_ZNK21CBaseMrRecurrenceRule15RecurrentMonthsEv @ 226 NONAME
+	_ZNK21CBaseMrRecurrenceRule17RecurrentIntervalEv @ 227 NONAME
+	_ZNK21CBaseMrRecurrenceRule17RecurrentWeekDaysEv @ 228 NONAME
+	_ZNK21CBaseMrRecurrenceRule18RecurrentMonthDaysEv @ 229 NONAME
+	_ZNK21CBaseMrRecurrenceRule19RecurrenceStartTimeEv @ 230 NONAME
+	_ZNK21CBaseMrRecurrenceRule20RecurrentDaysofMonthEv @ 231 NONAME
+	_ZNK21CBaseMrRecurrenceRule4TypeEv @ 232 NONAME
+	_ZTI10CDelayedOp @ 233 NONAME
+	_ZTI11CBasePlugin @ 234 NONAME
+	_ZTV10CDelayedOp @ 235 NONAME
+	_ZTV11CBasePlugin @ 236 NONAME
+	_ZThn32_N11CBasePlugin17SystemEventNotifyE20TMsgStoreSystemEvent @ 237 NONAME
+	_ZThn32_N11CBasePlugin18AccountEventNotifyE21TMsgStoreAccountEventlRK7TDesC16S3_j @ 238 NONAME
+	_ZThn36_N11CBasePlugin18ModificationNotifyEj18TMsgStoreOperation22TMsgStoreContainerTypemjjj @ 239 NONAME
+	_ZThn4_N15CBaseMrAttendee11SetAddressLERK7TDesC16 @ 240 NONAME
+	_ZThn4_N15CBaseMrAttendee14SetCommonNameLERK7TDesC16 @ 241 NONAME
+	_ZThn4_N15CBaseMrAttendee16SetAttendeeRoleLEN11MMRAttendee13TAttendeeRoleE @ 242 NONAME
+	_ZThn4_N15CBaseMrAttendee18SetAttendeeStatusLERN11MMRAttendee15TAttendeeStatusE @ 243 NONAME
+	_ZThn4_N15CBaseMrAttendee21SetResponseRequestedLEi @ 244 NONAME
+	_ZThn4_N15CBaseMrAttendeeD0Ev @ 245 NONAME
+	_ZThn4_N15CBaseMrAttendeeD1Ev @ 246 NONAME
+	_ZThn4_N17CBaseMrInfoObject10AttendeesLEv @ 247 NONAME
+	_ZThn4_N17CBaseMrInfoObject10ExtensionLE4TUid @ 248 NONAME
+	_ZThn4_N17CBaseMrInfoObject11SetSubjectLERK7TDesC16 @ 249 NONAME
+	_ZThn4_N17CBaseMrInfoObject12AddAttendeeLEP11MMRAttendee @ 250 NONAME
+	_ZThn4_N17CBaseMrInfoObject12MROrganizerLEv @ 251 NONAME
+	_ZThn4_N17CBaseMrInfoObject12SetLocationLERK7TDesC16 @ 252 NONAME
+	_ZThn4_N17CBaseMrInfoObject12SetPriorityLEj @ 253 NONAME
+	_ZThn4_N17CBaseMrInfoObject14SetAlarmInUtcLE5TTime @ 254 NONAME
+	_ZThn4_N17CBaseMrInfoObject14SetMRResponseLEN13MMRInfoObject9TResponseE @ 255 NONAME
+	_ZThn4_N17CBaseMrInfoObject15AddAttachmentsLEP13MMRAttachment @ 256 NONAME
+	_ZThn4_N17CBaseMrInfoObject15SetDescriptionLERK7TDesC16 @ 257 NONAME
+	_ZThn4_N17CBaseMrInfoObject16SetEndTimeInUtcLE5TTime @ 258 NONAME
+	_ZThn4_N17CBaseMrInfoObject18SetMRRecurrenceIdLE5TTime @ 259 NONAME
+	_ZThn4_N17CBaseMrInfoObject18SetRecurrenceRuleLERK16MRRecurrenceRule @ 260 NONAME
+	_ZThn4_N17CBaseMrInfoObject18SetStartTimeInUtcLE5TTime @ 261 NONAME
+	_ZThn4_N17CBaseMrInfoObject21SetCreationTimeInUtcLE5TTime @ 262 NONAME
+	_ZThn4_N17CBaseMrInfoObject23AddRecurrenceExceptionLEP13MMRInfoObject @ 263 NONAME
+	_ZThn4_N17CBaseMrInfoObjectD0Ev @ 264 NONAME
+	_ZThn4_N17CBaseMrInfoObjectD1Ev @ 265 NONAME
+	_ZThn4_N20CBaseMrInfoProcessor22ReplyToMeetingRequestLERK12TFSMailMsgIdS2_R13MMRInfoObjectRN16MMRInfoProcessor19TMRInfoResponseModeERK7TDesC16 @ 266 NONAME
+	_ZThn4_N20CBaseMrInfoProcessorD0Ev @ 267 NONAME
+	_ZThn4_N20CBaseMrInfoProcessorD1Ev @ 268 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule18SetRecurrenceTypeLEN16MRRecurrenceRule17TMRRecurrenceTypeE @ 269 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule18SetRecurrentCountLEi @ 270 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule19SetRecurrenceUntilLE5TTime @ 271 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule19SetRecurrentMonthsLER6RArrayIN16MRRecurrenceRule18TMRRecurrenceMonthEE @ 272 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule20SetRecurrentIntervalEi @ 273 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule21SetRecurrentWeekDaysLER6RArrayIN16MRRecurrenceRule15TMRRecurrentDayEE @ 274 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule22SetRecurrentMonthDaysLER6RArrayIiE @ 275 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule23SetRecurrenceStartTimeLE5TTime @ 276 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRule24SetRecurrentDaysofMonthLER6RArrayIN16MRRecurrenceRule21TRecurrentDaysofMonthEE @ 277 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRuleD0Ev @ 278 NONAME
+	_ZThn4_N21CBaseMrRecurrenceRuleD1Ev @ 279 NONAME
+	_ZThn4_NK15CBaseMrAttendee10CommonNameEv @ 280 NONAME
+	_ZThn4_NK15CBaseMrAttendee12AttendeeRoleEv @ 281 NONAME
+	_ZThn4_NK15CBaseMrAttendee14AttendeeStatusEv @ 282 NONAME
+	_ZThn4_NK15CBaseMrAttendee17ResponseRequestedEv @ 283 NONAME
+	_ZThn4_NK15CBaseMrAttendee7AddressEv @ 284 NONAME
+	_ZThn4_NK17CBaseMrInfoObject10MRResponseEv @ 285 NONAME
+	_ZThn4_NK17CBaseMrInfoObject11AlarmInUtcLEv @ 286 NONAME
+	_ZThn4_NK17CBaseMrInfoObject12AttachmentsLEv @ 287 NONAME
+	_ZThn4_NK17CBaseMrInfoObject12DescriptionLEv @ 288 NONAME
+	_ZThn4_NK17CBaseMrInfoObject13EndTimeInUtcLEv @ 289 NONAME
+	_ZThn4_NK17CBaseMrInfoObject14MRRecurrenceIdEv @ 290 NONAME
+	_ZThn4_NK17CBaseMrInfoObject15RecurrenceRuleLEv @ 291 NONAME
+	_ZThn4_NK17CBaseMrInfoObject15StartTimeInUtcLEv @ 292 NONAME
+	_ZThn4_NK17CBaseMrInfoObject15SupportedFieldsER6RArrayIN13MMRInfoObject14TESMRInfoFieldEE @ 293 NONAME
+	_ZThn4_NK17CBaseMrInfoObject17MRSequenceNumberLEv @ 294 NONAME
+	_ZThn4_NK17CBaseMrInfoObject18CreationTimeInUtcLEv @ 295 NONAME
+	_ZThn4_NK17CBaseMrInfoObject21RecurrenceExceptionsLEv @ 296 NONAME
+	_ZThn4_NK17CBaseMrInfoObject4UidLEv @ 297 NONAME
+	_ZThn4_NK17CBaseMrInfoObject8SubjectLEv @ 298 NONAME
+	_ZThn4_NK17CBaseMrInfoObject9LocationLEv @ 299 NONAME
+	_ZThn4_NK17CBaseMrInfoObject9MRMethodLEv @ 300 NONAME
+	_ZThn4_NK17CBaseMrInfoObject9PriorityLEv @ 301 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule14RecurrentCountEv @ 302 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule14RecurrentUntilEv @ 303 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule15RecurrentMonthsEv @ 304 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule17RecurrentIntervalEv @ 305 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule17RecurrentWeekDaysEv @ 306 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule18RecurrentMonthDaysEv @ 307 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule19RecurrenceStartTimeEv @ 308 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule20RecurrentDaysofMonthEv @ 309 NONAME
+	_ZThn4_NK21CBaseMrRecurrenceRule4TypeEv @ 310 NONAME
 
--- a/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Fri Sep 03 14:07:42 2010 +0300
@@ -110,7 +110,7 @@
     public:
 
         /**
-         * This methoed must be called before destruction of 
+         * This methoed must be called before destruction of
          * CBasePlugin derived class. To fix bug EIZU-7XVF2Z.
          */
          void DeleteDelayedOpsManager();
@@ -141,13 +141,6 @@
             const TFSMailMsgId& aSourceFolderId,
             const TFSMailMsgId& aDestinationFolderId );
 
-         MDesCArray* GetMrusL(
-            const TFSMailMsgId& aMailBoxId );
-
-         void SetMrusL(
-            const TFSMailMsgId& aMailBoxId,
-            MDesCArray* aNewMruList );
-
          void GoOnlineL(
             const TFSMailMsgId& aMailBoxId );
 
@@ -234,7 +227,7 @@
          virtual void StoreMessageL(
             const TFSMailMsgId& aMailBoxId,
             CFSMailMessage& aMessage );
-        
+
 // <qmail>
          void StoreMessagesL(
                 const TFSMailMsgId& aMailBoxId,
@@ -242,14 +235,14 @@
                 MFSMailRequestObserver& aOperationObserver,
                 const TInt aRequestId );
 // </qmail>
-        
+
 // <qmail>
         virtual void StoreMessagePartsL(
                RPointerArray<CFSMailMessagePart>& aMessageParts,
                MFSMailRequestObserver& aOperationObserver,
                const TInt aRequestId);
 // <//qmail>
-		
+
          virtual void FetchMessagesL(
             const TFSMailMsgId& aMailBoxId,
             const TFSMailMsgId& aFolderId,
@@ -447,7 +440,7 @@
 	         const TFSMailMsgId& aMessageId,
 	         const TFSMailMsgId& aParentPartId,
 	         const TDesC& aContentType,
-	         const TDesC& aFilePath, 
+	         const TDesC& aFilePath,
 	         MFSMailRequestObserver& aOperationObserver,
 	         const TInt aRequestId );
 	     // </qmail>
@@ -509,7 +502,7 @@
          * Get signature string from protocol specific subclass.
          * Caller is responsible for memory of returned string.
          */
-        virtual HBufC* GetSignatureL( TFSMailMsgId /* aMailBox */ )
+        virtual HBufC* GetSignatureL( const TFSMailMsgId& /* aMailBox */ )
         	{
         	return NULL;
         	}
@@ -808,7 +801,7 @@
 	        TMsgStoreId aId,
 	        TMsgStoreId aParentId,
 	        TMsgStoreId aOtherId );
-	    
+
 	     virtual const TDesC& CBasePlugin::CalendarFileName() const;
 
     public:
@@ -837,7 +830,7 @@
         //does not actually own the observers.
         RPointerArray<MFSMailEventObserver> iObservers;
         //async fetch reqs.
-        RPointerArray<CFetchRequester> iReqs;       
+        RPointerArray<CFetchRequester> iReqs;
         RPointerArray<CDelayedOp> iDelayedOpReqs;
 
         TCacheLine iCacheLine;
--- a/emailservices/emailstore/base_plugin/src/basepluginmisc.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginmisc.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -275,82 +275,8 @@
 
     }
 
-
-#pragma mark -
-#pragma mark --- MRU SUPPORT ---
-
-
-/**
- *
- */
-MDesCArray* CBasePlugin::GetMrusL(
-    const TFSMailMsgId& aMailBoxId )
-
-    {
-    CMailboxInfo& mailBox = GetMailboxInfoL( aMailBoxId.Id() );
-
-    RPointerArray<CMsgStoreAddress> addressArray;
-    CleanupResetAndDestroyClosePushL( addressArray );
-    mailBox().MruAddressesL( addressArray );
-
-    //defione consts to avoid codescanner errors
-    const TUint KDefaultGranularity = 8;
-
-    TInt granularity = addressArray.Count() > 0 ? 2 * addressArray.Count() : KDefaultGranularity;
-    CDesCArrayFlat* result = new (ELeave) CDesCArrayFlat( granularity );
-    CleanupStack::PushL( result );
-
-    TInt count = addressArray.Count();
-    for ( TInt i = 0; i < count; i++ )
-        {
-        result->AppendL( addressArray[i]->DisplayName() );
-        result->AppendL( addressArray[i]->EmailAddress() );
-        }
-
-    CleanupStack::Pop( result );
-    CleanupStack::PopAndDestroy( &addressArray );
-
-    return result;
-    }
-
-
-/**
- *
- */
-void CBasePlugin::SetMrusL(
-    const TFSMailMsgId& aMailBoxId,
-    MDesCArray* aNewMruList )
-
-    {
-    CMailboxInfo& mailBox = GetMailboxInfoL( aMailBoxId.Id() );
-
-    __ASSERT_DEBUG(
-        0 == ( aNewMruList->MdcaCount() % 2 ),
-        ::BasePluginPanic( ESetMrusInvalidAssert ) );
-
-    RPointerArray<CMsgStoreAddress> addressArray;
-    CleanupResetAndDestroyClosePushL( addressArray );
-
-    CMsgStoreAddress* address;
-    for ( TInt i = 0; i < aNewMruList->MdcaCount(); i+=2 )
-        {
-        TPtrC display = aNewMruList->MdcaPoint( i );
-        TPtrC email = aNewMruList->MdcaPoint( 1 + i );
-
-        address = CMsgStoreAddress::NewL( email, display );
-        CleanupStack::PushL( address );
-        addressArray.AppendL( address );
-        CleanupStack::Pop( address );
-        }
-
-    mailBox().AddMruAddressesL( addressArray );
-    CleanupStack::PopAndDestroy( &addressArray );
-    }
-
-
 #pragma mark --- "MFSMAILPLUGINAPI - STATUS INFO" ---
 
-
 /**
  *
  */
@@ -387,7 +313,7 @@
     		break;
     		}
     	}
-//<qmail>		
+//<qmail>
     count = iDelayedOpReqs.Count();
     for ( TInt i = 0; i < count; i++ )
         {
@@ -405,7 +331,7 @@
             break;
             }
         }
-//</qmail>		
+//</qmail>
     }
 
 
@@ -556,7 +482,7 @@
             }
         }
 
-    if ( NULL == result )
+    if ( !result )
         {
         CMailboxInfo& mailBox = GetMailboxInfoL( aMailBoxId );
         iCacheLine.iMsg = mailBox().FetchMessageL( aMsgId, KMsgStoreInvalidId );
--- a/emailservices/emailstore/base_plugin/src/basepluginnotifications.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginnotifications.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -300,51 +300,45 @@
                     }
                 else if ( EMsgStoreFolderContainer == aType )
                     {
-                    TRAPD( err, CMailboxInfo& mailBox = GetMailboxInfoL( aMailBoxId ) );
-                    
-                    if ( KErrNone == err )
-                    	{
-                    	for ( TInt i = EFSInbox; i <= EFSDeleted; i++ )
-                    		{
-                    		if ( mailBox.iRootFolders.iFolders[i] == aId )
-                    			{
-                    			TMsgStoreId newId = 0;
-                    			
-                    			/**@ this behavior is forced by the UI for some reason and should be revisited
-                    			 * in the future as it allows more than one inbox folder which is not recommended. */
-                    			
-                    			//loop over all of the root folders looking for a replacement.
-								RPointerArray<CMsgStoreFolder> folders;
-								CleanupResetAndDestroyClosePushL( folders );
+                    for ( TInt i = EFSInbox; i <= EFSDeleted; i++ )
+                        {
+                        if ( mailBox.iRootFolders.iFolders[i] == aId )
+                            {
+                            TMsgStoreId newId = 0;
+                            
+                            /**@ this behavior is forced by the UI for some reason and should be revisited
+                             * in the future as it allows more than one inbox folder which is not recommended. */
+                            
+                            //loop over all of the root folders looking for a replacement.
+                            RPointerArray<CMsgStoreFolder> folders;
+                            CleanupResetAndDestroyClosePushL( folders );
 
-								mailBox().FoldersL( aMailBoxId, folders );
+                            mailBox().FoldersL( aMailBoxId, folders );
 
-								for ( int j = 0; j < folders.Count(); j++ )
-									{
-									CMsgStoreFolder* folder = folders[j];
+                            for ( int j = 0; j < folders.Count(); j++ )
+                                {
+                                CMsgStoreFolder* folder = folders[j];
 
-									TUint index = 0;
-									if ( folder->FindProperty( KMsgStorePropertyFolderType, index ) )
-										{
-	                                    TUint32 type = folder->PropertyValueUint32L( index );
+                                TUint index = 0;
+                                if ( folder->FindProperty( KMsgStorePropertyFolderType, index ) )
+                                    {
+                                    TUint32 type = folder->PropertyValueUint32L( index );
 
-	                                    if ( type == i )	//i is a value in the folder type enum.
-											{
-											newId = folder->Id();
-											break;
-											}
-	                                    }
-									}
-								
-								CleanupStack::PopAndDestroy( &folders );
-                                
-                    			//set the new root folder info.
-                    			mailBox.iRootFolders.iFolders[i] = newId;
-                    			break;
-                    			}                    		
-                    		}
-						}
-                
+                                    if ( type == i )	//i is a value in the folder type enum.
+                                        {
+                                        newId = folder->Id();
+                                        break;
+                                        }
+                                    }
+                                }
+                            
+                            CleanupStack::PopAndDestroy( &folders );
+                            
+                            //set the new root folder info.
+                            mailBox.iRootFolders.iFolders[i] = newId;
+                            break;
+                            }                    		
+                        }
                     NotifyEventL( aMailBoxId, aId, aParentId, TFSEventFoldersDeleted );
                     }
                 }
--- a/emailservices/emailstore/base_plugin/src/basepluginparts.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginparts.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -32,8 +32,7 @@
     {
     __LOG_ENTER( "ChildPartsL" )
     
-    CMsgStoreMessage* message = GetCachedMsgL( aMailBoxId.Id(), aMessageId.Id() );
-    
+    GetCachedMsgL( aMailBoxId.Id(), aMessageId.Id() );
     RPointerArray<CMsgStoreMessagePart>* parts;
     if ( aParentId.IsNullId() )
         {
--- a/emailservices/emailstore/message_store/debuglog/src/DebugLog.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/message_store/debuglog/src/DebugLog.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -510,7 +510,7 @@
         iLogFileHandler = CDebugLogTlsData::GetLogFileHandler( iLogDirectory, this );
         } // end if
        
-    return (iLogFileHandler != NULL) && iLogFileHandler->ReadyToWrite();
+    return (iLogFileHandler) && iLogFileHandler->ReadyToWrite();
            
     } // END PrepareForWrite
     
--- a/emailservices/emailstore/message_store/server/src/ContainerStoreContainersTable.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/ContainerStoreContainersTable.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -729,7 +729,7 @@
 		
 		for ( int i = 0 ; i < childrens.Count() ; i++ )
 			{
-			iTable.SeekL( childrens[i] );
+			User::LeaveIfError(iTable.SeekL( childrens[i] ));
 			iTable.GetL();
 			childrenCounts.Copy( iTable.ColDes8(iChildrenCountsColNum) );
 		    iCustomBehaviorProvider.IncrementParentCounts( totalCounts, childrenCounts );
--- a/emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/ContainerStoreEncryption.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -74,7 +74,7 @@
 TBool CContainerStoreEncryption::Authenticated()
     {
     //always return true if authentication is not required
-    return ( iCryptoLibrary != NULL || !iAuthenticationRequired ); 
+    return ( iCryptoLibrary || !iAuthenticationRequired ); 
     } // end Authenticated
 
 // ==========================================================================
--- a/emailservices/emailstore/message_store/server/src/ContainerStoreMRUAddressTable.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/ContainerStoreMRUAddressTable.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -479,14 +479,14 @@
         {
         if ( iAddressLists[i]->MailboxId() == aMailboxId )
             {
+            found = ETrue;
             CMruAddressList* list = iAddressLists[i];
             iAddressLists.Remove( i );
             delete list;
             break;
             }
         }
-    
-    if ( !found == NULL )
+    if ( !found )
         {
         User::Leave( KErrNotFound );
         }
@@ -690,7 +690,7 @@
     __LOG_ENTER_SUPPRESS("UpdateMruNumberInTable")
     __LOG_WRITE_FORMAT2_INFO("updating MRU %u to %u", aOldMruNum, aNewMruNum )
     
-    iTable.SeekL( aOldMruNum );
+    SeekL( aOldMruNum );
     
     PrepareRowForUpdateLC();
     
--- a/emailservices/emailstore/message_store/server/src/MessageStoreServer.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/MessageStoreServer.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -222,7 +222,7 @@
 	// decided that MsgStore running as a seperate process in case Bridge process
 	// crashes makes more sense
 	// (aParams == NULL) is basically to differentiate dll or exe
-    TRAP( ret, RunServerL( (aParams == NULL) ) );
+    TRAP( ret, RunServerL( (!aParams) ) );
     delete cleanup;
     }
   __UHEAP_MARKEND;
--- a/emailservices/nmailagent/src/nmmailagent.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmailagent/src/nmmailagent.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -243,43 +243,43 @@
             mPluginFactory->interfaceInstance(pluginObject);
         if (plugin) {
             plugin->listMailboxes(mailboxes);
-        }
-
-        // Add the indicators
-        // Must be made in reverse order to show them properly in
-        // HbIndicator menu
-        QListIterator<NmMailbox *> i(mailboxes);
-        i.toBack();
-        while (i.hasPrevious()) {
-            const NmMailbox *mailbox = i.previous();
-            if (mailbox) {
-                NmMailboxInfo *mailboxInfo = createMailboxInfo(*mailbox, plugin);
-                if (mailboxInfo) {
-                    bool activate = updateUnreadCount(mailbox->id(), *mailboxInfo);
-                    NM_COMMENT(QString("Mailbox %1 initial state: newUnread=%2 total=%3").
-                        arg(mailboxInfo->mName).
-                        arg(mailboxInfo->mNewUnreadMailIdList.count()).
-                        arg(mailboxInfo->mMailIdList.count()));
-
-                    bool wasActive = isMailboxActive(mailbox->id());
-                    if (!wasActive) {
-                        // do not activate the mailbox if it was left as hidden last time
-                        activate = false;
-                        mailboxInfo->mNewUnreadMailIdList.clear();
+            
+            // Add the indicators
+            // Must be made in reverse order to show them properly in
+            // HbIndicator menu
+            QListIterator<NmMailbox *> i(mailboxes);
+            i.toBack();
+            while (i.hasPrevious()) {
+                const NmMailbox *mailbox = i.previous();
+                if (mailbox) {
+                    NmMailboxInfo *mailboxInfo = createMailboxInfo(*mailbox, plugin);
+                    if (mailboxInfo) {
+                        bool activate = updateUnreadCount(mailbox->id(), *mailboxInfo);
+                        NM_COMMENT(QString("Mailbox %1 initial state: newUnread=%2 total=%3").
+                            arg(mailboxInfo->mName).
+                            arg(mailboxInfo->mNewUnreadMailIdList.count()).
+                            arg(mailboxInfo->mMailIdList.count()));
+    
+                        bool wasActive = isMailboxActive(mailbox->id());
+                        if (!wasActive) {
+                            // do not activate the mailbox if it was left as hidden last time
+                            activate = false;
+                            mailboxInfo->mNewUnreadMailIdList.clear();
+                        }
+    
+                        mailboxInfo->mOutboxMails = getOutboxCount(mailbox->id(),
+                            mailboxInfo->mOutboxFolderId);
+                        if (mailboxInfo->mOutboxMails > 0 && wasActive) {
+                            activate = true;
+                        }
+    
+                        // Create indicator for visible mailboxes
+                        updateMailboxState(mailbox->id(), activate, false);
                     }
-
-                    mailboxInfo->mOutboxMails = getOutboxCount(mailbox->id(),
-                        mailboxInfo->mOutboxFolderId);
-                    if (mailboxInfo->mOutboxMails > 0 && wasActive) {
-                        activate = true;
-                    }
-
-                    // Create indicator for visible mailboxes
-                    updateMailboxState(mailbox->id(), activate, false);
                 }
             }
+            qDeleteAll(mailboxes);
         }
-        qDeleteAll(mailboxes);
     }
     updateUnreadIndicator();
     updateSendIndicator();
@@ -468,7 +468,7 @@
         }
         else {
             // Indicator not anymore active. Release it.
-            if (mailboxInfo->mIndicatorIndex>=0) {
+            if (mailboxInfo->mIndicatorIndex >= 0) {
                 updateIndicator(false,*mailboxInfo);
                 mailboxInfo->mIndicatorIndex = NmAgentIndicatorNotSet;
             }
@@ -706,38 +706,40 @@
     
     NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
 
-    if (mailboxInfo && folderId == mailboxInfo->mInboxFolderId) {
-        mailboxInfo->mInboxDeletedMessages++;
+    if (mailboxInfo) {
+        if (folderId == mailboxInfo->mInboxFolderId) {
+            mailboxInfo->mInboxDeletedMessages++;
 
-        // Clear the IDs from 'new unread messages' list
-        foreach (NmId messageId, messageIds) {
-            mailboxInfo->mNewUnreadMailIdList.removeAll(messageId);
+            // Clear the IDs from 'new unread messages' list
+            foreach (NmId messageId, messageIds) {
+                mailboxInfo->mNewUnreadMailIdList.removeAll(messageId);
+             }
+
+            // All new unread messages are now deleted
+            if (mailboxInfo->mNewUnreadMailIdList.count()==0) {
+                NM_COMMENT(" No more new unread messages");
+                updateUnreadIndicator();
+                updateMailboxState(mailboxId);
+            }
         }
 
-        // All new unread messages are now deleted
-        if (mailboxInfo->mNewUnreadMailIdList.count()==0) {
-            NM_COMMENT(" No more new unread messages");
-            updateUnreadIndicator();
+        // Deleted mails from the outbox
+        if (mailboxInfo->mOutboxFolderId == folderId) {
+            mailboxInfo->mOutboxMails -= messageIds.count();
+
+            // Sanity check for the outbox count
+            if (mailboxInfo->mOutboxMails < 0) {
+                mailboxInfo->mOutboxMails = 0;
+            }
+
+            // The last mail was now deleted from outbox
+            if (mailboxInfo->mOutboxMails == 0) {
+                NM_COMMENT("NmMailAgent: last mail deleted from outbox");
+                updateSendIndicator();
+            }
             updateMailboxState(mailboxId);
         }
     }
-
-    // Deleted mails from the outbox
-    if (mailboxInfo->mOutboxFolderId == folderId) {
-        mailboxInfo->mOutboxMails -= messageIds.count();
-
-        // Sanity check for the outbox count
-        if (mailboxInfo->mOutboxMails < 0) {
-            mailboxInfo->mOutboxMails = 0;
-        }
-
-        // The last mail was now deleted from outbox
-        if (mailboxInfo->mOutboxMails == 0) {
-            NM_COMMENT("NmMailAgent: last mail deleted from outbox");
-            updateSendIndicator();
-        }
-        updateMailboxState(mailboxId);
-    }
 }
 
 /*!
@@ -754,10 +756,10 @@
     do {
         found = false;
         foreach (NmMailboxInfo *mailbox, mMailboxes) {
-            if (mailbox->mIndicatorIndex == index &&
-                mailbox->mActive) {
+            if (mailbox->mIndicatorIndex == index) {
                 found = true;
                 index++;
+                break;
             }
         }
     }
--- a/emailservices/nmailbase/inc/nmcommon.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmailbase/inc/nmcommon.h	Fri Sep 03 14:07:42 2010 +0300
@@ -60,6 +60,17 @@
 };
 Q_DECLARE_METATYPE(NmMessageEvent)
 
+/*!
+    \struct NmFolderEvent
+    \brief Enumeration for folder related events
+ */
+enum NmFolderEvent
+{
+    NmFolderIsCreated,
+    NmFolderIsDeleted
+};
+Q_DECLARE_METATYPE(NmFolderEvent)
+
 enum NmFolderType
 {
     NmFolderInbox = 1,
--- a/emailservices/nmailbase/src/nmmessagepart.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmailbase/src/nmmessagepart.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -337,7 +337,7 @@
     d->mChildParts.clear();
     }
     for (int i = 0; i < parts.count(); i++) {
-        if (parts[i] != NULL) {
+        if (parts[i]) {
             d->mChildParts.append(parts[i]);
         }
     }
--- a/emailservices/nmclientapi/bwins/nmailclientapiu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmclientapi/bwins/nmailclientapiu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -6,7 +6,7 @@
 	?tr@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 5 NONAME ; class QString EmailClientApi::NmApiMessageManager::tr(char const *, char const *, int)
 	?qt_metacall@NmApiEventNotifier@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 6 NONAME ; int EmailClientApi::NmApiEventNotifier::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?setPlainText@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 7 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setPlainText(class QString const &)
-	??1NmApiSettingsManager@EmailClientApi@@QAE@XZ @ 8 NONAME ; EmailClientApi::NmApiSettingsManager::~NmApiSettingsManager(void)
+	??1NmApiSettingsManager@EmailClientApi@@UAE@XZ @ 8 NONAME ; EmailClientApi::NmApiSettingsManager::~NmApiSettingsManager(void)
 	?id@NmApiMailbox@EmailClientApi@@QBE_KXZ @ 9 NONAME ; unsigned long long EmailClientApi::NmApiMailbox::id(void) const
 	?createReplyMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@_N@Z @ 10 NONAME ; bool EmailClientApi::NmApiMessageManager::createReplyMessage(class QVariant const *, bool)
 	?saveMessage@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 11 NONAME ; bool EmailClientApi::NmApiMessageManager::saveMessage(struct NmApiMessage const &)
@@ -246,4 +246,5 @@
 	?qt_metacall@NmApiMailboxSettings@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 245 NONAME ; int EmailClientApi::NmApiMailboxSettings::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?start@NmApiFolderListing@EmailClientApi@@UAE_NXZ @ 246 NONAME ; bool EmailClientApi::NmApiFolderListing::start(void)
 	?cancel@NmApiFolderListing@EmailClientApi@@UAEXXZ @ 247 NONAME ; void EmailClientApi::NmApiFolderListing::cancel(void)
+	??_ENmApiSettingsManager@EmailClientApi@@UAE@I@Z @ 248 NONAME ; EmailClientApi::NmApiSettingsManager::~NmApiSettingsManager(unsigned int)
 
--- a/emailservices/nmclientapi/eabi/nmailclientapiu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmclientapi/eabi/nmailclientapiu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -274,4 +274,7 @@
 	_ZTIN14EmailClientApi20NmApiMailboxSettingsE @ 273 NONAME
 	_ZTVN14EmailClientApi19NmApiMessageManagerE @ 274 NONAME
 	_ZTVN14EmailClientApi20NmApiMailboxSettingsE @ 275 NONAME
+	_ZN14EmailClientApi20NmApiSettingsManagerD0Ev @ 276 NONAME
+	_ZTIN14EmailClientApi20NmApiSettingsManagerE @ 277 NONAME
+	_ZTVN14EmailClientApi20NmApiSettingsManagerE @ 278 NONAME
 
--- a/emailservices/nmclientapi/src/nmapiengine.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiengine.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -215,18 +215,18 @@
     NmDataPluginInterface *instance =  mFactory->interfaceInstance();
     if (instance) {
         instance->listMailboxes(mailboxFromPlugin);
-    }
-
-    while (mailboxFromPlugin.isEmpty() == false) {
-        NmMailbox* tempNmMailbox = mailboxFromPlugin.takeLast();
-
-        // subscribe all events also for these new mailboxes
-        instance->subscribeMailboxEvents(tempNmMailbox->id());
-
-        // construct mailboxlist to platform api
-        mailboxList << NmToApiConverter::NmMailbox2NmApiMailbox(*tempNmMailbox);
-
-        delete tempNmMailbox;
+        
+        while (mailboxFromPlugin.isEmpty() == false) {
+            NmMailbox* tempNmMailbox = mailboxFromPlugin.takeLast();
+    
+            // subscribe all events also for these new mailboxes
+            instance->subscribeMailboxEvents(tempNmMailbox->id());
+    
+            // construct mailboxlist to platform api
+            mailboxList << NmToApiConverter::NmMailbox2NmApiMailbox(*tempNmMailbox);
+    
+            delete tempNmMailbox;
+        }
     }
 }
 
--- a/emailservices/nmutilities/nmutilities.pro	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailservices/nmutilities/nmutilities.pro	Fri Sep 03 14:07:42 2010 +0300
@@ -75,11 +75,6 @@
    DESTDIR = ../../bin
 }
 
-#creating rcc file from qrc
-#system(rcc -binary data/email_brand.qrc -o data/email_brand.rcc)
-#RESOURCES += data/email_brand.qrc
-#"data/email_brand.rcc                  /epoc32/data/Z/resource/apps/email_brand.rcc" \
-
 # Build.inf rules  
 BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
                              "rom/nmutilities.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(nmutilities.iby)" \
--- a/emailuis/nmailui/conf/nmeditorview.docml	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/conf/nmeditorview.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -2,7 +2,7 @@
 <hbdocument version="1.1">
     <widget name="editorview" type="HbView">
         <widget name="content" role="HbView:widget" type="HbWidget">
-            <widget name="scrollArea" plugin="nmailuiwidgetsplugin" type="NmBaseViewScrollArea">
+            <widget name="scrollArea" type="NmBaseViewScrollArea">
                 <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
                     <widget name="editorToField" type="HbWidget">
                         <widget name="editorToLabel" type="HbLabel">
@@ -11,7 +11,7 @@
                             <string locid="txt_mail_editor_to" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorToEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorToEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorToButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -32,7 +32,7 @@
                             <string locid="txt_mail_editor_cc" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorCcEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorCcEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorCcButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -53,7 +53,7 @@
                             <string locid="txt_mail_editor_bcc" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorBccEdit" plugin="nmailuiwidgetsplugin" type="NmRecipientLineEdit"/>
+                        <widget name="editorBccEdit" type="NmRecipientLineEdit"/>
                         <widget name="editorBccButton" type="HbPushButton">
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
                             <sizehint height="7.5un" type="FIXED" width="9.5un"/>
@@ -74,7 +74,7 @@
                             <string locid="txt_mail_editor_subject" name="plainText"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                         </widget>
-                        <widget name="editorSubjectEdit" plugin="nmailuiwidgetsplugin" type="NmHtmlLineEdit"/>
+                        <widget name="editorSubjectEdit" type="NmHtmlLineEdit"/>
                         <widget name="editPriorityIcon" type="HbLabel">
                             <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
@@ -95,12 +95,12 @@
                             <linearitem itemname="editFollowUpIcon"/>
                         </layout>
                     </widget>
-                    <widget name="attachmentListWidget" plugin="nmailuiwidgetsplugin" type="NmAttachmentListWidget">
+                    <widget name="attachmentListWidget" type="NmAttachmentListWidget">
                         <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                         <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
                     </widget>
                     <widget name="BodyTextEditContainer" type="HbWidget">
-                        <widget name="BodyTextEdit" plugin="nmailuiwidgetsplugin" type="NmEditorTextEdit">
+                        <widget name="BodyTextEdit" type="NmEditorTextEdit">
                             <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
                             <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                             <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
--- a/emailuis/nmailui/conf/nmmessagesearchlistview.docml	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/conf/nmmessagesearchlistview.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -1,52 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hbdocument version="1.1">
-    <widget name="NmMessageSearchListView" type="HbView">
-        <widget name="content" role="HbView:widget" type="HbWidget">
-            <widget name="LineEdit" type="HbLineEdit">
-                <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
-                <sizehint height="8un" type="PREFERRED"/>
+    <widget name="NmMessageSearchView" type="HbView">
+        <widget name="Container" role="HbView:widget" type="HbWidget">
+            <widget name="SearchPanel" type="HbSearchPanel">
+                <real name="z" value="1"/>
             </widget>
-            <widget name="PushButton" type="HbPushButton">
-                <sizehint height="8un" type="PREFERRED" width="9un"/>
-                <sizehint type="MAXIMUM" width="9un"/>
-            </widget>
-            <widget name="LabelGroupBox" type="HbGroupBox">
-                <sizehint height="6un" type="PREFERRED" width="52un"/>
-                <bool name="collapsable" value="FALSE"/>
-                <bool name="enabled" value="FALSE"/>
-            </widget>
-            <widget name="MessageListNoMessages" type="HbLabel">
+            <widget name="MessageNoMessages" type="HbLabel">
                 <enums name="textWrapping" value="TextWordWrap"/>
                 <enums name="alignment" value="AlignLeft|AlignVCenter|AlignHCenter|AlignLeading"/>
+                <sizehint height="expr(var(hb-param-screen-height) )" type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                <contentsmargins bottom="0un" left="expr(var(hb-param-margin-indentation) )" right="expr(var(hb-param-margin-indentation) )" top="0un"/>
+                <bool name="enabled" value="FALSE"/>
+                <bool name="visible" value="FALSE"/>
                 <string locid="txt_mail_dblist_no_messages_matched_your_search" name="plainText"/>
                 <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
             </widget>
             <widget name="MessageTreeList" type="HbTreeView">
                 <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
             </widget>
-            <real name="z" value="0"/>
-            <layout type="anchor">
-                <anchoritem dst="MessageListNoMessages" dstEdge="LEFT" spacing="4.77612un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="MessageListNoMessages" dstEdge="TOP" spacing="2.54478un" src="LabelGroupBox" srcEdge="BOTTOM"/>
-                <anchoritem dst="MessageListNoMessages" dstEdge="RIGHT" spacing="-5.22388un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="MessageTreeList" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="MessageTreeList" dstEdge="TOP" spacing="0un" src="LabelGroupBox" srcEdge="BOTTOM"/>
-                <anchoritem dst="MessageTreeList" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="MessageTreeList" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="LabelGroupBox" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="LabelGroupBox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="LineEdit" srcEdge="BOTTOM"/>
-                <anchoritem dst="LabelGroupBox" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="LineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-left) )" src="" srcEdge="LEFT"/>
-                <anchoritem dst="LineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="" srcEdge="TOP"/>
-                <anchoritem dst="LineEdit" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-middle-horizontal) )" src="PushButton" srcEdge="LEFT"/>
-                <anchoritem dst="PushButton" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="" srcEdge="TOP"/>
-                <anchoritem dst="PushButton" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-right) )" src="" srcEdge="RIGHT"/>
+            <real name="z" value="1"/>
+            <layout orientation="Vertical" spacing="0un" type="linear">
+                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                <linearitem itemname="MessageNoMessages"/>
+                <linearitem itemname="MessageTreeList"/>
+                <stretchitem stretchfactor="1"/>
+                <linearitem itemname="SearchPanel"/>
             </layout>
         </widget>
         <string name="title" value="Search"/>
     </widget>
     <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
-        <dummydata objectName="MessageTreeList" section="#common" value="0"/>
+        <dummydata objectName="MessageTreeList" section="#common" value="app_tree_template5"/>
     </metadata>
 </hbdocument>
--- a/emailuis/nmailui/inc/nmapplication.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmapplication.h	Fri Sep 03 14:07:42 2010 +0300
@@ -20,6 +20,7 @@
 
 #include <QStack>
 #include <QObject>
+#include <hbapplication.h>
 
 #include "nmuiviewids.h"
 
@@ -39,12 +40,15 @@
 class NmSettingsViewLauncher;
 class NmUiEffects;
 class HbMessageBox;
+class QTimer;
 
-class NmApplication : public QObject
+class NmApplication : public HbApplication
 {
     Q_OBJECT
 public:
-    NmApplication(QObject *parent, quint64 accountId=0);
+    
+    NmApplication(int &argc, char *argv[],
+                   Hb::ApplicationFlags flags = Hb::DefaultApplicationFlags );
     ~NmApplication();
     void enterNmUiView(NmUiStartParam *startParam);
     HbMainWindow* mainWindow();
@@ -102,6 +106,8 @@
     bool mBackButtonPressed;
     NmId mCurrentMailboxId;
     bool mApplicationHidden;
+    QTimer* mErrorNoteTimer;                // Owned
+    NmId mLastErrorMailboxId;
 };
 
 #endif // NMAPPLICATION_H
--- a/emailuis/nmailui/inc/nmmailboxlistviewitem.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmmailboxlistviewitem.h	Fri Sep 03 14:07:42 2010 +0300
@@ -32,7 +32,7 @@
 public: // from HbListViewItem
     HbListViewItem *createItem();
     void updateChildItems();
-    bool canSetModelIndex(const QModelIndex &index);
+    bool canSetModelIndex(const QModelIndex &index) const;
 
 protected:
     void polishEvent();
--- a/emailuis/nmailui/inc/nmmessagelistviewitem.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmmessagelistviewitem.h	Fri Sep 03 14:07:42 2010 +0300
@@ -49,6 +49,7 @@
     void setFonts(const QColor &colorRole, HbFontSpec &fontSpec);
     void getFontSizes();    
     QString senderFieldText(const NmMessageEnvelope &envelope);
+    bool event(QEvent *event);
     
 private:
     HbTextItem *mSender;      // Owned
--- a/emailuis/nmailui/inc/nmmessagesearchlistview.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmmessagesearchlistview.h	Fri Sep 03 14:07:42 2010 +0300
@@ -18,9 +18,10 @@
 #ifndef NMMESSAGESEARCHLISTVIEW_H_
 #define NMMESSAGESEARCHLISTVIEW_H_
 
-#include "nmbaseview.h"
+#include <QModelIndex>
 #include <nmactionobserver.h>
-#include <QModelIndex>
+#include "nmbaseview.h"
+
 
 class HbAbstractViewItem;
 class HbDocumentLoader;
@@ -30,6 +31,9 @@
 class HbMenu;
 class HbPushButton;
 class HbTreeView;
+class HbSearchPanel;
+class HbIcon;
+class HbShrinkingVkbHost;
 
 class NmActionResponse;
 class NmApplication;
@@ -57,9 +61,9 @@
 public: // From NmBaseView
 
     NmUiViewId nmailViewId() const;
+    void aboutToExitView();
     void viewReady();
 
-
 public: // From NmActionObserver
 
     void handleActionCommand(NmActionResponse &menuResponse);
@@ -69,21 +73,18 @@
 
     enum NmSearchInputMode {
         NmNormalMode = 0,
-        NmHighlightedMode,
         NmDimmedMode
     };
 
-
 private:
 
     void loadViewLayout();
     void initTreeView();
     void setViewTitle();
     void noMessagesLabelVisibility(bool visible);
-    void updateSearchResultCountInfo();
+    void updateResultView();
     void setSearchInputMode(NmSearchInputMode mode);
 
-
 public slots:
 
     void reloadViewContents(NmUiStartParam *startParam);
@@ -91,7 +92,6 @@
 
 private slots:
 
-    void criteriaChanged(QString text);
     void showItemContextMenu(HbAbstractViewItem *index, const QPointF &coords);
     void itemActivated(const QModelIndex &index);
     void handleSelection();
@@ -100,25 +100,35 @@
     void refreshList();
     void toggleSearch();
     void handleSearchComplete();
-
+    void textChanged(const QString &text);
+    void exitClicked();
+    void orientationAboutToChange();
+    void orientationChanged();
+    void sendSoftwareInputPanelRequest(QEvent::Type eventType = QEvent::RequestSoftwareInputPanel);
+    void vkbOpened();
+    void vkbClosed();
 
 private: // Data
 
     NmApplication &mApplication;
     NmUiEngine &mUiEngine;
     NmMessageListModel &mMsgListModel;
-    HbDocumentLoader *mDocumentLoader; // Owned
+    HbDocumentLoader *mDocumentLoader;          // Owned
     QObjectList mWidgetList;
-    HbMenu *mItemContextMenu; // Owned
-    HbTreeView *mMessageListWidget; // Not owned
-    HbGroupBox *mInfoLabel; // Not owned
-    HbLabel *mNoMessagesLabel; // Not owned
-    HbLineEdit *mLineEdit; // Not owned
-    HbPushButton *mPushButton; // Not owned
-    NmMessageListModelItem *mLongPressedItem; // Not owned
+    HbMenu *mItemContextMenu;                   // Owned
+    HbTreeView *mMessageList;                   // Not owned
+    HbLabel *mNoMessagesLabel;                  // Not owned
+    HbSearchPanel *mSearchPanel;                // Not owned
+    NmMessageListModelItem *mLongPressedItem;   // Not owned
+    HbPushButton *mProgressButton;              // Not owned
+    HbLineEdit *mLineEdit;                      // Not owned
 	QModelIndex mActivatedIndex;
     bool mViewReady;
     bool mSearchInProgress;
+    HbIcon *mSpinnerIcon;                       // Owned
+    bool mAnimationAddedToManger;
+    bool mSelectTextAfterOrientationChange;
+    HbShrinkingVkbHost *mVkbHost;               // Owned
 };
 
 
--- a/emailuis/nmailui/inc/nmuiheaders.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmuiheaders.h	Fri Sep 03 14:07:42 2010 +0300
@@ -47,7 +47,6 @@
 #include <QInputContext>
 
 // Orbit
-#include <hbapplication.h>
 #include <hbmainwindow.h>
 #include <hbaction.h>
 #include <hbmenu.h>
@@ -95,6 +94,10 @@
 #include <hbactivitymanager.h>
 #include <hbframebackground.h>
 #include <hbparameterlengthlimiter.h>
+#include <HbSearchPanel>
+#include <HbIconAnimationManager>
+#include <HbVkbHostBridge>
+#include <hbevent.h>
 
 #include <cntservicescontact.h>
 #include <xqservicerequest.h>
--- a/emailuis/nmailui/inc/nmviewerserviceinterface.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/inc/nmviewerserviceinterface.h	Fri Sep 03 14:07:42 2010 +0300
@@ -28,23 +28,36 @@
 class NmUiEngine;
 class NmId;
 
+
 class NmViewerServiceInterface : public XQServiceProvider
 {
     Q_OBJECT
+
 public:
+
     NmViewerServiceInterface(QObject *parent,
-                              NmApplication *application,
-                              NmUiEngine &uiEngine);
+                             NmApplication *application,
+                             NmUiEngine &uiEngine);
+    
     ~NmViewerServiceInterface();
 
 
 public slots:
+
+    /*!
+        Depricated!
+    */
     void viewMessage(QVariant mailboxId, QVariant folderId, QVariant messageId);
 
+    void viewMessage(QVariant idList, QVariant flags);
+
+
 private:
+
     NmApplication *mApplication; // Not owned
     NmUiEngine &mUiEngine;
     int mAsyncReqId;
 };
 
+
 #endif /* NMVIEWERSERVICEINTERFACE_H_ */
--- a/emailuis/nmailui/nmailui.pro	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/nmailui.pro	Fri Sep 03 14:07:42 2010 +0300
@@ -27,6 +27,30 @@
 QT += network
 MOC_DIR = moc
 
+#the following is for splash screen in phone
+BLD_INF_RULES.prj_exports += "resources/mail_messagelist.splashml   /epoc32/data/z/resource/hb/splashml/mail_messagelist.splashml" \
+                             "resources/mail_messagelist.docml      /epoc32/data/z/resource/hb/splashml/mail_messagelist.docml" \
+                             "resources/mail_editor.splashml        /epoc32/data/z/resource/hb/splashml/mail_editor.splashml" \
+                             "resources/mail_editor.docml           /epoc32/data/z/resource/hb/splashml/mail_editor.docml" \
+                             "resources/mail_viewer.splashml        /epoc32/data/z/resource/hb/splashml/mail_viewer.splashml" \
+                             "resources/mail_viewer.docml           /epoc32/data/z/resource/hb/splashml/mail_viewer.docml"
+
+#the following is for splash screen in winscw_udeb
+BLD_INF_RULES.prj_exports += "resources/mail_messagelist.splashml   /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_messagelist.splashml" \
+                             "resources/mail_messagelist.docml      /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_messagelist.docml" \
+                             "resources/mail_editor.splashml        /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_editor.splashml" \
+                             "resources/mail_editor.docml           /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_editor.docml" \
+                             "resources/mail_viewer.splashml        /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_viewer.splashml" \
+                             "resources/mail_viewer.docml           /epoc32/release/winscw/udeb/z/resource/hb/splashml/mail_viewer.docml"
+                             
+#the following is for splash screen in winscw_urel
+BLD_INF_RULES.prj_exports += "resources/mail_messagelist.splashml   /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_messagelist.splashml" \
+                             "resources/mail_messagelist.docml      /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_messagelist.docml" \
+                             "resources/mail_editor.splashml        /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_editor.splashml" \
+                             "resources/mail_editor.docml           /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_editor.docml" \
+                             "resources/mail_viewer.splashml        /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_viewer.splashml" \
+                             "resources/mail_viewer.docml           /epoc32/release/winscw/urel/z/resource/hb/splashml/mail_viewer.docml"
+                             
 LIBS += -leuser
 LIBS += -llibc
 LIBS += -lnmailbase
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_editor.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <object name="action" type="HbAction">
+        <string locid="txt_mail_button_attach" name="text"/>
+        <bool name="checkable" value="FALSE"/>
+        <bool name="enabled" value="TRUE"/>
+        <icon iconName="qtg_mono_attach" name="icon"/>
+        <bool name="visible" value="TRUE"/>
+    </object>
+    <object name="action_1" type="HbAction">
+        <string locid="txt_common_button_send" name="text"/>
+        <bool name="checkable" value="FALSE"/>
+        <bool name="enabled" value="FALSE"/>
+        <icon iconName="qtg_mono_send" name="icon"/>
+        <bool name="visible" value="TRUE"/>
+    </object>
+    <widget name="NmEditorView" type="HbView">
+        <widget name="content" role="HbView:widget" type="HbWidget">
+            <widget name="scrollArea" type="HbScrollArea">
+                <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
+                    <widget name="editorToField" type="HbWidget">
+                        <widget name="editorToLabel" type="HbLabel">
+                            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                            <sizehint height="7.5un" type="FIXED" width="12.5un"/>
+                            <string locid="txt_mail_editor_to" name="plainText"/>
+                            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        </widget>
+                        <widget name="editorToEdit" type="HbLineEdit">
+                            <enums name="alignment" value="AlignAbsolute"/>
+                            <bool name="adjustFontSizeToFitHeight" value="FALSE"/>
+                            <sizepolicy horizontalPolicy="MinimumExpanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                            <sizehint height="7.5un" type="MINIMUM"/>
+                            <bool name="enabled" value="TRUE"/>
+                        </widget>
+                        <widget name="editorToButton" type="HbPushButton">
+                            <icon iconName="qtg_mono_contacts" name="icon"/>
+                            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                            <sizehint height="7.5un" type="FIXED" width="9.5un"/>
+                            <string name="state" value="normal"/>
+                        </widget>
+                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+                        <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                        <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
+                            <contentsmargins bottom="0un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0un"/>
+                            <linearitem itemname="editorToLabel"/>
+                            <linearitem itemname="editorToEdit"/>
+                            <linearitem itemname="editorToButton"/>
+                        </layout>
+                    </widget>
+                    <widget name="editorSubjectField" type="HbWidget">
+                        <widget name="editorSubjectLabel" type="HbLabel">
+                            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                            <sizehint height="7.5un" type="FIXED" width="12.5un"/>
+                            <string locid="txt_mail_editor_subject" name="plainText"/>
+                            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                        </widget>
+                        <widget name="editorSubjectEdit" type="HbLineEdit">
+                            <sizehint type="PREFERRED" width="26.22948un"/>
+                            <sizehint type="MAXIMUM" width="2504062.01158un"/>
+                            <sizehint height="7.5un" type="MINIMUM" width="26.22948un"/>
+                        </widget>
+                        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+                        <sizehint type="PREFERRED" width="expr(var(hb-param-screen-width) )"/>
+                        <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
+                            <contentsmargins bottom="0un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0un"/>
+                            <linearitem itemname="editorSubjectLabel"/>
+                            <linearitem itemname="editorSubjectEdit"/>
+                        </layout>
+                    </widget>
+                    <real name="z" value="0"/>
+                    <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+                    <sizehint height="85.52239un" type="PREFERRED"/>
+                    <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
+                        <contentsmargins bottom="0un" left="0un" right="0un" top="var(hb-param-margin-gene-top)"/>
+                        <linearitem itemname="editorToField"/>
+                        <linearitem itemname="editorSubjectField"/>
+                    </layout>
+                </widget>
+                <enums name="scrollDirections" value="Vertical"/>
+                <enums name="verticalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
+                <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
+            </widget>
+            <layout type="anchor">
+                <anchoritem dst="scrollArea" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="scrollArea" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="scrollArea" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="scrollArea" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+            </layout>
+        </widget>
+        <widget name="NmEditorViewToolBar" role="HbView:toolBar" type="HbToolBar">
+            <ref object="action" role="HbWidget:addAction"/>
+            <ref object="action_1" role="HbWidget:addAction"/>
+        </widget>
+        <string name="title"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_editor.splashml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbsplash version="1">
+    <docml>mail_editor.docml</docml>
+    <widget>NmEditorView</widget>
+    <appuid>0x200255BA</appuid>
+    <tsappname>mail</tsappname>
+	<screenid>editor_screen</screenid>
+</hbsplash>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_messagelist.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <object name="action" type="HbAction">
+        <bool name="checkable" value="FALSE"/>
+        <bool name="enabled" value="TRUE"/>
+        <icon iconName="qtg_mono_search" name="icon"/>
+        <bool name="visible" value="TRUE"/>
+    </object>
+    <object name="action_1" type="HbAction">
+        <bool name="checkable" value="FALSE"/>
+        <bool name="enabled" value="TRUE"/>
+        <icon iconName="qtg_mono_create_email" name="icon"/>
+        <bool name="visible" value="TRUE"/>
+    </object>
+    <widget name="NmMessageListView" type="HbView">
+        <widget name="content" role="HbView:widget" type="HbWidget">
+            <widget name="labelGroupBox" type="HbGroupBox">
+                <sizehint height="6un" type="PREFERRED" width="52un"/>
+                <bool name="collapsable" value="FALSE"/>
+                <bool name="enabled" value="TRUE"/>
+				<bool name="visible" value="TRUE"/>
+				<string name="heading" value=" "/>
+            </widget>
+            <real name="z" value="0"/>
+            <layout type="anchor">
+                <anchoritem dst="labelGroupBox" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="labelGroupBox" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="labelGroupBox" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+            </layout>
+        </widget>
+        <widget name="NmMessageListViewToolBar" role="HbView:toolBar" type="HbToolBar">
+            <ref object="action" role="HbWidget:addAction"/>
+            <ref object="action_1" role="HbWidget:addAction"/>
+        </widget>
+        <string name="title"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_messagelist.splashml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbsplash version="1">
+    <docml>mail_messagelist.docml</docml>
+    <widget>NmMessageListView</widget>
+    <appuid>0x200255BA</appuid>
+    <tsappname>mail</tsappname>
+	<screenid>messagelist_screen</screenid>
+</hbsplash>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_viewer.docml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+    <widget name="NmViewerView" type="HbView">
+        <widget name="container" role="HbView:widget" type="HbWidget">
+            <widget name="groupBox" type="HbGroupBox">
+                <widget name="label" role="HbGroupBox:contentWidget" type="HbLabel">
+                    <real name="z" value="1"/>
+                    <string name="plainText"/>
+                </widget>
+                <real name="z" value="1"/>
+                <sizehint type="PREFERRED" width="25un"/>
+                <string name="heading" value=" "/>
+                <bool name="collapsable" value="TRUE"/>
+                <bool name="collapsed" value="TRUE"/>
+            </widget>
+            <real name="z" value="1"/>
+            <layout type="anchor">
+                <anchoritem dst="groupBox" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="groupBox" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="groupBox" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+            </layout>
+        </widget>
+        <string name="title"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailui/resources/mail_viewer.splashml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbsplash version="1">
+    <docml>mail_viewer.docml</docml>
+    <widget>NmViewerView</widget>
+    <appuid>0x200255BA</appuid>
+    <tsappname>mail</tsappname>
+	<screenid>viewer_screen</screenid>
+</hbsplash>
--- a/emailuis/nmailui/src/main.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/main.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -15,40 +15,36 @@
  *
  */
 
+#include <hbsplashscreen.h>
 #include "nmuiheaders.h"
-
-const QString NmActivityName("EmailInboxView");
+#include "nmapplication.h"
 
 /*!
     The main function.
  */
 int main(int argc, char *argv[])
 {
-    HbApplication app(argc,argv,Hb::NoSplash);
-    
-    // Load the translation file.
-    QTranslator translator;
-    QString lang = QLocale::system().name();
-    QString appName = "mail_";
-    QString path = "Z:/resource/qt/translations/";
-    translator.load(appName + lang, path);
-    app.installTranslator(&translator);
-    
-    app.setApplicationName(hbTrId("txt_mail_title_mail"));
-    
-    NmApplication *nmApplication = NULL;
-    quint64 accountId = 0;
-    QString activateId = app.activateId();
-    if (app.activateReason() == Hb::ActivationReasonActivity &&
-            activateId.startsWith(NmActivityName) ) {
-        QString accountIdString = activateId.mid(NmActivityName.length());
-        accountId = accountIdString.toULongLong();
-        nmApplication = new NmApplication(&app,accountId);
+    // Decide which splash screen to show.
+    if (!XQServiceUtil::isService(argc,argv)) {
+        HbSplashScreen::setScreenId("messagelist_screen");        
     } else {
-        nmApplication = new NmApplication(&app);
+        QString interfaceName = XQServiceUtil::interfaceName(argc,argv);
+        
+        if (interfaceName == XQI_EMAIL_MESSAGE_SEND || 
+            interfaceName == XQI_URI_VIEW ||
+            interfaceName == XQI_FILE_SHARE) {
+            HbSplashScreen::setScreenId("editor_screen");
+        }
+        else if (interfaceName == XQI_EMAIL_MESSAGE_VIEW) {
+            HbSplashScreen::setScreenId("viewer_screen");
+        }
+        else if (interfaceName == XQI_EMAIL_INBOX_VIEW) {
+            HbSplashScreen::setScreenId("messagelist_screen");
+        }
     }
     
+    NmApplication app(argc,argv);
+
     int ret = app.exec();
-    delete nmApplication;
     return ret;
 }
--- a/emailuis/nmailui/src/nmapplication.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmapplication.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -16,12 +16,11 @@
  */
 
 #include "nmuiheaders.h"
-#include <email_services_api.h>
 #include <e32base.h>
 
 static const QString NmSendServiceName = "nmail.com.nokia.symbian.IFileShare";
-
 static const QString NmActivityName = "EmailInboxView";
+static const int NmErrorNoteDelay = 300000;
 
 /*!
     \class NmApplication
@@ -32,8 +31,8 @@
 /*!
     Constructor.
 */
-NmApplication::NmApplication(QObject *parent, quint64 accountId)
-: QObject(parent),
+NmApplication::NmApplication(int &argc, char *argv[], Hb::ApplicationFlags flags)
+: HbApplication(argc,argv,flags),
   mMainWindow(NULL),
   mViewStack(NULL),
   mActiveViewId(NmUiViewNone),
@@ -49,10 +48,28 @@
   mViewReady(false),
   mQueryDialog(NULL),
   mBackButtonPressed(false),
-  mApplicationHidden(false)
+  mApplicationHidden(false),
+  mErrorNoteTimer(NULL)
 {
+    // Load the translation file.
+    QTranslator *translator = new QTranslator(this);
+    QString lang = QLocale::system().name();
+    QString appName = "mail_";
+    QString path = "Z:/resource/qt/translations/";
+    translator->load(appName + lang, path);
+    installTranslator(translator);
+    setApplicationName(hbTrId("txt_mail_title_mail"));
+    
+    quint64 accountId = 0;
+    QString activateId = this->activateId();
+    if (activateReason() == Hb::ActivationReasonActivity &&
+        activateId.startsWith(NmActivityName) ) {
+        QString accountIdString = activateId.mid(NmActivityName.length());
+        accountId = accountIdString.toULongLong();
+    }
+            
     TRAP_IGNORE(mUiEngine = NmUiEngine::instance());
-    
+        
     // Create network access manager and cache for application use.
     mNetManager = new NmViewerViewNetManager(*mUiEngine);
     QNetworkDiskCache *cache = new QNetworkDiskCache();
@@ -85,7 +102,7 @@
     
     mEffects = new NmUiEffects(*mMainWindow);
     
-    QObject::connect(parent, SIGNAL(activate()), this, SLOT(activityActivated()));
+    QObject::connect(this, SIGNAL(activate()), this, SLOT(activityActivated()));
 }
 
 
@@ -377,10 +394,7 @@
     taskSettings.setVisibility(false);
     
     // Remove also the mailbox item from the task switcher
-    HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
-    if (hbApp) {
-        hbApp->activityManager()->removeActivity(NmActivityName);
-    }
+    activityManager()->removeActivity(NmActivityName);
 }
 
 
@@ -408,8 +422,13 @@
 
             // Move the application to background if closing the message list view
             if (topViewId == NmUiViewMessageList && mViewStack->size() == 1) {
-                hideApplication();
-                return;
+                
+                // if the application has been started as embedded service,
+                // we must close it. Otherwise we cannot return back to the calling application.
+                if (!XQServiceUtil::isEmbedded()) {
+                    hideApplication();
+                    return;
+                }
             }
 
             mViewStack->pop();
@@ -626,8 +645,7 @@
 {
     NM_FUNCTION;
     
-    HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
-    hbApp->activityManager()->removeActivity("EmailInboxView");
+    activityManager()->removeActivity(NmActivityName);
     
     delete mSendServiceInterface;
     mSendServiceInterface = NULL;
@@ -741,7 +759,25 @@
         }
         // Following applies to all operation/event types.
         if (event.mCompletionCode == NmConnectionError) {
-            NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_mail_connection_error"));
+            // Create error note delayer timer when used for the first time
+            if (!mErrorNoteTimer) {
+                mErrorNoteTimer = new QTimer(this);
+            }
+            // Check whether mailbox id has changed, stop
+            // timer in that case and note will be displayed even
+            // before 5min delay has passed
+            if (mLastErrorMailboxId != event.mMailboxId) {
+                mErrorNoteTimer->stop();
+            }
+            // Store mailbox id
+            mLastErrorMailboxId = event.mMailboxId;
+            // Show error note if timer is not active, e.g 5 minutes 
+            // have passed since last "mail connection error".
+            if (!mErrorNoteTimer->isActive()) {
+                NmUtilities::displayErrorNote(hbTrId("txt_mail_dialog_mail_connection_error"));            
+                // Start timer with 5 min timeout
+                mErrorNoteTimer->start(NmErrorNoteDelay);
+            }
         }
     }
 }
@@ -797,28 +833,25 @@
 void NmApplication::updateActivity()
 {
     NmMailboxMetaData *meta = mUiEngine->mailboxById(mCurrentMailboxId);
-    HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
-
-    if (hbApp) {
-        // This will ensure that when service is started as a embedded service and a mail 
-        // process already exists the task activity will show the embedded service inside the 
-        // calling processes activity and the already running mail process in its own activity.
-        if(!XQServiceUtil::isService() || !XQServiceUtil::isEmbedded()) {
-            if (meta) {
-                TsTaskSettings tasksettings;
-                tasksettings.setVisibility(false);
-                QVariantHash metadata;
-                metadata.insert(ActivityScreenshotKeyword, QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
-                metadata.insert(ActivityApplicationName, meta->name());
-                metadata.insert(ActivityVisibility, true);
-                hbApp->activityManager()->removeActivity(NmActivityName);
-                hbApp->activityManager()->addActivity(NmActivityName, QVariant(), metadata);
-            }
-            else {
-                hbApp->activityManager()->removeActivity(NmActivityName);
-                TsTaskSettings tasksettings;
-                tasksettings.setVisibility(true);
-            }
+    
+    // This will ensure that when service is started as a embedded service and a mail 
+    // process already exists the task activity will show the embedded service inside the 
+    // calling processes activity and the already running mail process in its own activity.
+    if(!XQServiceUtil::isService() || !XQServiceUtil::isEmbedded()) {
+        if (meta) {
+            TsTaskSettings tasksettings;
+            tasksettings.setVisibility(false);
+            QVariantHash metadata;
+            metadata.insert(ActivityScreenshotKeyword, QPixmap::grabWidget(mainWindow(), mainWindow()->rect()));
+            metadata.insert(ActivityApplicationName, meta->name());
+            metadata.insert(ActivityVisibility, true);
+            activityManager()->removeActivity(NmActivityName);
+            activityManager()->addActivity(NmActivityName, QVariant(), metadata);
+        }
+        else {
+            activityManager()->removeActivity(NmActivityName);
+            TsTaskSettings tasksettings;
+            tasksettings.setVisibility(true);
         }
     }
 }
@@ -828,18 +861,15 @@
 */
 void NmApplication::activityActivated()
 {
-    HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
-    if (hbApp) {
-        quint64 accountId(0);
-        QString activateId = hbApp->activateId();
-        if (hbApp->activateReason() == Hb::ActivationReasonActivity &&
-                activateId.startsWith(NmActivityName) ) {
-            QString accountIdString = activateId.mid(NmActivityName.length());
-            accountId = accountIdString.toULongLong();
-            QVariant mailbox;
-            mailbox.setValue(accountId);
-            mMailboxServiceInterface->displayInboxByMailboxId(mailbox);
-        }
+    quint64 accountId(0);
+    QString activateId = this->activateId();
+    if (activateReason() == Hb::ActivationReasonActivity &&
+            activateId.startsWith(NmActivityName) ) {
+        QString accountIdString = activateId.mid(NmActivityName.length());
+        accountId = accountIdString.toULongLong();
+        QVariant mailbox;
+        mailbox.setValue(accountId);
+        mMailboxServiceInterface->displayInboxByMailboxId(mailbox);
     }
 }
 
--- a/emailuis/nmailui/src/nmattachmentpicker.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmattachmentpicker.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -156,12 +156,12 @@
         if (args) {
             mRequest->setArguments(*args);
         }
-        // Set the title for the picker window
-        // Title setting disabled
-        //QVariant title(mTitle);
-        //XQRequestInfo info;
-        //info.setInfo(XQINFO_KEY_WINDOW_TITLE, title);
-        //mRequest->setInfo(info);
+        // Set the title pane text for the picker window
+		// sub-title comes from the pickers
+        QVariant title(mTitle);
+        XQRequestInfo info;
+        info.setInfo(XQINFO_KEY_WINDOW_TITLE, title);
+        mRequest->setInfo(info);
 
         connect(mRequest, SIGNAL(requestOk(const QVariant&)),
                 this, SIGNAL(attachmentsFetchOk(const QVariant&)));
@@ -184,7 +184,7 @@
     if (itemText == hbTrId("txt_mail_list_photo")) {
         fetchImage();
     }
-    else if (itemText == hbTrId("txt_mail_list_music")) {
+    else if (itemText == hbTrId("txt_mail_list_sound")) {
         fetchAudio();
 	}
     else if (itemText == hbTrId("txt_mail_list_video")) {
--- a/emailuis/nmailui/src/nmeditorcontent.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorcontent.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -221,30 +221,34 @@
 {
     NM_FUNCTION;
     
-    // the height of the margin between the title bar and the header
-    qreal topMargin = 0;
-    HbStyle().parameter("hb-param-margin-gene-top", topMargin);
+    HbStyle* style = mScrollAreaContents->style();
+    
+    if (style) {
+        // the height of the margin between the title bar and the header
+        qreal topMargin = 0;
+        style->parameter("hb-param-margin-gene-top", topMargin);
+        
+        // header height
+        qreal headerHeight = mHeader->headerHeight();
+    
+        // body area editor's document height with margins added
+        qreal documentHeightAndMargins = mEditorWidget->document()->size().height() +
+            (mEditorWidget->document()->documentMargin() * 2);
     
-    // header height
-    qreal headerHeight = mHeader->headerHeight();
-
-    // body area editor's document height with margins added
-    qreal documentHeightAndMargins = mEditorWidget->document()->size().height() +
-        (mEditorWidget->document()->documentMargin() * 2);
-
-    // chrome height
-    qreal chromeHeight = 0;
-    HbStyle().parameter("hb-param-widget-chrome-height", chromeHeight);
+        // chrome height
+        qreal chromeHeight = 0;
+        style->parameter("hb-param-widget-chrome-height", chromeHeight);
+        
+        // screen height
+        qreal screenHeight = mApplication.screenSize().height();
     
-    // screen height
-    qreal screenHeight = mApplication.screenSize().height();
-
-    // set min size for the body area so that at least the screen area is always filled
-    qreal bodyAreaMinSize = screenHeight - chromeHeight - topMargin - headerHeight;
-    
-    qreal bodyAreaSize = fmax(bodyAreaMinSize, documentHeightAndMargins);
-
-    mScrollAreaContents->setPreferredHeight(topMargin + headerHeight + bodyAreaSize);
+        // set min size for the body area so that at least the screen area is always filled
+        qreal bodyAreaMinSize = screenHeight - chromeHeight - topMargin - headerHeight;
+        
+        qreal bodyAreaSize = fmax(bodyAreaMinSize, documentHeightAndMargins);
+        
+        mScrollAreaContents->setPreferredHeight(topMargin + headerHeight + bodyAreaSize);
+    }
 }
 
 /*!
@@ -301,7 +305,7 @@
             QPointF bottomRightPos =
                 focused->mapToItem(mScrollAreaContents, localRect.bottomRight());
             qreal marginRight = 0;
-            HbStyle().parameter("hb-param-margin-gene-right", marginRight);
+            mScrollArea->style()->parameter("hb-param-margin-gene-right", marginRight);
             bottomRightPos.rx() += marginRight;
             mScrollArea->ensureVisible(topLeftPos);
             mScrollArea->ensureVisible(bottomRightPos);
@@ -330,8 +334,8 @@
     
     // Get the layout's left margin
     qreal margin = 0;
-    HbStyle().parameter("hb-param-margin-gene-left", margin);
-    
+    HbInstance::instance()->style()->parameter("hb-param-margin-gene-left", margin);
+
     // Calculate header width. (Screen width minus left and right margins.
     qreal headerWidth = mApplication.screenSize().width() - margin - margin;
 
--- a/emailuis/nmailui/src/nmeditorheader.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorheader.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -203,7 +203,7 @@
 
     // get the layout's vertical spacing
     qreal spacing = 0;
-    HbStyle().parameter("hb-param-margin-gene-middle-vertical", spacing);
+    HbInstance::instance()->style()->parameter("hb-param-margin-gene-middle-vertical", spacing);
 
     // calculate the height
     qreal height = 0;
--- a/emailuis/nmailui/src/nmeditorview.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorview.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -62,7 +62,7 @@
 {
     NM_FUNCTION;
     
-    mDocumentLoader	= new HbDocumentLoader();
+    mDocumentLoader	= new NmUiDocumentLoader( mApplication.mainWindow() );
     // Set object name
     setObjectName("NmEditorView");
     // call the createToolBar on load view layout
@@ -222,10 +222,12 @@
 void NmEditorView::showChrome(bool show)
 {
     if (show) {
-        showItems(Hb::StatusBarItem | Hb::TitleBarItem | Hb::ToolBarItem);
+        setContentFullScreen(false);
+        showItems(Hb::ToolBarItem);
     }
     else {
-        hideItems(Hb::StatusBarItem | Hb::TitleBarItem | Hb::ToolBarItem);
+        setContentFullScreen(true);
+        hideItems(Hb::ToolBarItem);
     }
 }
 
@@ -933,7 +935,7 @@
                     mTBExtnContentWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
                     
                     mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_photo"));
-                    mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_music"));
+                    mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_sound"));
                     mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_video"));
                     mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_other"));
                     mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_new_photo"));
@@ -1549,7 +1551,8 @@
     int error = NmUtilities::openFile(file);
     file.close();
     if ( error == NmNotFoundError ) {
-        NmUtilities::displayErrorNote(hbTrId("txt_mail_dialog_unable_to_open_attachment_file_ty")); 
+        HbMessageBox *box = NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_unable_to_open_attachment_file_ty"));
+        box->setAttribute(Qt::WA_DeleteOnClose); 
     }
 }
 
--- a/emailuis/nmailui/src/nmmailboxlistviewitem.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmmailboxlistviewitem.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -114,7 +114,7 @@
 /*!
     boolean value indicating model index availability
 */
-bool NmMailboxListViewItem::canSetModelIndex(const QModelIndex &index)
+bool NmMailboxListViewItem::canSetModelIndex(const QModelIndex &index) const
 {
     NM_FUNCTION;
     
--- a/emailuis/nmailui/src/nmmessagelistview.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagelistview.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -117,11 +117,7 @@
             mMessageListWidget->setClampingStyle(HbScrollArea::BounceBackClamping);
             mMessageListWidget->setFrictionEnabled(true);
             mMessageListWidget->setItemPixmapCacheEnabled(true);
-            
-            // Enable animations to display an email as soon as it is added to
-            // the list.
-            mMessageListWidget->setEnabledAnimations(HbAbstractItemView::Appear &
-                                                     HbAbstractItemView::Expand);
+            mMessageListWidget->setEnabledAnimations(HbAbstractItemView::All);
         }
         else {
             NM_ERROR(1,"nmailui: list object loading failed");
@@ -296,11 +292,10 @@
     NM_FUNCTION;
 
     if (mMessageListModel) {
-        NmId mailboxId = mStartParam->mailboxId();
-
         // In each refresh, e.g. in folder change the UI signals lower layer
         // about the folder that has been opened.
-        if (mStartParam){
+        if (mStartParam) {
+            NmId mailboxId = mStartParam->mailboxId();
             mUiEngine.updateActiveFolder(mailboxId, mStartParam->folderId());
 
             NmFolderType folderType(NmFolderInbox);
@@ -313,33 +308,33 @@
             if (folderType == NmFolderInbox) {
                 mIsFirstSyncInMessageList = true;
             }
+ 
+            // Set item model to message list widget
+            if (mMessageListWidget) {
+                mMessageListWidget->setModel(static_cast<QStandardItemModel*>(mMessageListModel));
+    
+                QObject::connect(mMessageListModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)),
+                    this, SLOT(itemsAdded(const QModelIndex&,int,int)),Qt::UniqueConnection);
+                QObject::connect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
+                    this, SLOT(itemsRemoved()),Qt::UniqueConnection);
+                QObject::connect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
+                    this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
+    
+                mPreviousModelCount = mMessageListModel->rowCount();
+    
+                if (mPreviousModelCount == 0) {
+                    showNoMessagesText();
+                }
+                else {
+                    hideNoMessagesText();
+                }
+            }
+    
+            // Notify the mail agent. 
+            NmUiEventsNotifier::notifyViewStateChanged(NmUiEventsNotifier::NmViewShownEvent,
+                                                       NmUiViewMessageList,
+                                                       mailboxId);
         }
-
-        // Set item model to message list widget
-        if (mMessageListWidget) {
-            mMessageListWidget->setModel(static_cast<QStandardItemModel*>(mMessageListModel));
-
-            QObject::connect(mMessageListModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)),
-                this, SLOT(itemsAdded(const QModelIndex&,int,int)),Qt::UniqueConnection);
-            QObject::connect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
-                this, SLOT(itemsRemoved()),Qt::UniqueConnection);
-            QObject::connect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
-                this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
-
-            mPreviousModelCount=mMessageListModel->rowCount();
-
-            if (mPreviousModelCount == 0) {
-                showNoMessagesText();
-            }
-            else {
-                hideNoMessagesText();
-            }
-        }
-
-        // Notify the mail agent. 
-        NmUiEventsNotifier::notifyViewStateChanged(NmUiEventsNotifier::NmViewShownEvent,
-                                                   NmUiViewMessageList,
-                                                   mStartParam->mailboxId());
     }
 }
 
--- a/emailuis/nmailui/src/nmmessagelistviewitem.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagelistviewitem.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -355,3 +355,24 @@
     }
     return ret;
 }
+
+/*!
+    Handle font color changes in the case of theme change
+ */ 
+bool NmMessageListViewItem::event(QEvent *event)
+{
+    bool ret = HbTreeViewItem::event(event);    
+    if (event && event->type() == HbEvent::ThemeChanged) {
+        NmMessageListModelItem *msgModelItem(NULL);
+        msgModelItem = modelIndex().data(
+            Qt::DisplayRole).value<NmMessageListModelItem*>();
+        if (msgModelItem && !msgModelItem->envelope().isRead()) {
+            setFontsUnread();
+        }
+        else if (msgModelItem) {
+            setFontsRead();
+        }
+    }
+    return ret;
+}
+
--- a/emailuis/nmailui/src/nmmessagesearchlistview.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagesearchlistview.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -15,16 +15,19 @@
 *
 */
 
-static const char *NMUI_MESSAGE_SEARCH_LIST_VIEW_XML = ":/docml/nmmessagesearchlistview.docml";
-static const char *NMUI_MESSAGE_SEARCH_LIST_VIEW = "NmMessageSearchListView";
-static const char *NMUI_MESSAGE_SEARCH_LIST_TREE_LIST = "MessageTreeList";
-static const char *NMUI_MESSAGE_SEARCH_LIST_NO_MESSAGES = "MessageListNoMessages";
-static const char *NMUI_MESSAGE_SEARCH_LIST_INFO_LABEL = "LabelGroupBox";
-static const char *NMUI_MESSAGE_SEARCH_LIST_LINE_EDIT = "LineEdit";
-static const char *NMUI_MESSAGE_SEARCH_LIST_PUSH_BUTTON = "PushButton";
+#include "nmuiheaders.h"
 
+static const char *NMUI_MESSAGE_SEARCH_VIEW_XML = ":/docml/nmmessagesearchlistview.docml";
+static const char *NMUI_MESSAGE_SEARCH_VIEW = "NmMessageSearchView";
+static const char *NMUI_MESSAGE_SEARCH_MESSAGE_TREE_LIST= "MessageTreeList";
+static const char *NMUI_MESSAGE_SEARCH_PANEL = "SearchPanel";
+static const char *NMUI_MESSAGE_SEARCH_NO_MESSAGES = "MessageNoMessages";
 
-#include "nmuiheaders.h"
+static const QString NmSearchListViewProgressButton("progressbutton");
+static const QString NmSearchListViewLineEdit("lineedit");
+
+static const QString NmSearchListViewSpinnerAnimation("qtg_anim_mono_loading");
+static const QString NmSearchListViewSpinnerImage("qtg_anim_mono_loading_1");
 
 
 /*!
@@ -49,19 +52,40 @@
   mMsgListModel(msgListModel),
   mDocumentLoader(documentLoader),
   mItemContextMenu(NULL),
-  mMessageListWidget(NULL),
-  mInfoLabel(NULL),
+  mMessageList(NULL),
   mNoMessagesLabel(NULL),
+  mSearchPanel(NULL),
+  mLongPressedItem(NULL),
+  mProgressButton(NULL),
   mLineEdit(NULL),
-  mPushButton(NULL),
-  mLongPressedItem(NULL),
   mViewReady(false),
-  mSearchInProgress(false)
+  mSearchInProgress(false),
+  mSpinnerIcon(NULL),
+  mAnimationAddedToManger(false),
+  mSelectTextAfterOrientationChange(false),
+  mVkbHost(NULL)
 {
     NM_FUNCTION;
     
     loadViewLayout();
     initTreeView();
+
+    // Add spinner animation axml to animation manager.
+    HbIconAnimationManager *animationManager = HbIconAnimationManager::global();
+    if (animationManager) {
+        mAnimationAddedToManger =
+            animationManager->addDefinitionFile(NmSearchListViewSpinnerAnimation);
+    }
+
+    HbMainWindow *mainWindow = mApplication.mainWindow();
+    connect(mainWindow, SIGNAL(aboutToChangeOrientation()),
+            this, SLOT(orientationAboutToChange()));
+    connect(mainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
+            this, SLOT(orientationChanged()));
+
+    mVkbHost = new HbShrinkingVkbHost(this);
+    connect(mVkbHost, SIGNAL(keypadOpened()), this, SLOT(vkbOpened()));
+    connect(mVkbHost, SIGNAL(keypadClosed()), this, SLOT(vkbClosed()));
 }
 
 
@@ -71,7 +95,7 @@
 NmMessageSearchListView::~NmMessageSearchListView()
 {
     NM_FUNCTION;
-    
+    delete mSpinnerIcon;
     delete mDocumentLoader;
 
     mWidgetList.clear();
@@ -81,6 +105,7 @@
     }
 
     delete mItemContextMenu;
+    delete mVkbHost;
 }
 
 
@@ -102,6 +127,21 @@
 /*!
     From NmBaseView.
 
+    Makes necessary activities before view can exit.
+*/
+void NmMessageSearchListView::aboutToExitView()
+{
+    NM_FUNCTION;
+    if (mSearchInProgress) {
+       // Search is in progress - do cancel.
+       mUiEngine.cancelSearch(mStartParam->mailboxId());
+       mSearchInProgress = false;
+    }
+}
+
+/*!
+    From NmBaseView.
+
     Does the lazy loading after the view layout has been loaded.
 */
 void NmMessageSearchListView::viewReady()
@@ -115,8 +155,11 @@
         // Refresh the list.
         QMetaObject::invokeMethod(this, "refreshList", Qt::QueuedConnection);
 
-        // Highlight the search input.
-        setSearchInputMode(NmHighlightedMode);
+        // Undim search field.
+        setSearchInputMode(NmNormalMode);
+
+        // Open VKB
+        QMetaObject::invokeMethod(this, "sendSoftwareInputPanelRequest", Qt::QueuedConnection);
 
         mViewReady = true;
     }
@@ -154,6 +197,11 @@
     // Handle context menu commands here.
     if (actionResponse.menuType() == NmActionContextMenu) {
         if (mLongPressedItem){
+
+            // Hide VKB
+            vkbClosed();
+            sendSoftwareInputPanelRequest(QEvent::CloseSoftwareInputPanel);
+
             NmUiStartParam *startParam = new NmUiStartParam(NmUiViewMessageViewer,
                 mStartParam->mailboxId(), mLongPressedItem->envelope().folderId(),
                 mLongPressedItem->envelope().messageId());
@@ -176,7 +224,7 @@
     
     // Use the document loader to load the view layout.
     bool ok(false);
-    setObjectName(QString(NMUI_MESSAGE_SEARCH_LIST_VIEW));
+    setObjectName(QString(NMUI_MESSAGE_SEARCH_VIEW));
     QObjectList objectList;
     objectList.append(this);
 
@@ -184,74 +232,74 @@
     // document loader uses this view when the docml file is parsed.
     if (mDocumentLoader) {
         mDocumentLoader->setObjectTree(objectList);
-        mWidgetList = mDocumentLoader->load(NMUI_MESSAGE_SEARCH_LIST_VIEW_XML, &ok);
+        mWidgetList = mDocumentLoader->load(NMUI_MESSAGE_SEARCH_VIEW_XML, &ok);
     }
 
     if (ok) {
-        // Load the search panel (contains the line edit and the push button
-        // widgets.
-        mLineEdit = qobject_cast<HbLineEdit *>(
-            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_LINE_EDIT));
+        // Load the search panel
+        mSearchPanel = qobject_cast<HbSearchPanel *>(
+            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_PANEL));
 
-        if (mLineEdit) {
-            connect(mLineEdit, SIGNAL(textChanged(QString)), 
-                    this, SLOT(criteriaChanged(QString)));
-        }
-    
-        mPushButton = qobject_cast<HbPushButton *>(
-        mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_PUSH_BUTTON));
+        if (mSearchPanel) {
+            mSearchPanel->setProgressive(false);
+            mSearchPanel->setCancelEnabled(true);
 
-        if (mPushButton) {
-            // button is disabled when line edit is empty
-            mPushButton->setEnabled(false);
-
-            // The push button both starts and stops the search.
-            connect(mPushButton, SIGNAL(clicked()), this, SLOT(toggleSearch()));
-            mPushButton->setIcon(HbIcon("qtg_mono_search"));
-        }
+            foreach(QGraphicsItem *obj, mSearchPanel->childItems()) {
+                QGraphicsWidget *const widget = static_cast<QGraphicsWidget *>(obj);
+                if (widget) {
+                    QString objectName(widget->objectName());
+                    if (objectName == NmSearchListViewProgressButton) {
+                        mProgressButton = qobject_cast<HbPushButton *>(widget);
+                        mProgressButton->setIcon(HbIcon("qtg_mono_search"));
+                        mProgressButton->setEnabled(false);
+                    }
+                    else if(objectName == NmSearchListViewLineEdit) {
+                        mLineEdit = qobject_cast<HbLineEdit *>(widget);
+                        mLineEdit->setInputMethodHints(Qt::ImhNoPredictiveText);
+                        connect(mLineEdit, SIGNAL(textChanged(const QString &)),
+                                this, SLOT(textChanged(const QString &)));
+                    }
+                }
+            }
 
-        // Load the info label.
-        mInfoLabel = qobject_cast<HbGroupBox *>(
-            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_INFO_LABEL));
+            connect(mSearchPanel, SIGNAL(criteriaChanged(const QString &)),
+                    this, SLOT(toggleSearch()));
 
-        if (mInfoLabel) {
-            NM_COMMENT("NmMessageSearchListView: info label loaded");
+            connect(mSearchPanel, SIGNAL(exitClicked()),
+                    this, SLOT(exitClicked()), Qt::QueuedConnection);
 
-            // If the heading is empty, the widget will not be shown which in
-            // turn would ruin the layout.
-            mInfoLabel->setHeading(" ");
         }
 
         // Get the message list widget.
-        mMessageListWidget = qobject_cast<HbTreeView *>(
-            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_TREE_LIST));
+        mMessageList = qobject_cast<HbTreeView *>(
+            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_MESSAGE_TREE_LIST));
 
-        if (mMessageListWidget) {
+        if (mMessageList) {
             NM_COMMENT("NmMessageSearchListView: message list widget loaded");
 
             // Set the item prototype.
-            mMessageListWidget->setItemPrototype(new NmMessageListViewItem());
+            mMessageList->setItemPrototype(new NmMessageListViewItem());
 
             // Set the list widget properties.
-            mMessageListWidget->setItemRecycling(true);
-            mMessageListWidget->contentWidget()->setProperty("indentation", 0);
-            mMessageListWidget->setScrollDirections(Qt::Vertical);
-            mMessageListWidget->setClampingStyle(HbScrollArea::BounceBackClamping);
-            mMessageListWidget->setFrictionEnabled(true);
-            mMessageListWidget->setItemPixmapCacheEnabled(true);
+            mMessageList->setItemRecycling(true);
+            mMessageList->contentWidget()->setProperty("indentation", 0);
+            mMessageList->setScrollDirections(Qt::Vertical);
+            mMessageList->setClampingStyle(HbScrollArea::BounceBackClamping);
+            mMessageList->setFrictionEnabled(true);
+            mMessageList->setItemPixmapCacheEnabled(true);
             
             // We want the search results to appear one by one.
-            mMessageListWidget->setEnabledAnimations(HbAbstractItemView::Appear &
-                                                     HbAbstractItemView::Expand);
+            mMessageList->setEnabledAnimations(HbAbstractItemView::Appear &
+                HbAbstractItemView::Expand);
         }
 
         // Load the no messages label.
         mNoMessagesLabel = qobject_cast<HbLabel *>(
-            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_LIST_NO_MESSAGES));
+            mDocumentLoader->findWidget(NMUI_MESSAGE_SEARCH_NO_MESSAGES));
 
         if (mNoMessagesLabel) {
             NMLOG("NmMessageSearchListView: No messages label loaded.");
-            mNoMessagesLabel->hide();
+            mNoMessagesLabel->setMaximumHeight(0);
         }
     }
     else {
@@ -268,14 +316,14 @@
     NM_FUNCTION;
     
     // Get the mailbox widget pointer and set the parameters.
-    if (mMessageListWidget) {
-        connect(mMessageListWidget, SIGNAL(activated(const QModelIndex &)),
+    if (mMessageList) {
+        connect(mMessageList, SIGNAL(activated(const QModelIndex &)),
                 this, SLOT(itemActivated(const QModelIndex &)));
 
-        connect(mMessageListWidget, SIGNAL(longPressed(HbAbstractViewItem*, QPointF)),
+        connect(mMessageList, SIGNAL(longPressed(HbAbstractViewItem*, QPointF)),
                 this, SLOT(showItemContextMenu(HbAbstractViewItem*, QPointF)));
 
-        mMessageListWidget->setFocus();
+        mMessageList->setFocus();
         mItemContextMenu = new HbMenu();
     }
 
@@ -314,60 +362,42 @@
     
     if (visible) {
         // Hide the message list widget and display the "no messages" label.
-        if (mMessageListWidget) {
-            mMessageListWidget->hide();
+        if (mMessageList) {
+            mMessageList->setMaximumHeight(0);
+            mMessageList->hide();
         }
 
         if (mNoMessagesLabel && !mNoMessagesLabel->isVisible()) {
+            mNoMessagesLabel->setMaximumHeight(QWIDGETSIZE_MAX);
             mNoMessagesLabel->show();
         }
     }
     else {
         // Hide the "no messages" label and display the message list widget.
         if (mNoMessagesLabel && mNoMessagesLabel->isVisible()) {
+            mNoMessagesLabel->setMaximumHeight(0);
             mNoMessagesLabel->hide();
         }
 
-        if (mMessageListWidget) {
-            mMessageListWidget->show();
+        if (mMessageList) {
+            mMessageList->setMaximumHeight(QWIDGETSIZE_MAX);
+            mMessageList->show();
         }
     }
 }
 
 
 /*!
-    Updates the search result count information. If the message list does not
-    contain any items, a "no messages" label is displayed. Otherwise the result
-    count in the information label is updated according to the number of
-    messages in the list.
+    Shows no messages label if no matching messages were found.
 */
-void NmMessageSearchListView::updateSearchResultCountInfo()
+void NmMessageSearchListView::updateResultView()
 {
     NM_FUNCTION;
 
-    const int resultCount = mMsgListModel.rowCount();
-
-    if (resultCount) {
-        if (mInfoLabel) {
-            // Display the result count on the info label.
-            QString resultsString(hbTrId("txt_mail_list_search_results",resultCount));
-            mInfoLabel->setHeading(resultsString);
-
-            if (!mInfoLabel->isVisible()) {
-                mInfoLabel->show();
-            }
-        }
-    }
-    else {
-        // No search results!
-        if (mInfoLabel && mInfoLabel->isVisible()) {
-            mInfoLabel->hide();
-        }
-
-        // Display the "no messages" label and highlight the search term.
+    if (mMsgListModel.rowCount() < 1) {
+        // Display the "no messages".
         noMessagesLabelVisibility(true);
     }
-    
 }
 
 
@@ -379,30 +409,22 @@
 void NmMessageSearchListView::setSearchInputMode(NmSearchInputMode mode)
 {
     NM_FUNCTION;
-    
+
     if (!mLineEdit) {
         // No line edit widget!
         return;
     }
 
-    switch (mode) {
-        case NmNormalMode: {
-            mLineEdit->setEnabled(true);
-            break;
-        }
-        case NmHighlightedMode: {
-            mLineEdit->setEnabled(true);
-            mLineEdit->setFocus();
-            break;
-        }
-        case NmDimmedMode: {
-            mLineEdit->setEnabled(false);
-            break;
-        }
+    if (mode == NmNormalMode) {
+        mLineEdit->setEnabled(true);
+        mLineEdit->setFocus();
+    }
+    else {
+        mLineEdit->setEnabled(false);
+        mLineEdit->deselect();
     }
 }
 
-
 /*!
     From NmBaseView.
 
@@ -437,31 +459,6 @@
     }
 }
 
-
-/*!
-    Called when text is changed in the edit field. If there is no search term
-    in the edit field, the search button is dimmed and disabled. If the field
-    contains text, the button can be clicked.
-    
-    \param text The text in the field after the modification.
-*/
-void NmMessageSearchListView::criteriaChanged(QString text) 
-{
-    NM_FUNCTION;
-    NM_COMMENT(QString("NmMessageSearchListView::criteriaChanged %1").arg(text));
-    
-    // Check if the button should be disabled/enabled.
-    bool enabled = mPushButton->isEnabled();
-
-    if (!enabled && !text.isEmpty()) {
-        mPushButton->setEnabled(true);
-    }
-    else if (enabled && text.isEmpty()) {
-        mPushButton->setEnabled(false);
-    }
-}
-
-
 /*!
     Displays the item context menu. This method gets called if an item on the
     list is long pressed.
@@ -471,6 +468,11 @@
 {
     NM_FUNCTION;
     
+    // Stop search.
+    if (mSearchInProgress) {
+        toggleSearch();
+    }
+
     // Store long press item for later use with response.
     mLongPressedItem = 
         mMsgListModel.data(listViewItem->modelIndex(),
@@ -544,6 +546,10 @@
             mStartParam->mailboxId(), modelItem->envelope().folderId(),
             modelItem->envelope().messageId());
 
+        // Hide VKB
+        vkbClosed();
+        sendSoftwareInputPanelRequest(QEvent::CloseSoftwareInputPanel);
+
         mApplication.enterNmUiView(startParam);
     }
 }
@@ -563,24 +569,24 @@
     // The search is an asynchronous operation. If a user stops the search, it
     // might take a short while before the search is actually stopped and during
     // this time it is possible that messages matching the search are added.
-    // Therefore, update the result count info if items are added after the
+    // Therefore, update is needed if items are added after the
     // search has been stopped by the user.
     if (!mSearchInProgress) {
-        updateSearchResultCountInfo();
+        updateResultView();
     }
 
-    if (!start && mMessageListWidget) {
-        QList<HbAbstractViewItem*> items = mMessageListWidget->visibleItems();
+    if (!start && mMessageList) {
+        QList<HbAbstractViewItem*> items = mMessageList->visibleItems();
 
         if (items.count()) {
             QModelIndex index = items.at(0)->modelIndex();
 
             while (index.row() > 0) {
                 QModelIndex previous =
-                    mMessageListWidget->modelIterator()->previousIndex(index);
+                    mMessageList->modelIterator()->previousIndex(index);
 
                 if (previous.isValid()) {
-                    mMessageListWidget->scrollTo(previous);
+                    mMessageList->scrollTo(previous);
                 }
 
                 index = previous;
@@ -592,15 +598,14 @@
 
 /*!
     This method gets called when an item is removed from the list. If the
-    search has completed (or stopped), the search result count information is
-    updated according to the number of messages in the list.
+    search has completed (or stopped), the search results needs to be updated.
 */
 void NmMessageSearchListView::itemsRemoved()
 {
     NM_FUNCTION;
     
     if (!mSearchInProgress) {
-        updateSearchResultCountInfo();
+        updateResultView();
     }
 }
 
@@ -612,10 +617,9 @@
 {
     NM_FUNCTION;
     
-    if (mMessageListWidget) {
+    if (mMessageList) {
         // Set the model.
-        mMessageListWidget->setModel(
-            static_cast<QStandardItemModel*>(&mMsgListModel));
+        mMessageList->setModel(static_cast<QStandardItemModel*>(&mMsgListModel));
 
         // Connect the signals.
         connect(&mMsgListModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
@@ -627,13 +631,6 @@
         connect(&mMsgListModel, SIGNAL(setNewParam(NmUiStartParam*)),
                 this, SLOT(reloadViewContents(NmUiStartParam*)), Qt::UniqueConnection);
     }
-
-    // The info label cannot be hidden when constructed because doing so would
-    // ruin the layout (for example the line edit widget's width would be too
-    // short in lanscape).
-    if (mInfoLabel) {
-        mInfoLabel->hide();
-    }
 }
 
 
@@ -644,7 +641,7 @@
     starts an asynchronous search. Any previous search results are removed from
     the search list.
 
-    Stops search: Sets the number of search results into the info label.
+    Stops search: shows no messages label if no matching messages were found.
 */
 void NmMessageSearchListView::toggleSearch()
 {
@@ -668,34 +665,34 @@
         // Get the search input and start the search.
         QStringList searchStrings;
 
-        if (mLineEdit) {
-            searchStrings.append(mLineEdit->text());
+        if (mSearchPanel) {
+            searchStrings.append(mSearchPanel->criteria());
         }
 
-        mUiEngine.search(mStartParam->mailboxId(), searchStrings);
-
         // Hide the virtual keyboard
-        QInputContext *ic = qApp->inputContext();
-        if (ic) {
-            QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-            ic->filterEvent(closeEvent);
-            delete closeEvent;
-        }
-        
+        sendSoftwareInputPanelRequest(QEvent::CloseSoftwareInputPanel);
+
         // Hide the "no messages" label if visible and dim the search input.
         noMessagesLabelVisibility(false);
         setSearchInputMode(NmDimmedMode);
 
-        // Display the info label.
-        if (mInfoLabel) {
-            mInfoLabel->setHeading(hbTrId("txt_mail_list_searching"));
-            mInfoLabel->show();
+        // Change "Go" button icon to spinner.
+        if (mProgressButton) {
+            // Create icon if not created yet.
+            if (!mSpinnerIcon) {
+                // Select one picture if animation loading has failed.
+                QString iconName = NmSearchListViewSpinnerImage;
+                if (mAnimationAddedToManger) {
+                    iconName = NmSearchListViewSpinnerAnimation;
+                }
+                mSpinnerIcon = new HbIcon(iconName);
+                mSpinnerIcon->setFlags(HbIcon::Colorized);
+            }
+            mProgressButton->setIcon(*mSpinnerIcon);
         }
 
-        // Change the push button text.
-        if (mPushButton) {
-            mPushButton->setIcon(HbIcon("qtg_mono_search_stop"));
-        }
+        // Start search
+        mUiEngine.search(mStartParam->mailboxId(), searchStrings);
     }
 }
 
@@ -711,26 +708,131 @@
     
     mSearchInProgress = false;
     
-    // Change the push button text.
-    if (mPushButton) {
-        mPushButton->setIcon(HbIcon("qtg_mono_search"));
+    // Change search button icon to magnifying glass.
+    if (mProgressButton) {
+        mProgressButton->setIcon(HbIcon("qtg_mono_search"));
     }
 
-    // Display the search result count.
-    updateSearchResultCountInfo();
+    // Update result view. Shows no message label if no matching messages were found.
+    updateResultView();
+
+    // Undim the search input.
+    setSearchInputMode(NmNormalMode);
+
+    // In no matching messages were found. Show no messages label and open VKB.
+    if (mMsgListModel.rowCount() < 1) {
+        noMessagesLabelVisibility(true);
+
+        sendSoftwareInputPanelRequest(QEvent::RequestSoftwareInputPanel);
 
-    const int resultCount = mMsgListModel.rowCount();
+        // Select text
+        mLineEdit->selectAll();
+    }
+}
+
+/*!
+    By default search button is disabled but when some text is
+    written to search field, the search button is enabled. When search field is
+    erased, button is disabled.
 
-    if (resultCount) {
-        // Undim the search input.
-        setSearchInputMode(NmNormalMode);
+    \param text chaged text.
+*/
+void NmMessageSearchListView::textChanged(const QString &text)
+{
+    NM_FUNCTION;
+
+    if (!text.isEmpty()) {
+        if (!mProgressButton->isEnabled()) {
+            mProgressButton->setEnabled(true);
+        }
     }
     else {
-        // Highlight the search field.
-        noMessagesLabelVisibility(true);
-        setSearchInputMode(NmHighlightedMode);
+        if (mProgressButton->isEnabled()) {
+            mProgressButton->setEnabled(false);
+        }
     }
 }
 
+/*!
+    When exit button is clicked, trigger back navigation action
+    which closes the search view.
+*/
+void NmMessageSearchListView::exitClicked()
+{
+    NM_FUNCTION;
+
+    navigationAction()->activate(QAction::Trigger);
+}
+
+/*!
+    Called before orientation chages. Checks if search criteria text
+    needs to be selected after the orientation has changed.
+*/
+void NmMessageSearchListView::orientationAboutToChange()
+{
+    NM_FUNCTION;
+
+    HbVkbHostBridge *instance = HbVkbHostBridge::instance();
+    if (instance &&
+        instance->keypadStatus() == HbVkbHost::HbVkbStatusOpened &&
+        mLineEdit &&
+        mLineEdit->hasSelectedText()) {
+        mSelectTextAfterOrientationChange = true;
+    }
+}
+
+/*!
+    Called when orientation has changed. Selects search criteria text if needed.
+    \sa  NmMessageSearchListView::orientationAboutToChange()
+*/
+void NmMessageSearchListView::orientationChanged()
+{
+    NM_FUNCTION;
+    if (mSelectTextAfterOrientationChange) {
+        mLineEdit->selectAll();
+        mSelectTextAfterOrientationChange = false;
+    }
+
+}
+
+/*!
+    Sends event to software input panel (VKB).
+
+    Used event types:
+    QEvent::RequestSoftwareInputPanel(opens VKB)
+    QEvent::CloseSoftwareInputPanel(closes VKB)
+*/
+void NmMessageSearchListView::sendSoftwareInputPanelRequest(QEvent::Type eventType)
+{
+    NM_FUNCTION;
+
+    QInputContext *ic = qApp->inputContext();
+    if (ic) {
+        QScopedPointer<QEvent> event(new QEvent(eventType));
+        ic->filterEvent(event.data());
+    }
+}
+
+/*!
+    Called when virtual keyboard is about to open.
+*/
+void NmMessageSearchListView::vkbOpened()
+{
+    NM_FUNCTION;
+
+    setContentFullScreen(true);
+    hideItems(Hb::ToolBarItem);
+}
+
+/*!
+    Called when virtual keyboard is about to close.
+*/
+void NmMessageSearchListView::vkbClosed()
+{
+    NM_FUNCTION;
+
+    setContentFullScreen(false);
+    showItems(Hb::ToolBarItem);
+}
 
 // End of file.
--- a/emailuis/nmailui/src/nmuidocumentloader.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmuidocumentloader.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -57,6 +57,18 @@
         res = new NmAttachmentListWidget();
         res->setObjectName(name);
     }    
+    if( type == NmRecipientLineEdit::staticMetaObject.className() ) {
+        res = new NmRecipientLineEdit();
+        res->setObjectName(name);
+    }
+    if( type == NmHtmlLineEdit::staticMetaObject.className() ) {
+        res = new NmHtmlLineEdit();
+        res->setObjectName(name);
+    }
+    if( type == NmEditorTextEdit::staticMetaObject.className() ) {
+        res = new NmEditorTextEdit();
+        res->setObjectName(name);
+    }
     if (!res) {
         res = HbDocumentLoader::createObject(type, name);
     }
--- a/emailuis/nmailui/src/nmviewerheader.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerheader.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -256,16 +256,15 @@
     NM_FUNCTION;
     
     if (mHeaderBox) {        // Initialize recipient box
-        if (!mRecipientsBox){
+        if (!mRecipientsBox) {
             mRecipientsBox = new HbLabel();
             HbStyle::setItemName(mRecipientsBox, "recipients");
             mRecipientsBox->setFontSpec(HbFontSpec(HbFontSpec::Secondary)); 
             mRecipientsBox->setTextWrapping((Hb::TextWrapping)NmTextWrapWordOrAnywhere);
-        }
-               
-        // Set recipients to text edit field as html 
-        NmAddress sender = mMessage->envelope().sender();               
+        }              
         if (mMessage) {
+            // Set recipients to text edit field as html 
+            NmAddress sender = mMessage->envelope().sender(); 
             mRecipientsBox->setHtml(formatRecipientList(addressToDisplay(sender),
                                     mMessage->envelope().toRecipients(), 
                                     mMessage->envelope().ccRecipients()));
--- a/emailuis/nmailui/src/nmviewerserviceinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerserviceinterface.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -29,12 +29,12 @@
     Class constructor.
 */
 NmViewerServiceInterface::NmViewerServiceInterface(QObject *parent,
-        NmApplication *application,
-        NmUiEngine &uiEngine)
-    : XQServiceProvider(emailFullServiceNameMessage, parent),
-      mApplication(application),
-      mUiEngine(uiEngine),
-      mAsyncReqId(0)
+                                                   NmApplication *application,
+                                                   NmUiEngine &uiEngine)
+: XQServiceProvider(emailFullServiceNameMessage, parent),
+  mApplication(application),
+  mUiEngine(uiEngine),
+  mAsyncReqId(0)
 {
     publishAll();
 }
@@ -50,75 +50,125 @@
 
 
 /*!
-    Opens view to the specific message
- */
-void NmViewerServiceInterface::viewMessage(QVariant mailboxId, QVariant folderId, QVariant messageId)
+    This has the soon to be DEPRICATED three argument interface!!!
+    Use viewMessage(QVariant idList, QVariant flags) instead!!!
+*/
+void NmViewerServiceInterface::viewMessage(QVariant mailboxId,
+                                           QVariant folderId,
+                                           QVariant messageId)
+{
+    QVariantList idList;
+    idList.append(mailboxId);
+    idList.append(folderId);
+    idList.append(messageId);
+    QVariant idListAsVariant = QVariant::fromValue(idList);
+    viewMessage(idListAsVariant, QVariant());
+}
+
+
+/*!
+    Opens the message view according to the given IDs.
+
+    \param idList A list containing the required IDs for locating the wanted
+                  message. The ID are the following (and should be placed in
+                  the following order): mailbox ID, folder ID and message ID.
+    \param flags Will contain EmailBackReturnsToMessageList if the message
+                 list view should be added into the view stack.
+*/
+void NmViewerServiceInterface::viewMessage(QVariant idList, QVariant flags)
 {
     NM_FUNCTION;
-
+    
     mAsyncReqId = setCurrentRequestAsync();
-    NmId mailboxNmId(0);
-    mailboxNmId = mailboxId.toULongLong();   
-    NmId messageNmId(0);
-    messageNmId = messageId.toULongLong(); 
-    NmId folderNmId(0);
-    folderNmId = folderId.toULongLong();
+
+    NmId mailboxId(0), folderId(0), messageId(0);
+
+    // Check the given arguments.
+    if (idList.canConvert(QVariant::List)) {
+        QList<QVariant> ids = idList.toList();
+        
+        if (ids.count() >= 3) {
+            mailboxId = ids[0].toULongLong();
+            folderId = ids[1].toULongLong();
+            messageId = ids[2].toLongLong();
+        }
+    }
 
-	// Make sure the app stays background if user presses back in viewer view
+    quint64 flag(EmailNoFlags);
+
+    if (flags.canConvert(QVariant::ULongLong)) {
+        flag = flags.toULongLong();
+    }
+
+    bool addMessageListViewToStack(false);
+
+    if (flag & EmailBackReturnsToMessageList) {
+        addMessageListViewToStack = true;
+    }
+
+	// Make sure the app stays on the background if the user presses back button
+    // in the viewer view.
 	bool visible = mApplication->updateVisibilityState();
 
-    NmMessage *message = mUiEngine.message( mailboxNmId, folderNmId, messageNmId );
+    NmMessage *message = mUiEngine.message(mailboxId, folderId, messageId);
+
     if (message) {
-        // bring application to foreground
+        // Bring the application to the foreground.
         if (!XQServiceUtil::isEmbedded()) {
             XQServiceUtil::toBackground(false);
         }
+
         HbMainWindow *mainWindow = mApplication->mainWindow();
         mainWindow->show();
 
-        // Launch the message list view.
-        NmUiStartParam *startParam1 = 
-            new NmUiStartParam(NmUiViewMessageList,
-                               mailboxNmId,
-                               folderNmId, // folder id
-                               messageNmId, // message id
-                               NmUiEditorCreateNew, // editor start mode
-                               NULL, // address list
-                               NULL, // attachment list
-                               true); // start as service
-        mApplication->enterNmUiView(startParam1);
+        if (addMessageListViewToStack) {
+            // Launch the message list view.
+            NmUiStartParam *startParam1 = 
+                new NmUiStartParam(NmUiViewMessageList,
+                                   mailboxId,
+                                   folderId,
+                                   messageId,
+                                   NmUiEditorCreateNew, // editor start mode
+                                   NULL, // address list
+                                   NULL, // attachment list
+                                   true); // start as service
+
+            mApplication->enterNmUiView(startParam1);
+        }
         
         // Launch the message view.
         NmUiStartParam *startParam =
             new NmUiStartParam(NmUiViewMessageViewer,
-                               mailboxNmId,
-                               folderNmId, // folder id
-                               messageNmId, // message id
+                               mailboxId,
+                               folderId, // folder id
+                               messageId, // message id
                                NmUiEditorCreateNew, // editor start mode
                                NULL, // address list
                                NULL, // attachment list
-                               false); // not started as service
+                               !addMessageListViewToStack); // start as service?
+
         mApplication->enterNmUiView(startParam);
 
-        completeRequest(mAsyncReqId,0);
+        completeRequest(mAsyncReqId, 0);
     }
     else {
-        // Message was not found
+        // The message was not found!
 
-        // if started as embedded, do not hide the app
+        // If started as embedded, do not hide the app.
 		if (!XQServiceUtil::isEmbedded() && !visible) {
 			XQServiceUtil::toBackground(true);
 		}
 
-        completeRequest(mAsyncReqId,1);
+        completeRequest(mAsyncReqId, 1);
 
-        // Close the application if started as service
+        // Close the application if started as a service.
         if (XQServiceUtil::isService()) {
-            // Exit the application when the return value is delivered
+            // Exit the application when the return value is delivered.
             connect(this, SIGNAL(returnValueDelivered()),
                     mApplication, SLOT(delayedExitApplication()));
         }
     }
 }
 
+
 // End of file.
--- a/emailuis/nmailui/src/nmviewerview.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerview.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -419,8 +419,12 @@
         // connect atta widget to listen progress value events
         QObject::connect(this, SIGNAL(progressValueChanged(int, int)),
                 mAttaWidget, SLOT(setProgressBarValue(int, int)));
-        // Set atta widget text color black since header has static white bg.
+
+        // Set the text color of the attachment widget black and the background
+        // color white.
         mAttaWidget->setTextColor(Qt::black);
+        mAttaWidget->setBackgroundColor(Qt::white);
+
         // Set attawidget minimum & maximum size
         mAttaWidget->setMinimumWidth(mScreenSize.width());
         mAttaWidget->setMaximumWidth(mScreenSize.width());
@@ -549,7 +553,8 @@
             // Browse through embedded image parts and add those
             // the web view.
             bool isFetched = child->fetchedSize() >= child->size();
-            if (child->contentType().startsWith("image", Qt::CaseInsensitive)) {
+            if(child->contentType().startsWith("image", Qt::CaseInsensitive) &&
+               child->contentDisposition().trimmed().startsWith("inline", Qt::CaseInsensitive)) {
                 QString contentId = child->contentId();
                 if (isFetched) {
                     int ret = mUiEngine.contentToMessagePart(
@@ -593,8 +598,7 @@
             QFont currentFont = document.defaultFont();
             currentFont.setWeight(QFont::Normal);
             qreal secondarySize;
-            HbStyle myStyle;
-            bool found = myStyle.parameter(NmParamTextHeightSecondary, secondarySize);
+            bool found = style()->parameter(NmParamTextHeightSecondary, secondarySize);
             if (found) {
                 HbFontSpec fontSpec(HbFontSpec::Secondary);
                 fontSpec.setTextHeight(secondarySize);
--- a/emailuis/nmailuiengine/bwins/nmailuiengineu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/bwins/nmailuiengineu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -313,4 +313,8 @@
 	?message@NmDataManager@@QAEPAVNmMessage@@ABVNmId@@00@Z @ 312 NONAME ; class NmMessage * NmDataManager::message(class NmId const &, class NmId const &, class NmId const &)
 	?metaObject@NmOperation@@UBEPBUQMetaObject@@XZ @ 313 NONAME ; struct QMetaObject const * NmOperation::metaObject(void) const
 	?getSignature@NmUiEngine@@QAEHABVNmId@@AAPAVQString@@@Z @ 314 NONAME ; int NmUiEngine::getSignature(class NmId const &, class QString * &)
+	?handleFolderEvent@NmUiEngine@@AAEXW4NmFolderEvent@@ABV?$QList@VNmId@@@@ABVNmId@@@Z @ 315 NONAME ; void NmUiEngine::handleFolderEvent(enum NmFolderEvent, class QList<class NmId> const &, class NmId const &)
+	?handleFolderCreatedEvent@NmUiEngine@@AAEXABV?$QList@VNmId@@@@ABVNmId@@@Z @ 316 NONAME ; void NmUiEngine::handleFolderCreatedEvent(class QList<class NmId> const &, class NmId const &)
+	?handleFolderDeletedEvent@NmMessageListModel@@QAEXABVNmId@@0@Z @ 317 NONAME ; void NmMessageListModel::handleFolderDeletedEvent(class NmId const &, class NmId const &)
+	?handleFolderDeletedEvent@NmUiEngine@@AAEXABV?$QList@VNmId@@@@ABVNmId@@@Z @ 318 NONAME ; void NmUiEngine::handleFolderDeletedEvent(class QList<class NmId> const &, class NmId const &)
 
--- a/emailuis/nmailuiengine/eabi/nmailuiengineu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/eabi/nmailuiengineu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -320,4 +320,8 @@
 	_ZThn8_N18NmBaseClientPluginD0Ev @ 319 NONAME
 	_ZThn8_N18NmBaseClientPluginD1Ev @ 320 NONAME
 	_ZN10NmUiEngine12getSignatureERK4NmIdRP7QString @ 321 NONAME
+	_ZN10NmUiEngine17handleFolderEventE13NmFolderEventRK5QListI4NmIdERKS2_ @ 322 NONAME
+	_ZN10NmUiEngine24handleFolderCreatedEventERK5QListI4NmIdERKS1_ @ 323 NONAME
+	_ZN10NmUiEngine24handleFolderDeletedEventERK5QListI4NmIdERKS1_ @ 324 NONAME
+	_ZN18NmMessageListModel24handleFolderDeletedEventERK4NmIdS2_ @ 325 NONAME
 
--- a/emailuis/nmailuiengine/inc/nmmessagelistmodel.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmmessagelistmodel.h	Fri Sep 03 14:07:42 2010 +0300
@@ -62,6 +62,10 @@
 
     void setIgnoreFolderIds(bool ignore);
 
+    void handleFolderDeletedEvent(
+                            const NmId &folderId,
+                            const NmId &mailboxId);   
+
 
 public slots:
 
--- a/emailuis/nmailuiengine/inc/nmuiengine.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmuiengine.h	Fri Sep 03 14:07:42 2010 +0300
@@ -197,6 +197,9 @@
     void handleMailboxEvent(NmMailboxEvent event,
                             const QList<NmId> &mailboxIds);
 
+    void handleFolderEvent(NmFolderEvent event, const QList<NmId> &folderIds,
+                            const NmId& mailboxId);
+
     void handleMatchFound(const NmId &messageId, const NmId &folderId);
 
     void messageEventForListModel(NmMessageEvent event,
@@ -222,6 +225,12 @@
     NmUiEngine();
 
     virtual ~NmUiEngine();
+    
+    void handleFolderDeletedEvent(const QList<NmId> &folderIds,
+                            const NmId& mailboxId);
+    
+    void handleFolderCreatedEvent(const QList<NmId> &folderIds,
+                            const NmId& mailboxId);    
 
 
 private: // Data
--- a/emailuis/nmailuiengine/src/nmbaseclientplugin.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmbaseclientplugin.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -467,7 +467,6 @@
             // Create the search button.
             NmAction *mailSearchAction = new NmAction(0);
             mailSearchAction->setObjectName("baseclientplugin_mailsearchaction");
-            mailSearchAction->setText(hbTrId("txt_mail_list_search"));
             mailSearchAction->setIcon(HbIcon("qtg_mono_search"));
             connect(mailSearchAction, SIGNAL(triggered()), this, SLOT(search()));
             actionList.append(mailSearchAction);
@@ -476,7 +475,6 @@
             mViewerToolBarRequest = request;
             NmAction *createMailAction = new NmAction(0);
             createMailAction->setObjectName("baseclientplugin_createmailaction");
-            createMailAction->setText(hbTrId("txt_mail_button_new_mail"));
             createMailAction->setIcon(NmIcons::getIcon(NmIcons::NmIconNewEmail));
             connect(createMailAction, SIGNAL(triggered()),
                     this, SLOT(createNewMailViewerToolBar()));
--- a/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmmessagelistmodel.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -119,24 +119,24 @@
         // imap and pop is using common sent, outbox or draft folder
         // for all mailboxes, here we want to filter out messages that
         // are not under this mailbox
-        bool insert(true);
-        if (nextMessage 
-            && (NmFolderSent == mCurrentFolderType
-             || NmFolderOutbox == mCurrentFolderType
-             || NmFolderDrafts == mCurrentFolderType)) {
-            insert = (mCurrentMailboxId == nextMessage->mailboxId());  
-        }
-        if (insert) {
-            if (mDividersActive &&
-                !messagesBelongUnderSameDivider(insertedMessage, nextMessage)) {
-                insertDividerIntoModel(nextMessage, parentCount);
-                parentCount++;
-                childCount = 0;
+        if (nextMessage) {
+            bool insert(true);
+            if (NmFolderSent == mCurrentFolderType
+                || NmFolderOutbox == mCurrentFolderType
+                || NmFolderDrafts == mCurrentFolderType) {
+                insert = (mCurrentMailboxId == nextMessage->mailboxId());  
             }
-    
+            if (insert) {
+                if (mDividersActive &&
+                    !messagesBelongUnderSameDivider(insertedMessage, nextMessage)) {
+                    insertDividerIntoModel(nextMessage, parentCount);
+                    parentCount++;
+                    childCount = 0;
+                }
             insertMessageIntoModel(nextMessage, childCount, false);
             insertedMessage = nextMessage;
             childCount++;
+            }
         }
     }
 }
@@ -218,6 +218,7 @@
 {
     NM_FUNCTION;
     const int idCount = messageIds.count();
+    NmId inFolderId = mDataManager.getStandardFolderId(mailboxId, NmFolderInbox);    
 
     // Folder ID does not concern us if this model instance is used for e.g.
     // searching messages.
@@ -225,14 +226,13 @@
         if (folderId == 0) {
             // Const cast is used here because also the input parameter has to
             // be changed.
-            const_cast<NmId&>(folderId) =
-                mDataManager.getStandardFolderId(mailboxId, NmFolderInbox);
+            const_cast<NmId&>(folderId) = inFolderId;
             NmUiStartParam *startParam =
                 new NmUiStartParam(NmUiViewMessageList, mailboxId, folderId);
             emit setNewParam(startParam);
         }
 
-        if (mCurrentFolderId == 0) {
+        if (mCurrentFolderId == 0 && folderId == inFolderId) {
             // Folder ID was not known at time when the mailbox opened and we
             // know that because of events the subscription is valid only for
             // the current mailbox.
@@ -282,6 +282,32 @@
     }
 }
 
+/*!
+    Handles the folder deleted events.
+
+    \param folderId The folder deleted
+    \param mailboxId A related mailbox
+*/
+void NmMessageListModel::handleFolderDeletedEvent(
+                        const NmId &folderId,
+                        const NmId &mailboxId)
+{
+    NM_FUNCTION;
+
+    // Folder ID does not concern us if this model instance is used for e.g.
+    // searching messages.
+    if (!mIgnoreFolderIds 
+    	  && mCurrentMailboxId == mailboxId 
+    	  && mCurrentFolderId == folderId) {
+        clear();
+        mCurrentFolderId = 0;        
+        // Go to inbox, but set folderId as 0 to indicate out-of-sync-state.
+        NmUiStartParam *startParam =
+            new NmUiStartParam(NmUiViewMessageList, mailboxId, mCurrentFolderId);
+        emit setNewParam(startParam);
+    }
+}
+
 
 /*!
     Function inserts new message into correct position to model.
--- a/emailuis/nmailuiengine/src/nmuiengine.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmuiengine.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -66,6 +66,12 @@
                 this,
                 SLOT(handleConnectEvent(NmConnectState, const NmId &, const int)),
                 Qt::UniqueConnection);
+            // connect folder events            
+            QObject::connect(plugin,
+                SIGNAL(folderEvent(NmFolderEvent, const QList<NmId> &, const NmId &)),
+                this, SLOT(handleFolderEvent(NmFolderEvent, const QList<NmId> &, const NmId &)),
+                Qt::UniqueConnection);           
+
             // do the subscriptions also
             NmDataPluginInterface *pluginInterface = mPluginFactory->interfaceInstance(plugin);
             if (pluginInterface) {
@@ -902,7 +908,7 @@
 
     const NmMessage *message = NULL;
 
-    if (mSendOperation != NULL) {
+    if (mSendOperation) {
         message = mSendOperation->getMessage();
     }
 
@@ -1226,6 +1232,60 @@
     }
 }
 
+/*!
+    Emits signals based on folder deletion or creation from plugins.
+    \param event folder event type
+    \param folderIds Ids of folder having the action       
+    \param mailboxId Id of active mailbox, 0 if application is closed.
+*/
+void NmUiEngine::handleFolderEvent(NmFolderEvent event, 
+        const QList<NmId> &folderIds, const NmId &mailboxId)
+{
+    NM_FUNCTION;
+
+    switch (event) {
+        case NmFolderIsDeleted:
+            handleFolderDeletedEvent(folderIds, mailboxId);
+            break;
+        case NmFolderIsCreated:
+        default:
+            handleFolderCreatedEvent(folderIds, mailboxId);            
+            break;            
+    };
+}
+
+/*!
+    Handles folder deletion from plugins.
+*/
+void NmUiEngine::handleFolderDeletedEvent(const QList<NmId> &folderIds,
+                                          const NmId &mailboxId)
+{
+    NM_FUNCTION;
+
+    NmId folderId(0); 
+
+    for (int i(0); i < folderIds.count(); i++) {
+        folderId = folderIds[i];
+        if (mInboxListModel){
+            mInboxListModel->handleFolderDeletedEvent(folderId, mailboxId);
+        }
+        if (mMessageListModel){
+            mMessageListModel->handleFolderDeletedEvent(folderId, mailboxId);
+        }
+    }
+}
+
+/*!
+    Emits signals based on folder creation from plugins.
+*/
+void NmUiEngine::handleFolderCreatedEvent(const QList<NmId> &folderIds,
+                                          const NmId &mailboxId)
+{
+    NM_FUNCTION;
+    Q_UNUSED(folderIds);
+    Q_UNUSED(mailboxId);
+}
+
 
 /*!
     Adds the found message into the search model.
--- a/emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -133,4 +133,6 @@
 	?checkColor@NmAttachmentListWidget@@AAE?AVQColor@@XZ @ 132 NONAME ; class QColor NmAttachmentListWidget::checkColor(void)
 	?changeEvent@NmAttachmentListWidget@@MAEXPAVQEvent@@@Z @ 133 NONAME ; void NmAttachmentListWidget::changeEvent(class QEvent *)
 	?setPressed@NmAttachmentListItem@@QAEX_N@Z @ 134 NONAME ; void NmAttachmentListItem::setPressed(bool)
+	?setBackgroundColor@NmAttachmentListItem@@QAEXVQColor@@@Z @ 135 NONAME ; void NmAttachmentListItem::setBackgroundColor(class QColor)
+	?setBackgroundColor@NmAttachmentListWidget@@QAEXVQColor@@@Z @ 136 NONAME ; void NmAttachmentListWidget::setBackgroundColor(class QColor)
 
--- a/emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -163,4 +163,6 @@
 	_ZN20NmAttachmentListItem10setPressedEb @ 162 NONAME
 	_ZN22NmAttachmentListWidget10checkColorEv @ 163 NONAME
 	_ZN22NmAttachmentListWidget11changeEventEP6QEvent @ 164 NONAME
+	_ZN20NmAttachmentListItem18setBackgroundColorE6QColor @ 165 NONAME
+	_ZN22NmAttachmentListWidget18setBackgroundColorE6QColor @ 166 NONAME
 
--- a/emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h	Fri Sep 03 14:07:42 2010 +0300
@@ -27,6 +27,7 @@
 class HbTapGesture;
 class HbFrameItem;
 
+
 class NMAILUIWIDGETS_EXPORT NmAttachmentListItem : public HbWidget
 {
     Q_OBJECT
@@ -34,7 +35,10 @@
 public:
     explicit NmAttachmentListItem(QGraphicsItem *parent = 0);
     virtual ~NmAttachmentListItem();
+
+public:
     void setTextColor(const QColor color);
+    void setBackgroundColor(const QColor color);
     void setFileNameText(const QString &fileName);
     void setFileSizeText(const QString &fileSize);
     void setProgressBarValue(const int value);
@@ -44,7 +48,11 @@
 
 protected: 
    virtual void gestureEvent(QGestureEvent *event);
-    
+
+private:
+    void init();
+    void constructUi();
+
 private slots:
     void removeProgressBar();
 
@@ -52,17 +60,14 @@
     void itemActivated();
     void itemLongPressed(QPointF point);
     
-private: 
-    void init( );
-    void constructUi();
-    
 private:
     Q_DISABLE_COPY(NmAttachmentListItem)
-    HbTextItem *mFileNameText; //owned
-    HbTextItem *mFileSizeText; //owned
-    HbProgressBar *mProgressBar; //owned
+    HbTextItem *mFileNameText; // Owned
+    HbTextItem *mFileSizeText; // Owned
+    HbProgressBar *mProgressBar; // Owned
+    HbFrameItem *mBackground; // Not owned
     QColor mTextColor;
-    HbFrameItem *mBackGround; //not owned
+    QColor mBackgroundColor;
 };
 
 #endif /* NMATTACHMENTLISTITEM_H_ */
--- a/emailuis/nmailuiwidgets/inc/nmattachmentlistwidget.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/inc/nmattachmentlistwidget.h	Fri Sep 03 14:07:42 2010 +0300
@@ -35,6 +35,7 @@
     NmAttachmentListWidget(QGraphicsItem *parent = 0);
     virtual ~NmAttachmentListWidget();
     void setTextColor(const QColor color);
+    void setBackgroundColor(const QColor color);
     void insertAttachment(const int index, const QString &fileName, const QString &fileSize);
     void removeAttachment(const int index);
     void setAttachmentSize(int index, const QString &fileSize);
@@ -72,6 +73,7 @@
     QGraphicsGridLayout *mLayout;
     Qt::Orientation mOrientation;
     QColor mTextColor;
+    QColor mBackgroundColor;
 };
 
 #endif // NMATTACHMENTLISTWIDGET_H_
--- a/emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -24,59 +24,46 @@
 
 static const int PROGRESSBAR_MIN = 0; 
 static const int PROGRESSBAR_MAX = 100;
-static const int PROGRESSBAR_HIDE_COUNTDOWN = 500;
+static const int PROGRESSBAR_HIDE_COUNTDOWN = 500; // Milliseconds
+
 
 /*!
- @nmailuiwidgets
- \class NmAttachmentListItem
+    @nmailuiwidgets
+
+    \class NmAttachmentListItem
 
- \brief The NmAttachmentListItem widget provides for showing a single attachment with file size and
-        download progress in the attachment list.
-
-
-
- */
+    \brief  NmAttachmentListItem is a widget used for displaying a single
+            attachment with the attachment file size and download progress in
+            the attachment list.
+*/
 
 
 /*!
     Constructs a new NmAttachmentListItem with \a parent.
- */
+*/
 NmAttachmentListItem::NmAttachmentListItem(QGraphicsItem *parent)
-    : HbWidget( parent ),
-      mFileNameText(NULL),
-      mFileSizeText(NULL),
-      mProgressBar(NULL),
-      mBackGround(NULL)
+: HbWidget( parent ),
+  mFileNameText(NULL),
+  mFileSizeText(NULL),
+  mProgressBar(NULL),
+  mBackground(NULL)
 {
     NM_FUNCTION;
-    
-    init( );
+
+    init();
 	
     // Informs GestureFramework that NmAttachmentListItem widget is interested 
-    // Tap gesture and TapAndHold gesture.
+    // in Tap and TapAndHold gestures.
     grabGesture(Qt::TapGesture);
     HbEffect::add("mailAttachmentWidget", "listviewitem_press", "pressed");
     HbEffect::add("mailAttachmentWidget", "listviewitem_release", "released");
 }
 
-/*!
-    Setter for items text color override. This fucntion can be used
-    if theme background is not used and text needs to be shown in diferent color.
- */
-void NmAttachmentListItem::setTextColor(const QColor color)
-{
-    NM_FUNCTION;
-    
-    mTextColor=color;
-    if (mTextColor.isValid() && mFileNameText){
-        mFileNameText->setTextColor(mTextColor);
-    }    
-}
 
 /*!
     Destructor.
- */
-NmAttachmentListItem::~NmAttachmentListItem( )
+*/
+NmAttachmentListItem::~NmAttachmentListItem()
 {
     NM_FUNCTION;
     
@@ -84,93 +71,249 @@
     HbStyleLoader::unregisterFilePath(FILE_PATH_CSS);
 }
 
+
 /*!
-    Set the text to be displayed in the file name item.
- */
+    Setter for items text color override. This method can be used if the theme
+    background is not used and text needs to be shown with a different color.
+
+    \param color The new test color.
+*/
+void NmAttachmentListItem::setTextColor(const QColor color)
+{
+    NM_FUNCTION;
+    
+    mTextColor = color;
+
+    if (mTextColor.isValid() && mFileNameText) {
+        mFileNameText->setTextColor(mTextColor);
+    }
+}
+
+
+/*!
+    Sets the background color. This method can be used to override the
+    default background color set by the current theme. Because of the effect,
+    the implementation "smoke and mirrors" but it works.
+
+    \param color The new background color.
+*/
+void NmAttachmentListItem::setBackgroundColor(const QColor color)
+{
+    NM_FUNCTION;
+
+    if (!color.isValid()) {
+        // Invalid color!
+        return;
+    }
+
+    mBackgroundColor = color;
+
+    // The effect color is the opposite color of the background color.
+    QColor effectColor(qAbs(color.red() - 255),
+                       qAbs(color.green() - 255),
+                       qAbs(color.blue() - 255));
+    
+    QPalette palette = QApplication::palette();
+    QBrush brush(effectColor);
+    palette.setBrush(QPalette::Window, effectColor);
+    setPalette(palette);
+    setAutoFillBackground(true);
+
+    if (mBackground) {
+        // Set the background color for the background item.
+        brush.setColor(mBackgroundColor);
+        palette.setBrush(QPalette::Window, brush);
+        mBackground->setPalette(palette);
+        mBackground->setAutoFillBackground(true);
+        mBackground->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
+    }
+
+    repolish();
+}
+
+
+/*!
+    Sets the text to be displayed in the file name item.
+
+    \param filename The filename.
+*/
 void NmAttachmentListItem::setFileNameText(const QString &fileName)
 {
     NM_FUNCTION;
     
-    if (mFileNameText){
-        if (mTextColor.isValid()){
+    if (mFileNameText) {
+        if (mTextColor.isValid()) {
             mFileNameText->setTextColor(mTextColor);
         }
+
         mFileNameText->setTextWrapping(Hb::TextNoWrap);
         mFileNameText->setText(fileName);    
     }
 }
 
+
 /*!
-    Set the text to be displayed in the file size item
- */
+    Sets the value of the text for displaying the attachment file size.
+    
+    \param fileSize The file size as a string.
+*/
 void NmAttachmentListItem::setFileSizeText(const QString &fileSize)
 {
     NM_FUNCTION;
     
-    if (mFileSizeText){
-        if (mTextColor.isValid()){
+    if (mFileSizeText) {
+        if (mTextColor.isValid()) {
             mFileSizeText->setTextColor(mTextColor);
         }
+
         mFileSizeText->setTextWrapping(Hb::TextNoWrap);
         mFileSizeText->setText(fileSize);
     }
 }
 
+
 /*!
-    Set the download progress bar value (0-100)%, if value is 0 progress bar is hidden
- */
+    Set the download progress bar value (0 - 100 %). If the given value is 0,
+    the progress bar is hidden.
+
+    \param value The progress bar value.
+*/
 void NmAttachmentListItem::setProgressBarValue(const int value)
 {
     NM_FUNCTION;
     
-    //first check if value is 0 or below -> hide progressbar
-    if ( 0 >= value ){
+    // First check if the value is 0 or below -> hide progressbar.
+    if (0 >= value) {
         removeProgressBar();
         return;
     }
 
-    if ( !mProgressBar ){
+    if (!mProgressBar) {
         mProgressBar = new HbProgressBar(this); 
         mProgressBar->setObjectName("attachmentlistitem_progress");
         mProgressBar->setRange(PROGRESSBAR_MIN,PROGRESSBAR_MAX);
-        HbStyle::setItemName( mProgressBar, "progressbar" );
+        HbStyle::setItemName(mProgressBar, "progressbar");
         repolish();
     }
+
     mProgressBar->setProgressValue(value);
     
-    //start hiding count down
-    if(PROGRESSBAR_MAX <= value){
+    // Start hiding the count down.
+    if (PROGRESSBAR_MAX <= value){
         hideProgressBar();
     }
 }
 
+
 /*!
-    Get the download progress bar value
+    \return The value of the download progress bar.
 */
 int NmAttachmentListItem::progressBarValue() const
 {
     NM_FUNCTION;
     
     int ret = 0;
-    if ( mProgressBar ){
+
+    if (mProgressBar) {
         ret = mProgressBar->progressValue();
     }
 
     return ret;
 }
 
+
 /*!
-    Hides progress bar, used if download is cancelled before 100 precent is reached
+    Hides the progress bar. Used if the download is cancelled before 100
+    percent is reached.
 */
 void NmAttachmentListItem::hideProgressBar()
 {
     NM_FUNCTION;
     
-    QTimer::singleShot(PROGRESSBAR_HIDE_COUNTDOWN,this, SLOT(removeProgressBar()));
+    QTimer::singleShot(PROGRESSBAR_HIDE_COUNTDOWN, this, SLOT(removeProgressBar()));
+}
+
+
+/*!
+    Displays a visual effect according to the current pressed state.
+
+    \param pressed True, if the item was pressed.
+*/
+void NmAttachmentListItem::setPressed(bool pressed)
+{
+    if (pressed) {
+        setProperty("state", "pressed");
+        mBackground->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_PRESSED);
+        HbEffect::cancel(mBackground, "released");
+        HbEffect::start(mBackground, "mailAttachmentWidget", "pressed");
+    }
+    else {
+        setProperty("state", "normal");
+        mBackground->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_NORMAL);
+        HbEffect::cancel(mBackground, "pressed");
+        HbEffect::start(mBackground, "mailAttachmentWidget", "released");
+    }    
 }
 
+
 /*!
-    Initialize
+    Handles the given gesture event.
+
+    \param event The event to handle.
+*/
+void NmAttachmentListItem::gestureEvent(QGestureEvent *event)
+{
+    NM_FUNCTION;
+    
+    if (HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch (tap->tapStyleHint()) {
+            case HbTapGesture::Tap: {
+                Qt::GestureState state = tap->state();
+                HbInstantFeedback::play(HbFeedback::Basic);
+                setPressed(true);
+
+                if (state == Qt::GestureFinished) {
+                    emit itemActivated();
+                    setPressed(false);
+                }
+                else if (state == Qt::GestureCanceled) {
+                    setPressed(false);
+                }
+
+                break;
+            }
+            case HbTapGesture::TapAndHold: {
+                emit itemLongPressed(event->mapToGraphicsScene(tap->position()));
+                setPressed(false);    
+                break;
+            }
+        } // switch
+    }
+    else {
+        // Let the HbWidget handle the event.
+        HbWidget::gestureEvent(event);
+    }
+}
+
+
+/*!
+    Hides and deletes the download progress bar.
+*/
+void NmAttachmentListItem::removeProgressBar()
+{
+    NM_FUNCTION;
+    
+    if (mProgressBar) {
+        HbStyle::setItemName(mProgressBar, "");
+        mProgressBar->deleteLater();
+        mProgressBar = 0;
+        repolish();
+    }
+}
+
+
+/*!
+    Initializes the widget.
 */
 void NmAttachmentListItem::init( )
 {
@@ -178,119 +321,47 @@
     
     constructUi();
 
-    //set default values
+    // Set the default flag values.
     setFlag(QGraphicsItem::ItemIsFocusable);
     setFlag(QGraphicsItem::ItemIsSelectable);
 }
 
+
 /*!
-    Constructs the UI, sets style itemnames etc.
+    Constructs the UI, sets style item names etc.
 */
 void NmAttachmentListItem::constructUi()
 {
     NM_FUNCTION;
     
-    //background
-    QScopedPointer<HbFrameItem> backGround(new HbFrameItem(this));
-    backGround->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_NORMAL);
-    backGround->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
-    setBackgroundItem(backGround.data());
-    // ownership was transferred to base class
-    mBackGround = backGround.take();
+    // Background
+    QScopedPointer<HbFrameItem> background(new HbFrameItem(this));
+    background->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_NORMAL);
+    background->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
+    setBackgroundItem(background.data());
+
+    // The ownership was transferred to the base class.
+    mBackground = background.take();
     
-    
-    //construct default ui.    
+    // Construct the default UI.
     HbStyleLoader::registerFilePath(FILE_PATH_WIDGETML);
     HbStyleLoader::registerFilePath(FILE_PATH_CSS);
     
-    
     QScopedPointer<HbTextItem> fileNameText(new HbTextItem(this));
     fileNameText->setObjectName("nmattachmentlistitem_filenametext");
-    HbStyle::setItemName( fileNameText.data(), "filename" );  
+    HbStyle::setItemName(fileNameText.data(), "filename");
     fileNameText->setElideMode(Qt::ElideRight);
     
-    
     QScopedPointer<HbTextItem> fileSizeText(new HbTextItem(this));
     fileSizeText->setObjectName("nmattachmentlistitem_filenamesize");
-    HbStyle::setItemName( fileSizeText.data(), "filesize" );
+    HbStyle::setItemName(fileSizeText.data(), "filesize");
     fileSizeText->setElideMode(Qt::ElideNone);
     
-    // ownership transferred to this object
+    // The ownership was transferred to this instance.
     mFileSizeText = fileSizeText.take(); 
     mFileNameText = fileNameText.take();
 }
 
 
-/*!
-    Hides the download progress bar
- */
-void NmAttachmentListItem::removeProgressBar()
-{
-    NM_FUNCTION;
-    
-	if ( mProgressBar ){
-	    HbStyle::setItemName( mProgressBar, "" );
-	    mProgressBar->deleteLater();
-	    mProgressBar = 0;
-	    repolish();
-	}
-}
 
-
-/*!
-    This function handles gestures
- */
-
-void NmAttachmentListItem::gestureEvent(QGestureEvent *event)
-{
-    NM_FUNCTION;
-    
-    if (HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
-        switch(tap->tapStyleHint()) {
-        case HbTapGesture::Tap: 
-            {
-                Qt::GestureState state = tap->state();
-                HbInstantFeedback::play(HbFeedback::Basic);
-                setPressed(true);
-                if (state == Qt::GestureFinished) {
-                    emit itemActivated();
-                    setPressed(false);
-                }
-                else if (state == Qt::GestureCanceled) {
-                    setPressed(false);
-                }
-             }
-             break;
-            
-         case HbTapGesture::TapAndHold:
-             {
-                 emit itemLongPressed(event->mapToGraphicsScene(tap->position()));
-                 setPressed(false);
-             }    
-             break;
-        }
-    }
-    else {
-           HbWidget::gestureEvent(event);
-    }
-}
-
-/*!
-    Sets the effect of the item when tapping it
-*/
-void NmAttachmentListItem::setPressed(bool pressed)
-{
-    if (pressed) {
-        setProperty("state", "pressed");
-        mBackGround->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_PRESSED);
-        HbEffect::cancel(mBackGround, "released");
-        HbEffect::start(mBackGround, "mailAttachmentWidget", "pressed");
-
-    }
-    else {
-        setProperty("state", "normal");
-        mBackGround->frameDrawer().setFrameGraphicsName(LIST_ITEM_BG_FRAME_NORMAL);
-        HbEffect::cancel(mBackGround, "pressed");
-        HbEffect::start(mBackGround, "mailAttachmentWidget", "released");
-    }    
-}
+// End of file.
--- a/emailuis/nmailuiwidgets/src/nmattachmentlistwidget.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmailuiwidgets/src/nmattachmentlistwidget.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -23,6 +23,7 @@
 
 static const qreal NmItemLineOpacity = 0.4;
 
+
 /*!
  @nmailuiwidgets
  \class NmAttachmentListWidget
@@ -103,12 +104,12 @@
     Constructs a new NmAttachmentListWidget with \a parent.
  */
 NmAttachmentListWidget::NmAttachmentListWidget(QGraphicsItem *parent)
-    : HbWidget( parent ),
-    mLayout(NULL),
-    mOrientation(Qt::Vertical)
+: HbWidget( parent ),
+  mLayout(NULL),
+  mOrientation(Qt::Vertical)
 {
     NM_FUNCTION;
-    
+
     init( );
 }
 
@@ -119,11 +120,11 @@
 NmAttachmentListWidget::~NmAttachmentListWidget( )
 {
     NM_FUNCTION;
-    
+
     qDeleteAll(mItemList);
 
     mItemList.clear();
-	
+
 }
 
 /*!
@@ -133,23 +134,41 @@
 void NmAttachmentListWidget::setTextColor(const QColor color)
 {
     NM_FUNCTION;
-    
+
     mTextColor=color;
 }
 
 
 /*!
+    Sets the background color. This method can be used to override the
+    default background color set by the current theme.
+
+    \param color The new background color.
+*/
+void NmAttachmentListWidget::setBackgroundColor(const QColor color)
+{
+    NM_FUNCTION;
+    mBackgroundColor = color;
+}
+
+
+/*!
     Inserts attachment to given index. If index already contains data,
     old one will be moved to next.
  */
 void NmAttachmentListWidget::insertAttachment(
-        int index, 
-        const QString &fileName, 
+        int index,
+        const QString &fileName,
         const QString &fileSize)
-{   
+{
     NM_FUNCTION;
-    
+
     NmAttachmentListItem *item = new NmAttachmentListItem(this);
+
+    if (mBackgroundColor.isValid()) {
+        item->setBackgroundColor(mBackgroundColor);
+    }
+
     item->setObjectName(QString("nmattachmentlistitem_%1").arg(index));
 
     //connect to signals
@@ -157,7 +176,7 @@
     connect(item, SIGNAL(itemLongPressed(QPointF)), this, SLOT(handleLongPressed(QPointF)));
 
     //set texts
-    item->setTextColor(checkColor());      
+    item->setTextColor(checkColor());
     item->setFileNameText(fileName);
     item->setFileSizeText(fileSize);
 
@@ -174,7 +193,7 @@
 void NmAttachmentListWidget::removeAttachment(int index)
 {
     NM_FUNCTION;
-    
+
     if(!mLayout) {
         NM_ERROR(1,"NmAttachmentListWidget::removeAttachment(): layout loading failed");
         return;
@@ -198,23 +217,23 @@
     Set attachment file size.
  */
 void NmAttachmentListWidget::setAttachmentSize(
-        int index, 
+        int index,
         const QString &fileSize)
 {
     NM_FUNCTION;
-    
+
 	if (index>=0 && index<mItemList.count()) {
 	    mItemList.at(index)->setFileSizeText(fileSize);
 	}
 }
 
 /*!
-    Returns attachment(s) count. 
+    Returns attachment(s) count.
  */
 int NmAttachmentListWidget::count() const
 {
     NM_FUNCTION;
-    
+
     return mItemList.count();
 }
 
@@ -224,7 +243,7 @@
 int NmAttachmentListWidget::progressValue(int index) const
 {
     NM_FUNCTION;
-    
+
     int ret(NmNotFoundError);
     if(index >= 0 && index < mItemList.count()){
         ret = mItemList.at(index)->progressBarValue();
@@ -233,13 +252,13 @@
 }
 
 /*!
-    Hides progress of item, if index is negative or creater 
+    Hides progress of item, if index is negative or creater
     than last index function does nothing
  */
 void NmAttachmentListWidget::hideProgressBar(int index)
 {
     NM_FUNCTION;
-    
+
     if(index >= 0 && index < mItemList.count()){
         mItemList.at(index)->hideProgressBar();
     }
@@ -255,12 +274,12 @@
     QWidget *widget)
 {
     NM_FUNCTION;
-    
+
     Q_UNUSED(option);
     Q_UNUSED(widget);
     if (painter&&mLayout){
         painter->save();
-        
+
         // Use text color as a line color if set, otherwise use theme
         // normal list content color.
         painter->setPen(checkColor());
@@ -271,11 +290,12 @@
         for (int i=0;i<rowCount;i++){
             QGraphicsLayoutItem *item = mLayout->itemAt(i,0);
             if (item){
-                QRectF itemRect = item->geometry();      
-                QLineF line1( itemRect.topLeft().x(), itemRect.bottomRight().y(),
-                              layoutRect.bottomRight().x(), itemRect.bottomRight().y());
-                painter->drawLine(line1);                     
-            }     
+			    qreal offsetY = 0.5;
+                QRectF itemRect = item->geometry();
+                QLineF line1( itemRect.topLeft().x(), itemRect.bottomRight().y()+offsetY,
+                              layoutRect.bottomRight().x(), itemRect.bottomRight().y()+offsetY);
+                painter->drawLine(line1);
+            }
         }
         painter->restore();
     }
@@ -288,7 +308,7 @@
 void NmAttachmentListWidget::setProgressBarValue(int index, int value)
 {
     NM_FUNCTION;
-    
+
     if(index >= 0 && index < mItemList.count()){
         mItemList[index]->setProgressBarValue(value);
     }
@@ -300,7 +320,7 @@
 void NmAttachmentListWidget::init( )
 {
     NM_FUNCTION;
-    
+
     //Get mainwindow for orientation changes
     HbMainWindow *mw = hbInstance->allMainWindows().at(0);
 
@@ -316,7 +336,7 @@
     constructUi();
 
     //set flags
-    setFlag(QGraphicsItem::ItemIsFocusable);  
+    setFlag(QGraphicsItem::ItemIsFocusable);
     setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 
@@ -326,7 +346,7 @@
 void NmAttachmentListWidget::constructUi()
 {
     NM_FUNCTION;
-    
+
     setObjectName(QString(ATTACHMENT_WIDGET));
     HbDocumentLoader loader;
     bool loadingOk = false;
@@ -355,7 +375,7 @@
 void NmAttachmentListWidget::handleLongPressed(QPointF point)
 {
     NM_FUNCTION;
-    
+
     QObject *sender = QObject::sender();
     int index = findItem(sender);
     if(NmNotFoundError != index){
@@ -373,7 +393,7 @@
 void NmAttachmentListWidget::handleItemActivated()
 {
     NM_FUNCTION;
-    
+
     QObject *sender = QObject::sender();
     int index = findItem(sender);
     if(NmNotFoundError != index){
@@ -391,7 +411,7 @@
 void NmAttachmentListWidget::orientationChanged(Qt::Orientation orientation)
 {
     NM_FUNCTION;
-    
+
     //be sure that orientation has been changed
     if(mOrientation != orientation){
         mOrientation = orientation;
@@ -408,7 +428,7 @@
 int NmAttachmentListWidget::findItem(const QObject *obj)
 {
     NM_FUNCTION;
-    
+
     int found(NmNotFoundError);
     int index(0);
 
@@ -430,7 +450,7 @@
 void NmAttachmentListWidget::insertItemToLayout(NmAttachmentListItem* item)
 {
     NM_FUNCTION;
-    
+
     if(!mLayout) {
         NM_ERROR(1,"NmAttachmentListWidget::insertItemToLayout: Layout loading failed!");
         return;
@@ -453,12 +473,12 @@
 void NmAttachmentListWidget::rearrangeLayout()
 {
     NM_FUNCTION;
-    
+
     if(!mLayout) {
         NM_ERROR(1,"NmAttachmentListWidget::rearrangeLayout: Layout loading failed!");
         return;
     }
-    
+
     //remove all items from the layout
     int count(mLayout->count());
     for(int i = count - 1; i >= 0; --i){
@@ -466,7 +486,7 @@
     }
 
     //then add them back
-    QColor textColor = checkColor();    
+    QColor textColor = checkColor();
     foreach(NmAttachmentListItem *item, mItemList){
         item->setTextColor(textColor);
         insertItemToLayout(item);
@@ -479,13 +499,13 @@
 QColor NmAttachmentListWidget::checkColor()
 {
     NM_FUNCTION;
-    
+
     QColor retColor;
 
     if (mTextColor.isValid()){
         retColor = mTextColor;
     }
-    else {    
+    else {
         retColor =  HbColorScheme::color(NmAttachmentTextColor);
     }
     return retColor;
@@ -500,7 +520,7 @@
     NM_FUNCTION;
 
     if (event->type() == HbEvent::ThemeChanged) {
-        rearrangeLayout();    
+        rearrangeLayout();
     }
     return HbWidgetBase::changeEvent(event);
 }
--- a/emailuis/nmailuiwidgetsplugin/inc/nmailuiwidgetsplugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Nmail UI plugin for custom widgets
-*
-*/
-
-#ifndef NMAILUIWIDGETSPLUGIN_H_
-#define NMAILUIWIDGETSPLUGIN_H_
-
-#include <QtPlugin>
-#include <hbdocumentloaderplugin.h>
-
-class NMailUiWidgetsPlugin : public HbDocumentLoaderPlugin
-{
-public:
-    QObject *createObject(const QString& type, const QString &name);
-    QList<const QMetaObject *> supportedObjects();
-};
-
-Q_EXPORT_PLUGIN(NMailUiWidgetsPlugin)
-
-#endif /* NMAILUIWIDGETSPLUGIN_H_ */
--- a/emailuis/nmailuiwidgetsplugin/nmailuiwidgetsplugin.pro	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-# Contributors:
-# Description:
-
-CONFIG += debug
-CONFIG += plugin
-CONFIG += hb
-TEMPLATE = lib
-TARGET = nmailuiwidgetsplugin
-
-INCLUDEPATH += ./inc \
-  ../../inc
-
-HEADERS += inc/nmailuiwidgetsplugin.h
-
-SOURCES += src/nmailuiwidgetsplugin.cpp
-
-symbian*: {
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = ALL \
-        -TCB
-    TARGET.UID2 = 0x1000008D
-    TARGET.UID3 = 0x2002C349
-
-    pluginstub.sources = nmailuiwidgetsplugin.dll
-    pluginstub.path = /resource/plugins
-    DEPLOYMENT += pluginstub
-    LIBS += -lnmailuiwidgets.dll
-}
-
-win32 {
-    DESTDIR = ../../bin
-    LIBS += -L../../bin \
-        -lnmailuiwidgets
-}
--- a/emailuis/nmailuiwidgetsplugin/src/nmailuiwidgetsplugin.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Nmail plugin for custom widgets
-*
-*/
-
-#include "emailtrace.h"
-
-#include "nmailuiwidgetsplugin.h"
-#include <nmrecipientlineedit.h>
-#include <nmhtmllineedit.h>
-#include <nmeditortextedit.h>
-#include <nmbaseviewscrollarea.h>
-#include <nmattachmentlistwidget.h>
-
-QObject *NMailUiWidgetsPlugin::createObject(const QString& type, const QString &name )
-{
-    NM_FUNCTION;
-    
-    if( type == NmBaseViewScrollArea::staticMetaObject.className() ) {
-        QObject *object = new NmBaseViewScrollArea;
-        object->setObjectName(name);
-        return object;
-    }
-    if( type == NmRecipientLineEdit::staticMetaObject.className() ) {
-        QObject *object = new NmRecipientLineEdit;
-        object->setObjectName(name);
-        return object;
-    }
-    if( type == NmHtmlLineEdit::staticMetaObject.className() ) {
-        QObject *object = new NmHtmlLineEdit;
-        object->setObjectName(name);
-        return object;
-    }
-    if( type == NmEditorTextEdit::staticMetaObject.className() ) {
-        QObject *object = new NmEditorTextEdit;
-        object->setObjectName(name);
-        return object;
-    }
-    if( type == NmAttachmentListWidget::staticMetaObject.className() ) {
-        QObject *object = new NmAttachmentListWidget;
-        object->setObjectName(name);
-        return object;
-    }
-    return 0;
-}
-
-QList<const QMetaObject *> NMailUiWidgetsPlugin::supportedObjects()
-{
-    QList<const QMetaObject *> result;
-    result.append( &NmBaseViewScrollArea::staticMetaObject );
-    result.append( &NmRecipientLineEdit::staticMetaObject );
-    result.append( &NmHtmlLineEdit::staticMetaObject );
-    result.append( &NmEditorTextEdit::staticMetaObject );
-    result.append( &NmAttachmentListWidget::staticMetaObject );
-    return result;
-}
-
-// end of file
-
--- a/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Fri Sep 03 14:07:42 2010 +0300
@@ -217,12 +217,17 @@
             NmMessageEvent event,
             const NmId &folderId,
             const QList<NmId> &messageIds,
-            const NmId& mailboxId); //added to provide mailboxId
-    
+            const NmId& mailboxId);
+
+      void folderEvent(
+            NmFolderEvent event,
+            const QList<NmId> &folderIds,
+            const NmId& mailboxId);
+
     void syncStateEvent(
             NmSyncState state,
             const NmOperationCompletionEvent &event );
-    
+
     void connectionEvent(NmConnectState state, const NmId mailboxId, int errorCode);
 
     void matchFound(const NmId &messageId, const NmId &folderId);
@@ -294,6 +299,8 @@
     
     void handleSyncstateEvent(TAny* param1, TFSMailMsgId mailbox);
     
+    void handleFoldersEvent(TAny* param1,TAny* param2, NmFolderEvent event, TFSMailMsgId mailbox);
+    
     void getFolderByIdL(
             const NmId& mailboxId, 
             const NmId& folderId, 
--- a/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -1015,14 +1015,16 @@
         TInt fileSize = 0;
         file.Size(fileSize);
         if (fileSize != 0) {
-            HBufC8* data = HBufC8::NewLC(fileSize);
-            TPtr8 dataPtr = data->Des();
+            // Reserve buffer for content
+            QByteArray byteArray;
+            QT_TRYCATCH_LEAVING(byteArray = QByteArray(fileSize, 0));
+            TUint8* ptr = reinterpret_cast<unsigned char*>(byteArray.data());
+            TPtr8 dataPtr(ptr, byteArray.capacity());
 
-            if (fileSize != 0) {
-                TInt dummyPos = 0;
-                file.Seek(ESeekStart, dummyPos);
-                User::LeaveIfError(file.Read(dataPtr));
-            }
+            // Read data from the file
+            TInt dummyPos = 0;
+            file.Seek(ESeekStart, dummyPos);
+            User::LeaveIfError(file.Read(dataPtr));
 
             if (contentType.startsWith(NmContentTypeTextHtml) || contentType.contains( NmContentDescrAttachmentHtml)) {
                 QRegExp rxlen("(?:charset=)(?:\"?)([\\-\\_a-zA-Z0-9]+)", Qt::CaseInsensitive);
@@ -1031,18 +1033,15 @@
                 if (pos > -1) {
                     charset = rxlen.cap(1);
                 }
-                QByteArray msgBytes = QByteArray(reinterpret_cast<const char*>(dataPtr.Ptr()), fileSize);
                 QTextCodec *codec = QTextCodec::codecForName(charset.toAscii());
                 if (!codec) {
                     codec = QTextCodec::codecForName("UTF-8");
                 }
-                QString encodedStr = codec->toUnicode(msgBytes);
+                QString encodedStr = codec->toUnicode(byteArray);
                 messagePart.setTextContent(encodedStr, contentType);
             } else {
-                messagePart.setBinaryContent(QByteArray(
-                        reinterpret_cast<const char*>(dataPtr.Ptr()), fileSize), contentType);
+                messagePart.setBinaryContent(byteArray, contentType);
             }
-            CleanupStack::PopAndDestroy(data);
         }
         file.Close();
     }
@@ -1219,6 +1218,17 @@
     NM_FUNCTION;
 
     switch (aEvent) {
+        case TFSEventMailboxSettingsChanged:
+            break;
+
+        // Folder related events:
+        case TFSEventFoldersDeleted:                 
+            handleFoldersEvent(param1, param2, NmFolderIsDeleted, mailbox);
+            break;
+        case TFSEventNewFolder:
+            handleFoldersEvent(param1, param2, NmFolderIsCreated, mailbox);            
+            break;
+
         // Mailbox related events:
         case TFSEventNewMailbox:
             handleMailboxEvent(mailbox, NmMailboxCreated);
@@ -1795,5 +1805,39 @@
             break;
         };
 }
+
+/*!
+   function to handle folder event
+ */
+void NmFrameworkAdapter::handleFoldersEvent(
+    TAny* param1, TAny* param2, NmFolderEvent event, TFSMailMsgId mailbox)
+{
+    NM_FUNCTION;
+
+    // aParam1: RArray<TFSMailMsgId>* aEntries
+    // aParam2: TFSMailMsgId* aParentFolder
+    // aParam3: NULL      
+
+    NmId mailboxId(0);
+    mailboxId = mailbox.GetNmId();
+
+    NmId nmMsgId(0);
+    QList<NmId> folderIds;    
+
+    RArray<TFSMailMsgId>* fsEntries = reinterpret_cast<RArray<TFSMailMsgId>*> (param1);
+    TFSMailMsgId* fsFolderId = reinterpret_cast<TFSMailMsgId*> (param2);
+    NmId folderId = fsFolderId->GetNmId();
+    NmId inputFolderId = NmFrameworkAdapter::getStandardFolderId(mailboxId, NmFolderInbox);
+
+    TFSMailMsgId fsMsgId;
+    for(TInt i = 0; i < fsEntries->Count(); i++){
+        fsMsgId = (*fsEntries)[i];
+        folderId = fsMsgId.GetNmId();
+        folderIds.append(folderId);
+    }
+
+    emit folderEvent(event, folderIds, mailboxId);
+}
+
 Q_EXPORT_PLUGIN(NmFrameworkAdapter)
 
--- a/emailuis/nmhswidget/src/nmhswidgetemailengine.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmhswidget/src/nmhswidgetemailengine.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -458,13 +458,16 @@
                         this, SLOT( aiwRequestError(int, const QString&) ));
                 connect(mAiwRequest, SIGNAL( requestOk(const QVariant&) ), 
                         this, SLOT( aiwRequestOk(const QVariant&) ));
-                QList<QVariant> list;
-                list.append(QVariant(mMailboxId.id()));
-                list.append(QVariant(mFolderId.id()));
-                list.append(QVariant(messageId.id()));
+
+                QList<QVariant> argList;
+                QList<QVariant> messageIdList;
+                messageIdList.append(QVariant(mMailboxId.id()));
+                messageIdList.append(QVariant(mFolderId.id()));
+                messageIdList.append(QVariant(messageId.id()));
+                argList.append(messageIdList);
             
                 mAiwRequest->setSynchronous(false);
-                mAiwRequest->setArguments(list);
+                mAiwRequest->setArguments(argList);
                 mAiwRequest->send();
             }
         }
--- a/emailuis/nmhswidget/src/nmhswidgetemailrow.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmhswidget/src/nmhswidgetemailrow.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -334,9 +334,8 @@
         mTimeLabel->fontSpec().setRole(HbFontSpec::Secondary);
     }  
     
-    HbStyle style;
     qreal size;
-    bool found = style.parameter(QString("hb-param-text-height-secondary"), size );
+    bool found = style()->parameter(QString("hb-param-text-height-secondary"), size );
     if (found) {
         fontSpec.setTextHeight(size);
     }
--- a/emailuis/nmsettingui/bwins/nmsettinguiu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmsettingui/bwins/nmsettinguiu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,38 +1,36 @@
 EXPORTS
-	?metaObject@NmSettingsViewFactory@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * NmSettingsViewFactory::metaObject(void) const
-	?tr@NmSettingsViewLauncher@@SA?AVQString@@PBD0H@Z @ 2 NONAME ; class QString NmSettingsViewLauncher::tr(char const *, char const *, int)
-	?getStaticMetaObject@NmSettingsViewLauncher@@SAABUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const & NmSettingsViewLauncher::getStaticMetaObject(void)
-	?trUtf8@NmSettingsViewFactory@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString NmSettingsViewFactory::trUtf8(char const *, char const *, int)
-	?backPress@NmSettingsViewFactory@@AAEXXZ @ 5 NONAME ; void NmSettingsViewFactory::backPress(void)
-	?launchSettingsView@NmSettingsViewLauncher@@QAEXABVNmId@@ABVQString@@@Z @ 6 NONAME ; void NmSettingsViewLauncher::launchSettingsView(class NmId const &, class QString const &)
-	?tr@NmSettingsViewFactory@@SA?AVQString@@PBD0H@Z @ 7 NONAME ; class QString NmSettingsViewFactory::tr(char const *, char const *, int)
-	?createSettingView@NmSettingsViewFactory@@UBEPAVCpBaseSettingView@@XZ @ 8 NONAME ; class CpBaseSettingView * NmSettingsViewFactory::createSettingView(void) const
-	?metaObject@NmSettingsViewLauncher@@UBEPBUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const * NmSettingsViewLauncher::metaObject(void) const
-	?qt_metacall@NmSettingsViewFactory@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 10 NONAME ; int NmSettingsViewFactory::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1NmSettingsViewFactory@@UAE@XZ @ 11 NONAME ; NmSettingsViewFactory::~NmSettingsViewFactory(void)
-	?launchSettingView@NmSettingsViewFactory@@QBEXABVNmId@@ABVQString@@@Z @ 12 NONAME ; void NmSettingsViewFactory::launchSettingView(class NmId const &, class QString const &) const
-	?tr@NmSettingsViewLauncher@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString NmSettingsViewLauncher::tr(char const *, char const *)
-	??1NmSettingsViewLauncher@@UAE@XZ @ 14 NONAME ; NmSettingsViewLauncher::~NmSettingsViewLauncher(void)
-	?trUtf8@NmSettingsViewLauncher@@SA?AVQString@@PBD0@Z @ 15 NONAME ; class QString NmSettingsViewLauncher::trUtf8(char const *, char const *)
-	??0NmSettingsViewLauncher@@QAE@XZ @ 16 NONAME ; NmSettingsViewLauncher::NmSettingsViewLauncher(void)
-	??_ENmSettingsViewFactory@@UAE@I@Z @ 17 NONAME ; NmSettingsViewFactory::~NmSettingsViewFactory(unsigned int)
-	?trUtf8@NmSettingsViewFactory@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString NmSettingsViewFactory::trUtf8(char const *, char const *)
-	?qt_metacall@NmSettingsViewLauncher@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 19 NONAME ; int NmSettingsViewLauncher::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?getStaticMetaObject@NmSettingsViewFactory@@SAABUQMetaObject@@XZ @ 20 NONAME ; struct QMetaObject const & NmSettingsViewFactory::getStaticMetaObject(void)
-	??_ENmSettingsViewLauncher@@UAE@I@Z @ 21 NONAME ; NmSettingsViewLauncher::~NmSettingsViewLauncher(unsigned int)
-	?mailboxPropertyChanged@NmSettingsViewLauncher@@IAEXABVNmId@@VQVariant@@1@Z @ 22 NONAME ; void NmSettingsViewLauncher::mailboxPropertyChanged(class NmId const &, class QVariant, class QVariant)
-	??0NmSettingsViewFactory@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 23 NONAME ; NmSettingsViewFactory::NmSettingsViewFactory(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
-	?trUtf8@NmSettingsViewLauncher@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString NmSettingsViewLauncher::trUtf8(char const *, char const *, int)
-	?qt_metacast@NmSettingsViewLauncher@@UAEPAXPBD@Z @ 25 NONAME ; void * NmSettingsViewLauncher::qt_metacast(char const *)
-	?qt_metacast@NmSettingsViewFactory@@UAEPAXPBD@Z @ 26 NONAME ; void * NmSettingsViewFactory::qt_metacast(char const *)
-	??0NmSettingsViewFactory@@QAE@PBVNmSettingsViewLauncher@@AAVCpItemDataHelper@@ABVQString@@2ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 27 NONAME ; NmSettingsViewFactory::NmSettingsViewFactory(class NmSettingsViewLauncher const *, class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
-	?tr@NmSettingsViewFactory@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString NmSettingsViewFactory::tr(char const *, char const *)
-	?staticMetaObject@NmSettingsViewFactory@@2UQMetaObject@@B @ 29 NONAME ; struct QMetaObject const NmSettingsViewFactory::staticMetaObject
-	?mailboxListChanged@NmSettingsViewLauncher@@IAEXABVNmId@@W4MailboxEventType@NmSettings@@@Z @ 30 NONAME ; void NmSettingsViewLauncher::mailboxListChanged(class NmId const &, enum NmSettings::MailboxEventType)
-	?staticMetaObject@NmSettingsViewLauncher@@2UQMetaObject@@B @ 31 NONAME ; struct QMetaObject const NmSettingsViewLauncher::staticMetaObject
-	?goOnline@NmSettingsViewLauncher@@IAEXABVNmId@@@Z @ 32 NONAME ; void NmSettingsViewLauncher::goOnline(class NmId const &)
-	?aboutToClose@NmSettingsViewFactory@@IAEXXZ @ 33 NONAME ; void NmSettingsViewFactory::aboutToClose(void)
-	?goOffline@NmSettingsViewLauncher@@IAEXABVNmId@@@Z @ 34 NONAME ; void NmSettingsViewLauncher::goOffline(class NmId const &)
-	?createMessageBox@NmSettingsViewFactory@@AAEXXZ @ 35 NONAME ; void NmSettingsViewFactory::createMessageBox(void)
-	?launchWizard@NmSettingsViewFactory@@AAEXPAVHbAction@@@Z @ 36 NONAME ; void NmSettingsViewFactory::launchWizard(class HbAction *)
+	?backPress@NmSettingsViewFactory@@AAEXXZ @ 1 NONAME ; void NmSettingsViewFactory::backPress(void)
+	?createSettingView@NmSettingsViewFactory@@UBEPAVCpBaseSettingView@@XZ @ 2 NONAME ; class CpBaseSettingView * NmSettingsViewFactory::createSettingView(void) const
+	?qt_metacall@NmSettingsViewLauncher@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3 NONAME ; int NmSettingsViewLauncher::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@NmSettingsViewLauncher@@UAEPAXPBD@Z @ 4 NONAME ; void * NmSettingsViewLauncher::qt_metacast(char const *)
+	?metaObject@NmSettingsViewLauncher@@UBEPBUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const * NmSettingsViewLauncher::metaObject(void) const
+	??_ENmSettingsViewFactory@@UAE@I@Z @ 6 NONAME ; NmSettingsViewFactory::~NmSettingsViewFactory(unsigned int)
+	??0NmSettingsViewLauncher@@QAE@XZ @ 7 NONAME ; NmSettingsViewLauncher::NmSettingsViewLauncher(void)
+	?qt_metacall@NmSettingsViewFactory@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8 NONAME ; int NmSettingsViewFactory::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0NmSettingsViewFactory@@QAE@PBVNmSettingsViewLauncher@@AAVCpItemDataHelper@@ABVQString@@2ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 9 NONAME ; NmSettingsViewFactory::NmSettingsViewFactory(class NmSettingsViewLauncher const *, class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
+	??_ENmSettingsViewLauncher@@UAE@I@Z @ 10 NONAME ; NmSettingsViewLauncher::~NmSettingsViewLauncher(unsigned int)
+	?mailboxListChanged@NmSettingsViewLauncher@@IAEXABVNmId@@W4MailboxEventType@NmSettings@@@Z @ 11 NONAME ; void NmSettingsViewLauncher::mailboxListChanged(class NmId const &, enum NmSettings::MailboxEventType)
+	?metaObject@NmSettingsViewFactory@@UBEPBUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const * NmSettingsViewFactory::metaObject(void) const
+	?tr@NmSettingsViewFactory@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString NmSettingsViewFactory::tr(char const *, char const *)
+	?trUtf8@NmSettingsViewLauncher@@SA?AVQString@@PBD0H@Z @ 14 NONAME ; class QString NmSettingsViewLauncher::trUtf8(char const *, char const *, int)
+	?goOnline@NmSettingsViewLauncher@@IAEXABVNmId@@@Z @ 15 NONAME ; void NmSettingsViewLauncher::goOnline(class NmId const &)
+	?mailboxPropertyChanged@NmSettingsViewLauncher@@IAEXABVNmId@@VQVariant@@1@Z @ 16 NONAME ; void NmSettingsViewLauncher::mailboxPropertyChanged(class NmId const &, class QVariant, class QVariant)
+	?trUtf8@NmSettingsViewFactory@@SA?AVQString@@PBD0H@Z @ 17 NONAME ; class QString NmSettingsViewFactory::trUtf8(char const *, char const *, int)
+	??1NmSettingsViewLauncher@@UAE@XZ @ 18 NONAME ; NmSettingsViewLauncher::~NmSettingsViewLauncher(void)
+	?qt_metacast@NmSettingsViewFactory@@UAEPAXPBD@Z @ 19 NONAME ; void * NmSettingsViewFactory::qt_metacast(char const *)
+	?trUtf8@NmSettingsViewFactory@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString NmSettingsViewFactory::trUtf8(char const *, char const *)
+	?trUtf8@NmSettingsViewLauncher@@SA?AVQString@@PBD0@Z @ 21 NONAME ; class QString NmSettingsViewLauncher::trUtf8(char const *, char const *)
+	??1NmSettingsViewFactory@@UAE@XZ @ 22 NONAME ; NmSettingsViewFactory::~NmSettingsViewFactory(void)
+	?tr@NmSettingsViewLauncher@@SA?AVQString@@PBD0H@Z @ 23 NONAME ; class QString NmSettingsViewLauncher::tr(char const *, char const *, int)
+	?aboutToClose@NmSettingsViewFactory@@IAEXXZ @ 24 NONAME ; void NmSettingsViewFactory::aboutToClose(void)
+	?staticMetaObject@NmSettingsViewLauncher@@2UQMetaObject@@B @ 25 NONAME ; struct QMetaObject const NmSettingsViewLauncher::staticMetaObject
+	?tr@NmSettingsViewFactory@@SA?AVQString@@PBD0H@Z @ 26 NONAME ; class QString NmSettingsViewFactory::tr(char const *, char const *, int)
+	?goOffline@NmSettingsViewLauncher@@IAEXABVNmId@@@Z @ 27 NONAME ; void NmSettingsViewLauncher::goOffline(class NmId const &)
+	?launchSettingsView@NmSettingsViewLauncher@@QAEXABVNmId@@ABVQString@@@Z @ 28 NONAME ; void NmSettingsViewLauncher::launchSettingsView(class NmId const &, class QString const &)
+	?launchSettingView@NmSettingsViewFactory@@QBEXABVNmId@@ABVQString@@@Z @ 29 NONAME ; void NmSettingsViewFactory::launchSettingView(class NmId const &, class QString const &) const
+	?tr@NmSettingsViewLauncher@@SA?AVQString@@PBD0@Z @ 30 NONAME ; class QString NmSettingsViewLauncher::tr(char const *, char const *)
+	?getStaticMetaObject@NmSettingsViewLauncher@@SAABUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const & NmSettingsViewLauncher::getStaticMetaObject(void)
+	?staticMetaObject@NmSettingsViewFactory@@2UQMetaObject@@B @ 32 NONAME ; struct QMetaObject const NmSettingsViewFactory::staticMetaObject
+	?getStaticMetaObject@NmSettingsViewFactory@@SAABUQMetaObject@@XZ @ 33 NONAME ; struct QMetaObject const & NmSettingsViewFactory::getStaticMetaObject(void)
+	??0NmSettingsViewFactory@@QAE@AAVCpItemDataHelper@@ABVQString@@1ABVHbIcon@@PBVHbDataFormModelItem@@@Z @ 34 NONAME ; NmSettingsViewFactory::NmSettingsViewFactory(class CpItemDataHelper &, class QString const &, class QString const &, class HbIcon const &, class HbDataFormModelItem const *)
 
--- a/emailuis/nmsettingui/eabi/nmsettinguiu.def	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmsettingui/eabi/nmsettinguiu.def	Fri Sep 03 14:07:42 2010 +0300
@@ -1,41 +1,39 @@
 EXPORTS
 	_ZN21NmSettingsViewFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
 	_ZN21NmSettingsViewFactory11qt_metacastEPKc @ 2 NONAME
-	_ZN21NmSettingsViewFactory16staticMetaObjectE @ 3 NONAME DATA 16
-	_ZN21NmSettingsViewFactory19getStaticMetaObjectEv @ 4 NONAME
-	_ZN21NmSettingsViewFactory9backPressEv @ 5 NONAME
-	_ZN21NmSettingsViewFactoryC1EPK22NmSettingsViewLauncherR16CpItemDataHelperRK7QStringS7_RK6HbIconPK19HbDataFormModelItem @ 6 NONAME
-	_ZN21NmSettingsViewFactoryC1ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 7 NONAME
-	_ZN21NmSettingsViewFactoryC2EPK22NmSettingsViewLauncherR16CpItemDataHelperRK7QStringS7_RK6HbIconPK19HbDataFormModelItem @ 8 NONAME
-	_ZN21NmSettingsViewFactoryC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 9 NONAME
-	_ZN21NmSettingsViewFactoryD0Ev @ 10 NONAME
-	_ZN21NmSettingsViewFactoryD1Ev @ 11 NONAME
-	_ZN21NmSettingsViewFactoryD2Ev @ 12 NONAME
-	_ZN22NmSettingsViewLauncher11qt_metacallEN11QMetaObject4CallEiPPv @ 13 NONAME
-	_ZN22NmSettingsViewLauncher11qt_metacastEPKc @ 14 NONAME
-	_ZN22NmSettingsViewLauncher16staticMetaObjectE @ 15 NONAME DATA 16
-	_ZN22NmSettingsViewLauncher18launchSettingsViewERK4NmIdRK7QString @ 16 NONAME
-	_ZN22NmSettingsViewLauncher18mailboxListChangedERK4NmIdN10NmSettings16MailboxEventTypeE @ 17 NONAME
-	_ZN22NmSettingsViewLauncher19getStaticMetaObjectEv @ 18 NONAME
-	_ZN22NmSettingsViewLauncher22mailboxPropertyChangedERK4NmId8QVariantS3_ @ 19 NONAME
-	_ZN22NmSettingsViewLauncherC1Ev @ 20 NONAME
-	_ZN22NmSettingsViewLauncherC2Ev @ 21 NONAME
-	_ZN22NmSettingsViewLauncherD0Ev @ 22 NONAME
-	_ZN22NmSettingsViewLauncherD1Ev @ 23 NONAME
-	_ZN22NmSettingsViewLauncherD2Ev @ 24 NONAME
-	_ZNK21NmSettingsViewFactory10metaObjectEv @ 25 NONAME
-	_ZNK21NmSettingsViewFactory17createSettingViewEv @ 26 NONAME
-	_ZNK21NmSettingsViewFactory17launchSettingViewERK4NmIdRK7QString @ 27 NONAME
-	_ZNK22NmSettingsViewLauncher10metaObjectEv @ 28 NONAME
-	_ZTI21NmSettingsViewFactory @ 29 NONAME
-	_ZTI22NmSettingsViewLauncher @ 30 NONAME
-	_ZTV21NmSettingsViewFactory @ 31 NONAME
-	_ZTV22NmSettingsViewLauncher @ 32 NONAME
-	_ZThn8_N21NmSettingsViewFactoryD0Ev @ 33 NONAME
-	_ZThn8_N21NmSettingsViewFactoryD1Ev @ 34 NONAME
-	_ZN21NmSettingsViewFactory12aboutToCloseEv @ 35 NONAME
-	_ZN22NmSettingsViewLauncher8goOnlineERK4NmId @ 36 NONAME
-	_ZN22NmSettingsViewLauncher9goOfflineERK4NmId @ 37 NONAME
-	_ZN21NmSettingsViewFactory12launchWizardEP8HbAction @ 38 NONAME
-	_ZN21NmSettingsViewFactory16createMessageBoxEv @ 39 NONAME
+	_ZN21NmSettingsViewFactory12aboutToCloseEv @ 3 NONAME
+	_ZN21NmSettingsViewFactory16staticMetaObjectE @ 4 NONAME DATA 16
+	_ZN21NmSettingsViewFactory19getStaticMetaObjectEv @ 5 NONAME
+	_ZN21NmSettingsViewFactory9backPressEv @ 6 NONAME
+	_ZN21NmSettingsViewFactoryC1EPK22NmSettingsViewLauncherR16CpItemDataHelperRK7QStringS7_RK6HbIconPK19HbDataFormModelItem @ 7 NONAME
+	_ZN21NmSettingsViewFactoryC1ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 8 NONAME
+	_ZN21NmSettingsViewFactoryC2EPK22NmSettingsViewLauncherR16CpItemDataHelperRK7QStringS7_RK6HbIconPK19HbDataFormModelItem @ 9 NONAME
+	_ZN21NmSettingsViewFactoryC2ER16CpItemDataHelperRK7QStringS4_RK6HbIconPK19HbDataFormModelItem @ 10 NONAME
+	_ZN21NmSettingsViewFactoryD0Ev @ 11 NONAME
+	_ZN21NmSettingsViewFactoryD1Ev @ 12 NONAME
+	_ZN21NmSettingsViewFactoryD2Ev @ 13 NONAME
+	_ZN22NmSettingsViewLauncher11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME
+	_ZN22NmSettingsViewLauncher11qt_metacastEPKc @ 15 NONAME
+	_ZN22NmSettingsViewLauncher16staticMetaObjectE @ 16 NONAME DATA 16
+	_ZN22NmSettingsViewLauncher18launchSettingsViewERK4NmIdRK7QString @ 17 NONAME
+	_ZN22NmSettingsViewLauncher18mailboxListChangedERK4NmIdN10NmSettings16MailboxEventTypeE @ 18 NONAME
+	_ZN22NmSettingsViewLauncher19getStaticMetaObjectEv @ 19 NONAME
+	_ZN22NmSettingsViewLauncher22mailboxPropertyChangedERK4NmId8QVariantS3_ @ 20 NONAME
+	_ZN22NmSettingsViewLauncher8goOnlineERK4NmId @ 21 NONAME
+	_ZN22NmSettingsViewLauncher9goOfflineERK4NmId @ 22 NONAME
+	_ZN22NmSettingsViewLauncherC1Ev @ 23 NONAME
+	_ZN22NmSettingsViewLauncherC2Ev @ 24 NONAME
+	_ZN22NmSettingsViewLauncherD0Ev @ 25 NONAME
+	_ZN22NmSettingsViewLauncherD1Ev @ 26 NONAME
+	_ZN22NmSettingsViewLauncherD2Ev @ 27 NONAME
+	_ZNK21NmSettingsViewFactory10metaObjectEv @ 28 NONAME
+	_ZNK21NmSettingsViewFactory17createSettingViewEv @ 29 NONAME
+	_ZNK21NmSettingsViewFactory17launchSettingViewERK4NmIdRK7QString @ 30 NONAME
+	_ZNK22NmSettingsViewLauncher10metaObjectEv @ 31 NONAME
+	_ZTI21NmSettingsViewFactory @ 32 NONAME
+	_ZTI22NmSettingsViewLauncher @ 33 NONAME
+	_ZTV21NmSettingsViewFactory @ 34 NONAME
+	_ZTV22NmSettingsViewLauncher @ 35 NONAME
+	_ZThn8_N21NmSettingsViewFactoryD0Ev @ 36 NONAME
+	_ZThn8_N21NmSettingsViewFactoryD1Ev @ 37 NONAME
 
--- a/emailuis/nmsettingui/inc/nmsettingsviewfactory.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmsettingui/inc/nmsettingsviewfactory.h	Fri Sep 03 14:07:42 2010 +0300
@@ -31,7 +31,6 @@
 class NmId;
 class NmSettingsViewLauncher;
 class HbView;
-class HbMessageBox;
 class HbAction;
 
 class NMAILSETTINGUI_EXPORT NmSettingsViewFactory : public CpSettingFormEntryItemData
@@ -67,12 +66,9 @@
 private slots:
 
     void backPress();
-    void launchWizard(HbAction *action);
 
 private:
 
-    void createMessageBox();
-
     Q_DISABLE_COPY(NmSettingsViewFactory)
 
 private: // data
@@ -85,9 +81,6 @@
 
     // Not Owned.
     mutable HbView* mPrevView;
-
-    // Owned.
-    HbMessageBox *mMessageBox;
 };
 
 
--- a/emailuis/nmsettingui/src/nmsettingsviewfactory.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/nmsettingui/src/nmsettingsviewfactory.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -20,7 +20,6 @@
 #include <QCoreApplication>
 #include <HbInstance>
 #include <HbAction>
-#include <HbMessageBox>
 
 #include "nmsettingsviewfactory.h"
 #include "nmmailboxsettingsmanager.h"
@@ -31,9 +30,6 @@
 #include "nmsettingsviewlauncher.h"
 #include "nmsettingscommon.h"
 
-static const QString mailWizardStartExe = "mailwizard.exe";
-static const QString mailWizardStartArgs = "from:controlpanel";
-
 
 /*!
     \class NmSettingsViewFactory
@@ -61,12 +57,9 @@
     const HbIcon &icon,
     const HbDataFormModelItem *parent)
  : CpSettingFormEntryItemData(itemDataHelper, text, description, icon, parent),
-   mSettingsManager(new NmMailboxSettingsManager()), mSettingsViewLauncher(0),mPrevView(0),
-   mMessageBox(0)
+   mSettingsManager(new NmMailboxSettingsManager()), mSettingsViewLauncher(0),mPrevView(0)
 {
     NM_FUNCTION;
-
-    createMessageBox();
 }
 
 
@@ -90,11 +83,9 @@
     const HbDataFormModelItem *parent)
  : CpSettingFormEntryItemData(itemDataHelper, text, description, icon, parent),
      mSettingsManager(new NmMailboxSettingsManager()), mSettingsViewLauncher(viewLauncher),
-     mPrevView(0), mMessageBox(0)
+     mPrevView(0)
 {
     NM_FUNCTION;
-
-    createMessageBox();
 }
 
 
@@ -106,7 +97,6 @@
     NM_FUNCTION;
 
     delete mSettingsManager;
-    delete mMessageBox;
 }
 
 
@@ -131,9 +121,7 @@
 
     switch(mailboxCount) {
         case 0: {
-            // Query the user whether to launch the wizard or not.
-            mMessageBox->open(const_cast<NmSettingsViewFactory *>(this),
-                              SLOT(launchWizard(HbAction *)));
+            // Mailbox doesn't exist, we can't open settings
             break;
         }
         case 1: {
@@ -270,36 +258,5 @@
     }
 }
 
-/*!
-    Handles user selection from "No mailboxes defined" dialog. Launches the Mail Wizard if \a action
-    is the dialog's primary action ("Yes"). Otherwise does nothing.
-    \param action. Action selected by the user.
-*/
-void NmSettingsViewFactory::launchWizard(HbAction *action)
-{
-    NM_FUNCTION;
-
-    if (action == mMessageBox->primaryAction()) {
-        // Launch mail wizard.
-        NM_COMMENT(QString("NmSettingsViewFactory::launchWizard(): launching the mail wizard"));
-        QStringList args;
-        args << mailWizardStartArgs;
-        QProcess::startDetached(mailWizardStartExe, args);
-    }
-}
-
-/*!
-    Creates the "No mailboxes defined" dialog. Called from the constructors.
-*/
-void NmSettingsViewFactory::createMessageBox()
-{
-    NM_FUNCTION;
-
-    mMessageBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-    mMessageBox->setText(hbTrId("txt_mail_dialog_no_mailboxes_create_new"));
-    mMessageBox->setTimeout(HbMessageBox::NoTimeout);
-    mMessageBox->setStandardButtons(HbMessageBox::Yes | HbMessageBox::No);
-}
-
 
 // End of file.
--- a/emailuis/rom/nmail.iby	Mon Aug 23 23:32:31 2010 +0300
+++ b/emailuis/rom/nmail.iby	Fri Sep 03 14:07:42 2010 +0300
@@ -29,9 +29,14 @@
 file=ABI_DIR\BUILD_DIR\nmailuiengine.dll	SHARED_LIB_DIR\nmailuiengine.dll    PAGED
 file=ABI_DIR\BUILD_DIR\nmailbase.dll		SHARED_LIB_DIR\nmailbase.dll        PAGED
 file=ABI_DIR\BUILD_DIR\nmailuiwidgets.dll		SHARED_LIB_DIR\nmailuiwidgets.dll        PAGED
-file=ABI_DIR\BUILD_DIR\nmailuiwidgetsplugin.dll		SHARED_LIB_DIR\nmailuiwidgetsplugin.dll     PAGED
-data=\epoc32\data\z\resource\plugins\nmailuiwidgetsplugin.qtplugin		resource\plugins\nmailuiwidgetsplugin.qtplugin
 
+//the following are for the splash screens
+data=ZRESOURCE\hb\splashml\mail_messagelist.splashml    RESOURCE_FILES_DIR\hb\splashml\mail_messagelist.splashml
+data=ZRESOURCE\hb\splashml\mail_messagelist.docml       RESOURCE_FILES_DIR\hb\splashml\mail_messagelist.docml
+data=ZRESOURCE\hb\splashml\mail_editor.splashml         RESOURCE_FILES_DIR\hb\splashml\mail_editor.splashml
+data=ZRESOURCE\hb\splashml\mail_editor.docml            RESOURCE_FILES_DIR\hb\splashml\mail_editor.docml
+data=ZRESOURCE\hb\splashml\mail_viewer.splashml         RESOURCE_FILES_DIR\hb\splashml\mail_viewer.splashml
+data=ZRESOURCE\hb\splashml\mail_viewer.docml            RESOURCE_FILES_DIR\hb\splashml\mail_viewer.docml
 
 #endif //FF_EMAIL_FRAMEWORK
 
--- a/inc/MFSMailBrandManager.h	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-#include "../emailservices/emailframework/inc/MFSMailBrandManager.h"
\ No newline at end of file
--- a/inc/MailBrandManager.hrh	Mon Aug 23 23:32:31 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-#include "../emailservices/emailframework/inc/MailBrandManager.hrh"
--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Fri Sep 03 14:07:42 2010 +0300
@@ -166,12 +166,6 @@
     TInt GetCurrentState() const;
     
     /*
-     * Gets current error code
-     * @return iError value
-     */
-    TInt GetCurrentError() const;
-    
-    /*
      * Gets email address from settings
      * @param aEmailAddress mailbox email address
      */
@@ -186,7 +180,7 @@
     void SetEmnReceivedFlagL( TBool aNewValue );
     
     /*
-     * Gets mailbox roaming stopped status
+     * Gets true if mailbox is stopped because of roaming
      * @return ETrue if roaming and mailbox logic is stopped during roaming
      */
     TBool IsMailboxRoamingStoppedL();
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -146,7 +146,7 @@
             CalculateToNextIntervalL();
             break;
         case ECommandCancelDoNotDiconnect:
-            if ( iAgent->GetState() != CIpsSosAOBaseAgent::EStateCompleted ||
+            if ( iAgent->GetState() != CIpsSosAOBaseAgent::EStateCompleted &&
                     iAgent->GetState() != CIpsSosAOBaseAgent::EStateIdle  )
                 {
                 iAgent->CancelAllAndDoNotDisconnect();
@@ -452,15 +452,6 @@
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 
-TInt CIpsSosAOMBoxLogic::GetCurrentError() const
-    {
-    FUNC_LOG;
-    return iError;
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// 
 TInt CIpsSosAOMBoxLogic::HandleTimerFiredL()
     {
     FUNC_LOG;
@@ -928,7 +919,7 @@
 	//<QMail>
     CIpsSosAOSettingsHandler* settings = NULL;
     TBool ret = EFalse;
-    TRAP_IGNORE(CIpsSosAOSettingsHandler::NewL(iSession, iMailboxId));
+    TRAP_IGNORE(settings = CIpsSosAOSettingsHandler::NewL(iSession, iMailboxId));
     if(settings){
         ret = settings->FirstEmnReceived();
         delete settings;
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -293,12 +293,15 @@
     }
 
 // ----------------------------------------------------------------------------
+// returns start time as seconds from midnight (00:00:00)
 // ----------------------------------------------------------------------------
 TTime CIpsSosAOSettingsHandler::SelectedTimeStart() const
     {
     QVariant value = NULL;
     TBool ok = GetSettingValue(IpsServices::ReceptionDayStartTime, value);
-    TDateTime time;
+    // set date time to zero
+    TTime zeroTime( 0 );
+    TDateTime time = zeroTime.DateTime();
     
     if(ok)
         {
@@ -314,12 +317,15 @@
     }
 
 // ----------------------------------------------------------------------------
+// returns stop time as seconds from midnight (00:00:00)
 // ----------------------------------------------------------------------------
 TTime CIpsSosAOSettingsHandler::SelectedTimeStop() const
     {
     QVariant value = NULL;
     TBool ok = GetSettingValue(IpsServices::ReceptionDayEndTime, value);
-    TDateTime time;
+    // set date time to zero
+    TTime zeroTime( 0 );
+    TDateTime time = zeroTime.DateTime();
     
     if(ok)
         {
--- a/ipsservices/ipssosplugin/EABI/IPSSOSPLUGINU.DEF	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosplugin/EABI/IPSSOSPLUGINU.DEF	Fri Sep 03 14:07:42 2010 +0300
@@ -19,4 +19,7 @@
 	_ZN22CIpsPlgSingleOpWatcherD1Ev @ 18 NONAME
 	_ZN22CIpsPlgSingleOpWatcherD2Ev @ 19 NONAME
 	_ZNK22CIpsPlgSingleOpWatcher9OperationEv @ 20 NONAME
+	_ZN20CIpsPlgSosBasePluginD0Ev @ 21 NONAME
+	_ZN20CIpsPlgSosBasePluginD1Ev @ 22 NONAME
+	_ZN20CIpsPlgSosBasePluginD2Ev @ 23 NONAME
 
--- a/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h	Fri Sep 03 14:07:42 2010 +0300
@@ -60,11 +60,11 @@
     void ActiveFolderChanged(
         const TFSMailMsgId& aActiveMailboxId,
         const TFSMailMsgId& aActiveFolderId);
-    
+
 public://from CExtendableEmail
 
     CEmailExtension* ExtensionL( const TUid& aInterfaceUid );
-//</Qmail>    
+//</Qmail>
 public:
 
     /**
@@ -72,7 +72,7 @@
     * Destructor
     */
     IMPORT_C virtual ~CIpsPlgSosBasePlugin();
-    
+
 public: //from MIpsPlgSingleOpWatcher
 
     /**
@@ -140,12 +140,6 @@
         const TFSMailMsgId& aSourceFolderId,
         const TFSMailMsgId& aDestinationFolderId );
 
-    virtual MDesCArray* GetMrusL( const TFSMailMsgId& aMailBoxId );
-
-    virtual void SetMrusL(
-            const TFSMailMsgId& aMailBoxId,
-            MDesCArray* aNewMruList );
-
     virtual const TFSProgress GetLastSyncStatusL(
         const TFSMailMsgId& aMailBoxId );
 
@@ -185,7 +179,7 @@
         const TFSMailMsgId& aMailBoxId,
         const TFSMailMsgId& aFolderId,
         const RArray<TFSMailMsgId>& aMessages );
-		
+
 //<qmail>
     virtual void DeleteMessagesByUidL(
         const TFSMailMsgId& aMailBoxId,
@@ -199,7 +193,7 @@
 
     virtual CFSMailMessage* CreateMessageToSendL(
         const TFSMailMsgId& aMailBoxId );
-    
+
 // <qmail>
     /**
      * Creates new email message to message store asynchronously
@@ -228,7 +222,7 @@
      * @param aOperationObserver Observer for the operation
      * @param aRequestId Id of the operation
      */
-    virtual void CreateForwardMessageL( 
+    virtual void CreateForwardMessageL(
         const TFSMailMsgId& aMailBoxId,
         const TFSMailMsgId& aOriginalMessageId,
         MFSMailRequestObserver& aOperationObserver,
@@ -252,15 +246,15 @@
      * @param aOperationObserver Observer for the operation
      * @param aRequestId Id of the operation
      */
-    virtual void CreateReplyMessageL( 
-        const TFSMailMsgId& aMailBoxId, 
+    virtual void CreateReplyMessageL(
+        const TFSMailMsgId& aMailBoxId,
         const TFSMailMsgId& aOriginalMessageId,
         const TBool aReplyToAll,
         MFSMailRequestObserver& aOperationObserver,
         const TInt aRequestId,
         const TDesC& aHeaderDescriptor );
 // </qmail>
-       
+
     virtual void StoreMessageL(
         const TFSMailMsgId& aMailBoxId,
         CFSMailMessage& aMessage );
@@ -273,7 +267,7 @@
             MFSMailRequestObserver& aOperationObserver,
             const TInt aRequestId );
     // </qmail>
-            
+
     virtual void GetMessagesL(
         const TFSMailMsgId& aMailBoxId,
         const TFSMailMsgId& aFolderId,
@@ -303,7 +297,7 @@
         const TFSMailMsgId& aParentPartId,
         const TDesC& aContentType,
         const TDesC& aFilePath );
-    
+
     // <qmail>
     virtual void NewChildPartFromFileL(
         const TFSMailMsgId& aMailBoxId,
@@ -311,7 +305,7 @@
         const TFSMailMsgId& aMessageId,
         const TFSMailMsgId& aParentPartId,
         const TDesC& aContentType,
-        const TDesC& aFilePath, 
+        const TDesC& aFilePath,
         MFSMailRequestObserver& aOperationObserver,
         const TInt aRequestId );
     // </qmail>
@@ -347,7 +341,7 @@
         const TFSMailMsgId& aMessageId,
         const TFSMailMsgId& aParentPartId,
         const TFSMailMsgId& aPartId);
-    
+
     // <qmail>
     virtual void RemoveChildPartL(
         const TFSMailMsgId& aMailBoxId,
@@ -358,7 +352,7 @@
         MFSMailRequestObserver& aOperationObserver,
         const TInt aRequestId );
     // </qmail>
-        
+
     virtual CFSMailMessagePart* MessagePartL(
         const TFSMailMsgId& aMailBoxId,
         const TFSMailMsgId& aParentFolderId,
@@ -692,19 +686,19 @@
 
     /**
 	 * Takes ownership of the cached objects or creates new ones
-	 */     	 
+	 */
 	void TakeMessageEntryLC(
 		TMsvId aId,
         CMsvEntry*& aMessageEntry,
         CImEmailMessage*& aImEmailMessage );
-    
+
     /**
      * Return objects to cache, deleting old ones in the cache if necessary
-     */         
+     */
     void ReturnMessageEntry(
         CMsvEntry* aMessageEntry,
         CImEmailMessage* aImEmailMessage );
-        
+
     /*
      * Cleans up the cached messages entries that have accessed with
      * GetMessageEntryL()
@@ -731,7 +725,7 @@
 
     /**
      * Fixes the forward (or reply) message header parts (that are copied
-     * to msg content) in case that caller has provided an own header 
+     * to msg content) in case that caller has provided an own header
      * descriptor for these parts.
      */
     void FixReplyForwardHeaderL(
@@ -739,7 +733,7 @@
             const TFSMailMsgId& aMailBoxId,
             const TFSMailMsgId& aOriginalMessageId,
             const TDesC& aHeaderDescriptor );
-    
+
 private:
 
     /**
@@ -835,7 +829,7 @@
 
     // flag indicates is instance under FSEmail.exe
     TBool iIsUnderUiProcess;
-    
+
     //<Qmail>
     CIpsStateExtension*    iStateExtension;//owned
     //</Qmail>
--- a/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -24,7 +24,7 @@
 #include "ipsplgsosbaseplugin.hrh"
 #include "ipsplgmailstoreroperation.h"
 #include "ipsplgmessagepartstoreroperation.h"
-#include "BasePlugin.h" 
+#include "BasePlugin.h"
 //<Qmail>
 #include "ipssosextendedsettingsmanager.h"
 #include "ipssettingkeys.h"
@@ -60,7 +60,7 @@
         {
         User::Leave(KErrNotSupported);
         }
-    
+
     return iStateExtension;
     }
 //</Qmail>
@@ -89,7 +89,7 @@
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // <qmail> iSettingsApi, iWait removed
-CIpsPlgSosBasePlugin::~CIpsPlgSosBasePlugin()
+EXPORT_C CIpsPlgSosBasePlugin::~CIpsPlgSosBasePlugin()
     {
     FUNC_LOG;
     iOperations.ResetAndDestroy();
@@ -151,7 +151,7 @@
                 dummyBuf ) );
         }
     aosession.Close();
-#endif    
+#endif
     }
 
 // ----------------------------------------------------------------------------
@@ -321,7 +321,7 @@
         address = smtpSet->EmailAddress().AllocL();
         CleanupStack::PopAndDestroy( 2, acc );
 // </qmail>
-        
+
         CleanupStack::PushL( address ); // << address
         CFSMailAddress* fsAddress = CFSMailAddress::NewLC();    // << fsAddress
         fsAddress->SetEmailAddress( *address );
@@ -348,7 +348,7 @@
         {
         User::Leave( KErrNotReady );
         }
-    
+
 // <qmail> RAlwaysOnlineClientSession - related code removed
     // Prepare the parameters to be forwarded to AO-server
     TPckg<TMsvId> param = aMailBoxId.Id();
@@ -454,7 +454,7 @@
         ret = KErrNone;
         }
     ret = KErrNotSupported;
-    TFSProgress progress = { 
+    TFSProgress progress = {
             TFSProgress::EFSStatus_RequestComplete, 0, 0, ret };
     aOperationObserver.RequestResponseL(
             progress, aRequestId );
@@ -552,23 +552,6 @@
 	{
 	}
 
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-MDesCArray* CIpsPlgSosBasePlugin::GetMrusL(
-                const TFSMailMsgId& aMailBoxId)
-    {
-    return iMruList->GetMruListL( aMailBoxId );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-void CIpsPlgSosBasePlugin::SetMrusL(
-    const TFSMailMsgId& aMailBoxId,
-    MDesCArray*  aNewMruList )
-    {
-    iMruList->SetMruListL( aMailBoxId, aNewMruList );
-    }
-
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::GoOnlineL( const TFSMailMsgId& aMailBoxId )
@@ -648,18 +631,18 @@
             DeleteAndRemoveOperation( i, KErrCancel );
             }
         }
-    
-#ifndef RD_101_EMAIL    
+
+#ifndef RD_101_EMAIL
     RAlwaysOnlineClientSession aosession;
     err = aosession.Connect();
     if ( err == KErrNone )
         {
         TPckgBuf<TMsvId> buf(aMailBoxId.Id());
-        TRAP( err, aosession.RelayCommandL( 
+        TRAP( err, aosession.RelayCommandL(
                 EServerAPIEmailCancelAllAndDoNotDisconnect, buf ) );
         }
     aosession.Close();
-#endif    
+#endif
 
     return err;
     }
@@ -842,27 +825,27 @@
     FUNC_LOG;
     // asynchronous message creation is started here to enable canceling of the operation
     TMsvPartList partList( KMsvMessagePartBody );
-    
+
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewLC(*this);
 
-    //<qmail> removed mboxEntry from parameters + changed iSmtpService to pointer 
-    
-    CIpsPlgCreateMessageOperation* op = CIpsPlgCreateMessageOperation::NewL( 
-        *iSmtpService, 
+    //<qmail> removed mboxEntry from parameters + changed iSmtpService to pointer
+
+    CIpsPlgCreateMessageOperation* op = CIpsPlgCreateMessageOperation::NewL(
+        *iSmtpService,
         *iSession,
         watcher->iStatus,
-        partList, 
-        aMailBoxId, 
-        aOperationObserver, 
+        partList,
+        aMailBoxId,
+        aOperationObserver,
         aRequestId );
     //</qmail>
     watcher->SetOperation( op );
 
-    iOperations.AppendL( watcher ); 
-    CleanupStack::Pop( watcher );    
+    iOperations.AppendL( watcher );
+    CleanupStack::Pop( watcher );
     }
-// </qmail> 
- 
+// </qmail>
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 CFSMailMessage* CIpsPlgSosBasePlugin::CreateForwardMessageL(
@@ -878,7 +861,7 @@
 // <qmail>
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-void CIpsPlgSosBasePlugin::CreateForwardMessageL( 
+void CIpsPlgSosBasePlugin::CreateForwardMessageL(
     const TFSMailMsgId& aMailBoxId,
     const TFSMailMsgId& aOriginalMessageId,
     MFSMailRequestObserver& aOperationObserver,
@@ -887,50 +870,50 @@
     {
     FUNC_LOG;
     // asynchronous message creation is started here to enable canceling of the operation
-    
+
     // 1. part of function checs that body text and all
     // attachments are fetched
     TMsvEntry orgMsg;
     TMsvId service;
-    User::LeaveIfError( iSession->GetEntry( 
+    User::LeaveIfError( iSession->GetEntry(
             aOriginalMessageId.Id(), service, orgMsg ) );
-    
+
     if ( orgMsg.Id() ==  KMsvNullIndexEntryIdValue )
         {
         User::Leave(KErrNotFound);
         }
-    
-    if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) && 
+
+    if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) &&
          ( orgMsg.iMtm == KSenduiMtmSmtpUid ) )
         {
         iSmtpService->ChangeServiceIdL( orgMsg );
         }
-    
+
     TMsvPartList partList( KMsvMessagePartBody | KMsvMessagePartAttachments );
-    
+
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewLC(*this);
-    
+
     //<qmail> changed iSmtpService to pointer
-    CIpsPlgCreateForwardMessageOperation* op = CIpsPlgCreateForwardMessageOperation::NewL( 
-        *iSmtpService, 
+    CIpsPlgCreateForwardMessageOperation* op = CIpsPlgCreateForwardMessageOperation::NewL(
+        *iSmtpService,
         *iSession,
         watcher->iStatus,
-        partList, 
-        aMailBoxId, 
-        orgMsg.Id(), 
-        aOperationObserver, 
+        partList,
+        aMailBoxId,
+        orgMsg.Id(),
+        aOperationObserver,
         aRequestId );
     //</qmail>
     watcher->SetOperation( op );
 
-    iOperations.AppendL( watcher ); 
+    iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
     }
-// </qmail> 
+// </qmail>
 
 // ----------------------------------------------------------------------------
-// ---------------------------------------------------------------------------- 	
-CFSMailMessage* CIpsPlgSosBasePlugin::CreateReplyMessageL( 
+// ----------------------------------------------------------------------------
+CFSMailMessage* CIpsPlgSosBasePlugin::CreateReplyMessageL(
     const TFSMailMsgId& /*aMailBoxId*/,
     const TFSMailMsgId& /*aOriginalMessageId*/,
     const TBool /*aReplyToAll*/,
@@ -943,8 +926,8 @@
 
 // <qmail>
 // ----------------------------------------------------------------------------
-// ---------------------------------------------------------------------------- 	
-void CIpsPlgSosBasePlugin::CreateReplyMessageL( 
+// ----------------------------------------------------------------------------
+void CIpsPlgSosBasePlugin::CreateReplyMessageL(
     const TFSMailMsgId& aMailBoxId,
     const TFSMailMsgId& aOriginalMessageId,
     const TBool aReplyToAll,
@@ -954,56 +937,56 @@
     {
     FUNC_LOG;
     // asynchronous message creation is started here to enable canceling of the operation
-    
+
     // find orginal message header and check that body is fetched
     TMsvEntry orgMsg;
     TMsvId service;
-    User::LeaveIfError( 
+    User::LeaveIfError(
         iSession->GetEntry( aOriginalMessageId.Id(), service, orgMsg ) );
-    
+
     if ( orgMsg.Id() ==  KMsvNullIndexEntryIdValue )
         {
         User::Leave(KErrNotFound);
         }
-    
-    if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) && 
+
+    if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) &&
          ( orgMsg.iMtm == KSenduiMtmSmtpUid ) )
         {
         iSmtpService->ChangeServiceIdL( orgMsg );
         }
-    
+
     // partList flags control e.g. what kind of recipient set is created
     TMsvPartList partList = KMsvMessagePartBody | KMsvMessagePartDescription
-    | KMsvMessagePartOriginator;        
+    | KMsvMessagePartOriginator;
     if( aReplyToAll )
         {
         partList |= KMsvMessagePartRecipient;
         }
-    
+
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewLC(*this);
-    
+
     //<qmail> changed iSmtpService to pointer
-    CIpsPlgCreateReplyMessageOperation* op = CIpsPlgCreateReplyMessageOperation::NewL( 
-        *iSmtpService, 
+    CIpsPlgCreateReplyMessageOperation* op = CIpsPlgCreateReplyMessageOperation::NewL(
+        *iSmtpService,
         *iSession,
         watcher->iStatus,
-        partList, 
-        aMailBoxId, 
-        orgMsg.Id(), 
-        aOperationObserver, 
+        partList,
+        aMailBoxId,
+        orgMsg.Id(),
+        aOperationObserver,
         aRequestId );
     //</qmail>
     watcher->SetOperation( op );
 
-    iOperations.AppendL( watcher ); 
+    iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
     }
 // </qmail>
 
 // ----------------------------------------------------------------------------
-// ---------------------------------------------------------------------------- 	
-//	
-void CIpsPlgSosBasePlugin::StoreMessageL( 
+// ----------------------------------------------------------------------------
+//
+void CIpsPlgSosBasePlugin::StoreMessageL(
     const TFSMailMsgId& aMailBoxId,
     CFSMailMessage& aMessage )
  	{
@@ -1031,9 +1014,9 @@
 		// <qmail> Cmail change to synchronous call (UpdateMessageFlagsL) ignored,
         // <qmail> because it causes emulator & HW to freeze on 10.1
         CIpsPlgSingleOpWatcher* opW = CIpsPlgSingleOpWatcher::NewLC( *this );
-        CMsvOperation* op = iMsgMapper->UpdateMessageFlagsAsyncL( 
+        CMsvOperation* op = iMsgMapper->UpdateMessageFlagsAsyncL(
                 msgId.Id(), aMessage, opW->iStatus );
-        
+
         if ( op )
             {
             opW->SetOperation( op );
@@ -1063,19 +1046,19 @@
     RPointerArray<CFSMailMessage> &messages,
     MFSMailRequestObserver& aOperationObserver,
     const TInt aRequestId )
-    
+
     {
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewL(*this);
     CleanupStack::PushL(watcher);
-    CIpsPlgMailStorerOperation* op = 
+    CIpsPlgMailStorerOperation* op =
             CIpsPlgMailStorerOperation::NewLC(
                     *iSession,
                     watcher->iStatus,
-                    *this, 
-                    messages, 
-                    aOperationObserver, 
+                    *this,
+                    messages,
+                    aOperationObserver,
                     aRequestId );
-    
+
     watcher->SetOperation(op);
     iOperations.AppendL(watcher);
     CleanupStack::Pop( 2, watcher );
@@ -1154,7 +1137,7 @@
 
 // <qmail>
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------  
+// ----------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::NewChildPartFromFileL(
     const TFSMailMsgId& aMailBoxId,
     const TFSMailMsgId& /* aParentFolderId */,
@@ -1167,26 +1150,26 @@
     {
     FUNC_LOG;
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewLC(*this);
-    
+
     CIpsPlgNewChildPartFromFileOperation* op = CIpsPlgNewChildPartFromFileOperation::NewL(
-        *iSession, 
+        *iSession,
         watcher->iStatus,
         aMailBoxId,
         aMessageId,
         aContentType,
         aFilePath,
-        aOperationObserver, 
+        aOperationObserver,
         aRequestId,
         iMsgMapper);
     watcher->SetOperation( op );
 
-    iOperations.AppendL( watcher ); 
+    iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
     }
-// </qmail> 
+// </qmail>
 
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------  
+// ----------------------------------------------------------------------------
 CFSMailMessagePart* CIpsPlgSosBasePlugin::NewChildPartFromFileL(
     const TFSMailMsgId& /*aMailBoxId*/,
     const TFSMailMsgId& /*aParentFolderId*/,
@@ -1231,9 +1214,9 @@
 
 // <qmail>
 // ----------------------------------------------------------------------------
-// Supports currently deletion of attachments and multipart structures 
+// Supports currently deletion of attachments and multipart structures
 // which are represented as folders in Symbian store)
-// ----------------------------------------------------------------------------  
+// ----------------------------------------------------------------------------
 //
 void CIpsPlgSosBasePlugin::RemoveChildPartL(
     const TFSMailMsgId& /* aMailBoxId */,
@@ -1246,17 +1229,17 @@
     {
     FUNC_LOG;
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewLC(*this);
-    
+
     CIpsPlgRemoveChildPartOperation* op = CIpsPlgRemoveChildPartOperation::NewL(
-        *iSession, 
+        *iSession,
         watcher->iStatus,
         aMessageId,
         aPartId,
-        aOperationObserver, 
+        aOperationObserver,
         aRequestId);
     watcher->SetOperation( op );
 
-    iOperations.AppendL( watcher ); 
+    iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
 
     }
@@ -1284,8 +1267,8 @@
 // manager. Instead, it calls Symbian framework classes directly by
 // accessing the attachment entry.
 // Qmail change: returns file handle for read/write
-// ----------------------------------------------------------------------------  
-TInt CIpsPlgSosBasePlugin::GetMessagePartFileL(  
+// ----------------------------------------------------------------------------
+TInt CIpsPlgSosBasePlugin::GetMessagePartFileL(
     const TFSMailMsgId& /* aMailBoxId */,
     const TFSMailMsgId& /* aParentFolderId */,
     const TFSMailMsgId& /* aMessageId */,
@@ -1441,13 +1424,13 @@
     const TFSMailMsgId& aMessagePartId )
 	{
     FUNC_LOG;
-    
-//<qmail> Rewritten in Qmail: CIpsPlgOperationWait is no longer used 
+
+//<qmail> Rewritten in Qmail: CIpsPlgOperationWait is no longer used
     // Notice that SetContentL sets only the content of text/plain message part:
     // text/html part can be modified directly using GetMessagePartFileL
 	CMsvEntry* cEntry( NULL );
     CMsvStore* store = NULL;
-    
+
     // following code should fill text/plain content
     cEntry = iSession->GetEntryL( aMessagePartId.Id() );
     CleanupStack::PushL( cEntry );
@@ -1507,7 +1490,7 @@
 
 //<qmail>
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------     
+// ----------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::StoreMessagePartsL(
     RPointerArray<CFSMailMessagePart>&  aMessageParts,
     MFSMailRequestObserver& aOperationObserver,
@@ -1519,15 +1502,15 @@
             CIpsPlgMessagePartStorerOperation::NewLC(*iSession,
                     watcher->iStatus, *this, aMessageParts,
                     aOperationObserver, aRequestId);
-    
+
     watcher->SetOperation(op);
     iOperations.AppendL(watcher);
-    CleanupStack::Pop( 2, watcher );    
+    CleanupStack::Pop( 2, watcher );
     }
 //<//qmail>
 
 // ----------------------------------------------------------------------------
-// ---------------------------------------------------------------------------- 	
+// ----------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::UnregisterRequestObserver( TInt /* aRequestId */)
     {
     }
@@ -1551,9 +1534,9 @@
     CleanupStack::Pop( watcher );
  	}
 
-   
+
 // ----------------------------------------------------------------------------
-// ---------------------------------------------------------------------------- 	
+// ----------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::SendMessageL( CFSMailMessage& /*aMessage*/ )
     {
     FUNC_LOG;
@@ -1702,19 +1685,19 @@
     TInt count = aMessages.Count();
     TMsvEntry tEntry;
     TMsvId service;
-    
+
     for(TInt i=0; i<count; i++)
         {
         iSession->GetEntry( aMessages[i].Id(), service, tEntry );
         //make sure that only messages get deleted.
         if( tEntry.iType == KUidMsvMessageEntry )
-            {            
-			// <qmail>    
+            {
+			// <qmail>
             sel->AppendL( tEntry.Id() );
-			// </qmail>    
+			// </qmail>
             }
         }
-        
+
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewL( *this );
     CleanupStack::PushL( watcher );
     //<qmail>
@@ -1746,17 +1729,17 @@
     TInt count = aMessages.Count();
     TMsvEntry tEntry;
     TMsvId service;
-    
+
     for(TInt i=0; i<count; i++)
         {
         iSession->GetEntry( aMessages[i].Id(), service, tEntry );
         //make sure that only messages get deleted.
         if( tEntry.iType == KUidMsvMessageEntry )
-            {            
+            {
             sel->AppendL( tEntry.Id() );
             }
         }
-        
+
     CIpsPlgSingleOpWatcher* watcher = CIpsPlgSingleOpWatcher::NewL( *this );
     CleanupStack::PushL( watcher );
     CMsvOperation* op = CIpsPlgDeleteOperation::NewL( *iSession,
@@ -1856,21 +1839,21 @@
 // <qmail> not used; should be removed
 //    FUNC_LOG;
 //	TBool cancelled = EFalse;
-//	
+//
 //	if ( aPassword.Length() > 0 )
 //	    {
 //    	//Set new password and signal (possible) ongoing connect operation
 //    	//CIpsSetDataApi* api = CIpsSetDataApi::NewL( *iSession );
 //        //CleanupStack::PushL( api );
-//        
+//
 //        //CMsvEntry* cEntry = iSession->GetEntryL( aMailBoxId.Id() );
 //        //CleanupStack::PushL( cEntry );
-//        
+//
 //        //api->SetNewPasswordL( *cEntry, aPassword );
-//        
+//
 //        //CleanupStack::PopAndDestroy( 2, api );//cEntry, api
-//        
-//        //now signal through eventhandler that credientials have been set       
+//
+//        //now signal through eventhandler that credientials have been set
 //	    }
 //	else
 //	    {
@@ -1906,7 +1889,7 @@
     aImEmailMessage = iCachedEmailMessage;
     }
 
-    
+
 // ----------------------------------------------------------------------------
 // CIpsPlgSosBasePlugin::TakeMessageEntryL( )
 // Takes ownership of the cached objects or creates new ones
@@ -1924,7 +1907,7 @@
         // Can't use the ones that are in cache, create new ones and don't replace the ones in cache
         aMessageEntry = iSession->GetEntryL( aId );
         aImEmailMessage = 0;
-        
+
         if ( aMessageEntry->Entry().iType == KUidMsvMessageEntry )
             {
             CleanupStack::PushL( aMessageEntry );
@@ -1940,7 +1923,7 @@
     	iCachedEntry = 0;
     	iCachedEmailMessage = 0;
     	}
-    	
+
     // Ownership is transferred to the caller
     CleanupStack::PushL( aMessageEntry );
     CleanupStack::PushL( aImEmailMessage );
@@ -1954,12 +1937,12 @@
 	{
 	// Clean old ones from the cache
 	CleanCachedMessageEntries();
-	
+
 	// Always save the latest ones in the cache
 	iCachedEntry = aMessageEntry;
 	iCachedEmailMessage = aImEmailMessage;
     }
-   
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //
@@ -2073,7 +2056,7 @@
     {
     FUNC_LOG;
     CIpsPlgSingleOpWatcher* opWatcher = iOperations[aOpArrayIndex];
-    
+
 // <qmail> removed; does nothing
     // The operations matches, handle it in protocol plugin...if needed.
     //TRAP_IGNORE( HandleOpCompletedL( *opWatcher, aCompleteCode ) );
@@ -2114,32 +2097,32 @@
     if ( textBodyPart )
         {
         CleanupStack::PushL( textBodyPart );
-        CFSMailMessage* origMsg = GetMessageByUidL( 
-                                        aMailBoxId, 
-                                        TFSMailMsgId(), 
-                                        aOriginalMessageId, 
+        CFSMailMessage* origMsg = GetMessageByUidL(
+                                        aMailBoxId,
+                                        TFSMailMsgId(),
+                                        aOriginalMessageId,
                                         EFSMsgDataStructure );
         if ( origMsg )
             {
             CleanupStack::PushL( origMsg );
-            CFSMailMessagePart* origMsgTextBodyPart = 
+            CFSMailMessagePart* origMsgTextBodyPart =
                 origMsg->PlainTextBodyPartL();
                 if ( origMsgTextBodyPart )
                     {
                     CleanupStack::PushL( origMsgTextBodyPart );
                     // Use the content provided in aHeaderDescriptor
-                    // instead of what is provided by 
+                    // instead of what is provided by
                     // CreateForwardSmtpMessage..
                     TPckgBuf<TReplyForwardParams> pckg;
                     pckg.Copy( aHeaderDescriptor );
                     TPtr hPtr( pckg().iHeader->Des() );
-                    HBufC* body = HBufC::NewLC( 
+                    HBufC* body = HBufC::NewLC(
                             textBodyPart->FetchedContentSize() );
                     TPtr bPtr( body->Des() );
                     origMsgTextBodyPart->GetContentToBufferL( bPtr, 0 );
                     HBufC* content = HBufC::NewLC(
                             hPtr.Length() + bPtr.Length() );
-                    TPtr cPtr( content->Des() );                        
+                    TPtr cPtr( content->Des() );
                     cPtr.Append( hPtr );
                     cPtr.Append( bPtr );
                     textBodyPart->SetContent( cPtr );
@@ -2182,11 +2165,11 @@
 
         CIpsPlgBaseOperation* op = CIpsPlgDisconnectOp::NewL(
             *iSession,
-            watcher->iStatus, 
-            service, 
+            watcher->iStatus,
+            service,
             ActivityTimerL( aMailBoxId ),
-            aMailBoxId, 
-            &aObserver, 
+            aMailBoxId,
+            &aObserver,
             aRequestId );
 
         watcher->SetOperation( op );
@@ -2416,8 +2399,8 @@
 
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
-void CIpsPlgSosBasePlugin::SetMailboxName( 
-        const TFSMailMsgId& aMailboxId, 
+void CIpsPlgSosBasePlugin::SetMailboxName(
+        const TFSMailMsgId& aMailboxId,
         const TDesC& /*aMailboxName*/ )
     {
     FUNC_LOG;
@@ -2475,7 +2458,7 @@
     TBool ret( EFalse );
     for ( TInt i = 0; i < iOperations.Count(); i++ )
         {
-        if( iOperations[i]->BaseOperation() && 
+        if( iOperations[i]->BaseOperation() &&
             iOperations[i]->BaseOperation()->FSMailboxId() == aMailboxId )
             {
             ret = ETrue;
@@ -2496,11 +2479,11 @@
     TMsvId service;
     TMsvEntry folder;
     iSession->GetEntry( aActiveFolderId.Id(), service, folder );
-    
-    
+
+
     //currently, no actions unless this is inbox
     //also, if id is '0', it means inbox before first sync...it doesn't really exist yet
-    if( folder.iDetails.CompareF( KIpsPlgInbox ) == 0 || folder.Id() == 0 || 
+    if( folder.iDetails.CompareF( KIpsPlgInbox ) == 0 || folder.Id() == 0 ||
             ( folder.iMtm == KSenduiMtmPop3Uid ) &&
             ( folder.iType == KUidMsvServiceEntry ) &&
             ( folder.iServiceId == aActiveFolderId.Id() ) )
@@ -2512,15 +2495,15 @@
             //we won't do anything if sync is already started
             return;
             }
-        
+
         //check are we in polling mode
-        NmIpsSosExtendedSettingsManager* eMgr= 
+        NmIpsSosExtendedSettingsManager* eMgr=
                 new NmIpsSosExtendedSettingsManager(aActiveMailboxId.Id());
-        
+
         QVariant value;
         bool ok = eMgr->readSetting(IpsServices::ReceptionActiveProfile, value);
         delete eMgr;
-        
+
         if ( ok )
             {
             TInt profile = value.toInt();
@@ -2529,7 +2512,7 @@
                 // let's sync
                 GoOnlineL(aActiveMailboxId);
                 }
-            }        
-        }        
+            }
+        }
     }
 // </qmail>
--- a/ipsservices/nmipssettings/inc/nmipsextendedsettingsmanager.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/inc/nmipsextendedsettingsmanager.h	Fri Sep 03 14:07:42 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef NMIPSEXTENDEDSETTINGSMANAGER_H
 #define NMIPSEXTENDEDSETTINGSMANAGER_H
 
-#include <qvariant.h>
+#include <QVariant>
 #include "nmipssettingitems.h"
 
 class NmId;
@@ -30,7 +30,7 @@
 public:
     NmIpsExtendedSettingsManager(const NmId &mailboxId);
     virtual ~NmIpsExtendedSettingsManager();
-    
+
     bool readSetting(IpsServices::SettingItem settingItem, QVariant &settingValue) const;
     bool writeSetting(IpsServices::SettingItem settingItem, const QVariant &settingValue);
     bool writeSetting(int profileMode, IpsServices::SettingItem settingItem, const QVariant &settingValue);
--- a/ipsservices/nmipssettings/inc/nmipssettingslabeledcombobox.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/inc/nmipssettingslabeledcombobox.h	Fri Sep 03 14:07:42 2010 +0300
@@ -18,9 +18,9 @@
 #ifndef NMIPSSETTINGSLABELEDCOMBOBOX_H
 #define NMIPSSETTINGSLABELEDCOMBOBOX_H
 
-#include <qstringlist.h>
-#include <hbwidget.h>
-#include <qhash.h>
+#include <QStringList>
+#include <QHash>
+#include <HbWidget>
 
 class QGraphicsLinearLayout;
 class QGraphicsItem;
@@ -38,7 +38,7 @@
 public:
 
     NmIpsSettingsLabeledComboBox(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
-    virtual ~NmIpsSettingsLabeledComboBox();
+    ~NmIpsSettingsLabeledComboBox();
 
     int currentIndex() const;
     void setCurrentIndex(int index);
--- a/ipsservices/nmipssettings/inc/nmipssettingsplugin.h	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/inc/nmipssettingsplugin.h	Fri Sep 03 14:07:42 2010 +0300
@@ -20,14 +20,11 @@
 
 #include <QObject>
 #include <QVariant>
-#include <QPersistentModelIndex>
 #include <AlwaysOnlineManagerClient.h>
 
 #include "nmsettingsplugininterface.h"
 #include "nmsettingscommon.h"
 
-class QTranslator;
-class QModelIndex;
 class HbDataForm;
 class HbDataFormModel;
 class HbDataFormModelItem;
@@ -58,7 +55,7 @@
 public slots:
 
     void aboutToClose();
-    
+
 private slots:
 
     void createUserDefinedMode();
--- a/ipsservices/nmipssettings/src/nmipsextendedsettingsmanager.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipsextendedsettingsmanager.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -18,7 +18,7 @@
 #include <xqsettingsmanager.h>
 #include <xqcentralrepositoryutils.h>
 #include <xqcentralrepositorysearchcriteria.h>
-#include <qlist.h>
+#include <QList>
 
 #include "nmipsextendedsettingsmanager.h"
 #include "nmipssettingitems.h"
--- a/ipsservices/nmipssettings/src/nmipsimap4settingsmanager.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipsimap4settingsmanager.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -99,7 +99,7 @@
         case IpsServices::IncomingSecureSockets:
         	settingValue = mImap4Settings->SecureSockets();
             found = true;
-            break;  
+            break;
         case IpsServices::IncomingSSLWrapper:
         	settingValue = mImap4Settings->SSLWrapper();
             found = true;
@@ -120,8 +120,8 @@
 bool NmIpsImap4SettingsManager::writeSetting(IpsServices::SettingItem settingItem,
                                              const QVariant &settingValue)
 {
-    HBufC *tmp = 0;
-    HBufC8 *tmp8 = 0;
+    HBufC *tmp = NULL;
+    HBufC8 *tmp8 = NULL;
 
     bool ret(false);
     TInt err(KErrNone);
@@ -157,11 +157,11 @@
                 ret = saveSettings();
             }
             break;
-        case IpsServices::IncomingPort:            
+        case IpsServices::IncomingPort:
             mImap4Settings->SetPort(settingValue.toInt());
             ret = saveSettings();
             break;
-        case IpsServices::FolderPath:            
+        case IpsServices::FolderPath:
             tmp8 = XQConversions::qStringToS60Desc8(settingValue.toString());
             TRAP(err, mImap4Settings->SetFolderPathL(*tmp8));
             delete tmp;
@@ -172,11 +172,22 @@
         case IpsServices::IncomingSecureSockets:
             mImap4Settings->SetSecureSockets(settingValue.toBool());
             ret = saveSettings();
-            break;  
+            break;
         case IpsServices::IncomingSSLWrapper:
             mImap4Settings->SetSSLWrapper(settingValue.toBool());
             ret = saveSettings();
-            break;  
+            break;
+        case IpsServices::ReceptionInboxSyncWindow: {
+            int inboxValue = settingValue.toInt();
+            if (inboxValue == 0) {
+                // for CImImap4Settings all messages value is -1
+                inboxValue = -1;
+            }
+            mImap4Settings->SetInboxSynchronisationLimit(inboxValue);
+            ret = saveSettings();
+            ret = NmIpsSettingsManagerBase::writeSetting(settingItem, settingValue);
+            break;
+        }
         case IpsServices::Connection:
             ret = saveIAPSettings(settingValue.toUInt());
             // Fallthrough so SMTP IAP settings are also updated accordingly.
@@ -195,6 +206,12 @@
 int NmIpsImap4SettingsManager::deleteMailbox()
 {
     TRAPD(error, mAccount->DeleteImapAccountL(mImap4Account));
+
+    // Try to delete the mailbox again if it failed because it was locked or in use
+	if (error==KErrInUse || error==KErrLocked) {
+		TRAP(error, mAccount->DeleteImapAccountL(mImap4Account));
+	}
+
     if (!error) {
 		NmIpsSettingsManagerBase::deleteMailbox();
     }
@@ -213,7 +230,7 @@
     int port(IpsServices::standardImap4Port);
     if (mImap4Settings->SSLWrapper()) {
         port = IpsServices::imap4OverSslPort;
-    }        
+    }
     return port;
 }
 
--- a/ipsservices/nmipssettings/src/nmipspop3settingsmanager.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipspop3settingsmanager.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -86,15 +86,15 @@
         case IpsServices::IncomingMailServer:
             settingValue = XQConversions::s60DescToQString(mPop3Settings->ServerAddress());
             found = true;
-            break;   
+            break;
         case IpsServices::IncomingPort:
             settingValue = mPop3Settings->Port();
             found = true;
-            break;  
+            break;
         case IpsServices::IncomingSecureSockets:
             settingValue = mPop3Settings->SecureSockets();
             found = true;
-            break;  
+            break;
         case IpsServices::IncomingSSLWrapper:
             settingValue = mPop3Settings->SSLWrapper();
             found = true;
@@ -114,8 +114,8 @@
 bool NmIpsPop3SettingsManager::writeSetting(IpsServices::SettingItem settingItem,
                                             const QVariant &settingValue)
 {
-    HBufC *tmp = 0;
-    HBufC8 *tmp8 = 0;
+    HBufC *tmp = NULL;
+    HBufC8 *tmp8 = NULL;
 
     bool ret(false);
     TInt err(KErrNone);
@@ -151,18 +151,29 @@
                 ret = saveSettings();
             }
             break;
-        case IpsServices::IncomingPort:            
+        case IpsServices::IncomingPort:
             mPop3Settings->SetPort(settingValue.toInt());
             ret = saveSettings();
             break;
         case IpsServices::IncomingSecureSockets:
             mPop3Settings->SetSecureSockets(settingValue.toBool());
             ret = saveSettings();
-            break;  
+            break;
         case IpsServices::IncomingSSLWrapper:
             mPop3Settings->SetSSLWrapper(settingValue.toBool());
             ret = saveSettings();
             break;
+        case IpsServices::ReceptionInboxSyncWindow: {
+            int inboxValue = settingValue.toInt();
+            if (inboxValue == 0) {
+                // for CImPop3Settings all messages value is -1
+                inboxValue = -1;
+            }
+            mPop3Settings->SetInboxSynchronisationLimit(inboxValue);
+            ret = saveSettings();
+            ret = NmIpsSettingsManagerBase::writeSetting(settingItem, settingValue);
+            break;
+        }
         case IpsServices::Connection:
             ret = saveIAPSettings(settingValue.toUInt());
             // Fallthrough so SMTP IAP settings are also updated accordingly.
@@ -198,7 +209,7 @@
     int port(IpsServices::standardPop3Port);
     if (mPop3Settings->SSLWrapper()) {
         port = IpsServices::securePop3Port;
-    }        
+    }
     return port;
 }
 
--- a/ipsservices/nmipssettings/src/nmipssettingscustomitem.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipssettingscustomitem.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -73,7 +73,7 @@
     QVariant data(modelIndex().data(HbDataFormModelItem::ItemTypeRole));
     int type(data.toInt());
 
-    HbWidget *widget = 0;
+    HbWidget *widget = NULL;
 
     switch (type) {
         case LabeledComboBox: {
--- a/nmail.pro	Mon Aug 23 23:32:31 2010 +0300
+++ b/nmail.pro	Fri Sep 03 14:07:42 2010 +0300
@@ -23,7 +23,6 @@
         emailservices/nmailbase \
         emailuis/nmailuiengine \
         emailuis/nmailuiwidgets \
-        emailuis/nmailuiwidgetsplugin \
         emailuis/nmsettingui \
         emailuis/nmailcpplugin \
         emailuis/nmailui \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="commonemail" name="Email Apps" levels="service support ui app">
+   <!-- need to resolve the qt parts into proper components, then uncomment the units -->
+  <collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+   <component id="nmail_client_api" name="NMail Client API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/nmail_client_api" qt:proFile="nmail_client_api.pro"/> -->
+   </component>
+   <component id="email_services_api" name="Email Services API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/email_services_api" qt:proFile="email_services_api.pro"/> -->
+   </component>
+   <component id="nmail_settings_api" name="NMail Settings API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/nmail_settings_api" qt:proFile="nmail_settings_api.pro"/> -->
+   </component>
+   <component id="email_client_api" name="EMail Client API" class="api" filter="s60" introduced="^4">
+    <!--<unit bldFile="email_plat/email_client_api" qt:proFile="email_client_api.pro"/> -->
+   </component>
+  </collection>
+    <collection id="emailservices" name="Email Services" level="service">
+      <component id="nmailbase" filter="s60" name="NMail Base" introduced="^4">
+        <!-- <unit bldFile="emailservices/nmailbase" qt:proFile="nmailbase.pro"/> -->
+      </component>
+      <component id="emailcommon" filter="s60" name="Email Common" introduced="^4">
+       <!-- <unit bldFile="emailservices/emailcommon" qt:proFile="emailcommon.pro"/>-->
+      </component>
+      <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+       <!-- <unit bldFile="emailservices/emailframework" qt:proFile="emailframework.pro"/>-->
+      </component>
+      <component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+       <!-- <unit bldFile="emailservices/emailstore" qt:proFile="emailstore.pro"/>-->
+      </component>
+      <component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
+       <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
+      </component>
+      <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
+       <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+      </component>
+     <component id="nmutilities" filter="s60" name="Nmail Utilities" introduced="^4">
+        <!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+      </component>
+    </collection>
+    <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+      <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+		<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+        <!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
+      </component>
+      <component id="nmimapclientplugin" filter="s60" name="NM IMAP Client Plugin" introduced="^4" class="plugin">
+        <!--<unit bldFile="ipsservices/nmimapclientplugin" qt:proFile="nmimapclientplugin.pro"/>-->
+      </component>
+      <component id="nmipsmtms" filter="s60" name="NM IPS Client Plugin" introduced="^4" class="plugin">
+       <!-- <unit bldFile="ipsservices/nmipsmtms" qt:proFile="nmipsmtms.pro"/>-->
+      </component>
+      <component id="nmipssettings" filter="s60" name="NM IPS Settings" introduced="^4">
+       <!-- <unit bldFile="ipsservices/nmipssettings" qt:proFile="nmipssettings.pro"/>-->
+        <unit bldFile="ipsservices/nmipssettings/tsrc/tools/extendedkeygen" qt:proFile="extendedkeygenerator.pro"/>
+      </component>
+      <component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+        <!--<unit bldFile="ipsservices" qt:proFile="ipsservices.pro"/> -->
+		<!-- can the exports be broken up into the other components or made a config component?-->
+      </component>
+    </collection>
+    <collection id="emailuis" name="Email UIs" level="app">
+      <component id="nmailuiengine" filter="s60" name="Nmail UI Engine" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailuiengine" qt:proFile="nmailuiengine.pro"/> -->
+      </component>
+      <component id="nmailuiwidgets" filter="s60" name="Nmail UI Widgets" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailuiwidgets" qt:proFile="nmailuiwidgets.pro"/> -->
+      </component>
+      <component id="nmailuiwidgetsplugin" filter="s60" name="Nmail UI Widgets Plugin" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmailuiwidgetsplugin" qt:proFile="nmailuiwidgetsplugin.pro"/> -->
+      </component>
+      <component id="nmsettingui" filter="s60" name="Nmail Setting UI" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmsettingui" qt:proFile="nmsettingui.pro"/> -->
+      </component>
+      <component id="nmailcpplugin" filter="s60" name="Nmail CP Plugin" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmailcpplugin" qt:proFile="nmailcpplugin.pro"/> -->
+      </component>
+      <component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
+      </component>
+      <component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+      </component>
+      <component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
+        <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
+      </component>
+    </collection>
+    <collection id="commonemail_info" name="Email Apps Info" level="app">
+    <component id="commonemail_build" name="Email Apps Build" introduced="^4" filter="s60">
+		<!-- split into actual components -->
+      <unit bldFile="." qt:proFile="nmail.pro"/>
+    </component>
+    </collection>
+
+
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 03 14:07:42 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>