201033
authorhgs
Mon, 23 Aug 2010 23:32:31 +0300
changeset 62 a8c646b56683
parent 57 ae34e1715e21
child 66 084b5b1f02a7
201033
emailservices/emailclientapi/inc/emailapiutils.h
emailservices/emailclientapi/inc/emailattachment.h
emailservices/emailclientapi/inc/emailclientapiimpl.h
emailservices/emailclientapi/inc/emailclientpluginmanager.h
emailservices/emailclientapi/inc/emailcontent.h
emailservices/emailclientapi/inc/emailfolder.h
emailservices/emailclientapi/inc/emailmailbox.h
emailservices/emailclientapi/inc/emailmessage.h
emailservices/emailclientapi/inc/emailmessagesearch.h
emailservices/emailclientapi/inc/emailmultipart.h
emailservices/emailclientapi/inc/emailtextcontent.h
emailservices/emailclientapi/inc/messageiterator.h
emailservices/emailclientapi/src/emailaddress.cpp
emailservices/emailclientapi/src/emailapiutils.cpp
emailservices/emailclientapi/src/emailclientapiimpl.cpp
emailservices/emailclientapi/src/emailcontent.cpp
emailservices/emailclientapi/src/emailfolder.cpp
emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp
emailservices/emailclientapi/src/emailmailbox.cpp
emailservices/emailclientapi/src/emailmessage.cpp
emailservices/emailclientapi/src/messageiterator.cpp
emailservices/emailcommon/bwins/fsfwcommonlibu.def
emailservices/emailcommon/eabi/fsfwcommonlibu.def
emailservices/emailcommon/inc/CFSMailBox.h
emailservices/emailcommon/inc/CFSMailBoxBase.h
emailservices/emailcommon/inc/CFSMailFolder.h
emailservices/emailcommon/inc/CFSMailMessage.h
emailservices/emailcommon/inc/CFSMailMessageBase.h
emailservices/emailcommon/inc/CFSMailMessagePart.h
emailservices/emailcommon/src/CFSMailBox.cpp
emailservices/emailcommon/src/CFSMailBoxBase.cpp
emailservices/emailcommon/src/CFSMailFolder.cpp
emailservices/emailcommon/src/CFSMailMessage.cpp
emailservices/emailcommon/src/CFSMailMessageBase.cpp
emailservices/emailcommon/src/CFSMailMessagePart.cpp
emailservices/emailframework/bwins/fsmailframeworku.def
emailservices/emailframework/data/fsmailbrandmanager.rss
emailservices/emailframework/eabi/fsmailframeworku.def
emailservices/emailframework/inc/CFSMailClient.h
emailservices/emailframework/inc/CFSMailPlugin.h
emailservices/emailframework/inc/CFSMailPlugin.inl
emailservices/emailframework/inc/MFSMailPlugin.h
emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp
emailservices/emailframework/src/CFSMailClient.cpp
emailservices/emailstore/base_plugin/inc/BasePlugin.h
emailservices/emailstore/base_plugin/src/BaseMrInfoObject.cpp
emailservices/emailstore/base_plugin/src/basepluginmisc.cpp
emailservices/emailstore/message_store/server/src/MessageStoreSession.cpp
emailservices/nmailagent/inc/nmmailagent.h
emailservices/nmailagent/src/nmmailagent.cpp
emailservices/nmclientapi/bwins/nmailclientapiu.def
emailservices/nmclientapi/inc/nmapiheaders.h
emailservices/nmclientapi/inc/nmapimessagemanager_p.h
emailservices/nmregister/src/nmmailboxregisterinterface.cpp
emailservices/nmregister/translations/nmregister.ts
emailservices/nmutilities/bwins/nmutilitiesu.def
emailservices/nmutilities/eabi/nmutilitiesu.def
emailservices/nmutilities/inc/nmuieventsnotifier.h
emailservices/nmutilities/nmutilities.pro
emailservices/nmutilities/src/nmuieventsnotifier.cpp
emailuis/nmailui/inc/nmapplication.h
emailuis/nmailui/inc/nmattachmentpicker.h
emailuis/nmailui/inc/nmeditorcontent.h
emailuis/nmailui/inc/nmeditorheader.h
emailuis/nmailui/inc/nmeditorview.h
emailuis/nmailui/inc/nmuiheaders.h
emailuis/nmailui/nmailui.pro
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/nmmailboxserviceinterface.cpp
emailuis/nmailui/src/nmmessagelistview.cpp
emailuis/nmailui/src/nmmessagelistviewitem.cpp
emailuis/nmailui/src/nmmessagesearchlistview.cpp
emailuis/nmailui/src/nmsendserviceinterface.cpp
emailuis/nmailui/src/nmuriserviceinterface.cpp
emailuis/nmailui/src/nmutilities.cpp
emailuis/nmailui/src/nmviewerserviceinterface.cpp
emailuis/nmailui/src/nmviewerview.cpp
emailuis/nmailui/translations/mail.qm
emailuis/nmailui/translations/mail.ts
emailuis/nmailuiengine/bwins/nmailuiengineu.def
emailuis/nmailuiengine/eabi/nmailuiengineu.def
emailuis/nmailuiengine/inc/nmdataplugininterface.h
emailuis/nmailuiengine/inc/nmuiengine.h
emailuis/nmailuiengine/src/nmuiengine.cpp
emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def
emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def
emailuis/nmailuiwidgets/inc/nmailuiwidgetsheaders.h
emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h
emailuis/nmailuiwidgets/nmailuiwidgets.pro
emailuis/nmailuiwidgets/resources/nmattachmentlistitem.css
emailuis/nmailuiwidgets/resources/nmattachmentlistitem.widgetml
emailuis/nmailuiwidgets/resources/nmattachmentlistwidget.docml
emailuis/nmailuiwidgets/resources/nmeditortextedit.widgetml
emailuis/nmailuiwidgets/resources/nmeditortexteditblack.css
emailuis/nmailuiwidgets/resources/nmeditortexteditblue.css
emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp
emailuis/nmframeworkadapter/inc/nmframeworkadapter.h
emailuis/nmframeworkadapter/inc/nmfwadeletemailboxoperation.h
emailuis/nmframeworkadapter/inc/nmfwaremovedraftmessageoperation.h
emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp
emailuis/nmframeworkadapter/src/nmfwadeletemailboxoperation.cpp
emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp
emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp
emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp
emailuis/nmframeworkadapter/src/nmfwaremovedraftmessageoperation.cpp
emailuis/nmhswidget/conf/nmhswidget.docml
emailuis/nmhswidget/conf/nmhswidgetmail.docml
emailuis/nmhswidget/inc/nmhswidget.h
emailuis/nmhswidget/inc/nmhswidgetconsts.h
emailuis/nmhswidget/inc/nmhswidgetemailrow.h
emailuis/nmhswidget/inc/nmhswidgettitlerow.h
emailuis/nmhswidget/nmhswidget.pro
emailuis/nmhswidget/src/nmhswidget.cpp
emailuis/nmhswidget/src/nmhswidgetemailrow.cpp
emailuis/nmhswidget/src/nmhswidgettitlerow.cpp
inc/BaseMrInfoObject.h
inc/basemrinfoobject.h
ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h
ipsservices/ipssosaoplugin/inc/IpsSosAOPlugin.hrh
ipsservices/ipssosaoplugin/inc/ipssosaopluginheaders.h
ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp
ipsservices/ipssosplugin/inc/ipsplgmsgmapper.h
ipsservices/ipssosplugin/inc/mipsplgmailstorerobserver.h
ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp
ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp
ipsservices/nmipssettings/inc/nmipssettingshelper.h
ipsservices/nmipssettings/inc/nmipssettingsplugin.h
ipsservices/nmipssettings/src/nmipssettingshelper.cpp
ipsservices/nmipssettings/src/nmipssettingsplugin.cpp
--- a/emailservices/emailclientapi/inc/emailapiutils.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailapiutils.h	Mon Aug 23 23:32:31 2010 +0300
@@ -19,7 +19,7 @@
 #define EMAILAPIUTILS_H
 
 #include <e32base.h>
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 #include <emailapidefs.h>
 
 //using namespace EmailInterface;
--- a/emailservices/emailclientapi/inc/emailattachment.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailattachment.h	Mon Aug 23 23:32:31 2010 +0300
@@ -23,7 +23,7 @@
 #include <e32std.h>
 #include <e32base.h>
 
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 
--- a/emailservices/emailclientapi/inc/emailclientapiimpl.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailclientapiimpl.h	Mon Aug 23 23:32:31 2010 +0300
@@ -21,8 +21,8 @@
 
 #include <implementationinformation.h> 
 #include "emailapiutils.h"
-#include "cfsmailcommon.h"
-#include "mfsmaileventobserver.h"    
+#include "CFSMailCommon.h"
+#include "MFSMailEventObserver.h"    
 #include <memailclientapi.h>
 #include "emailclientpluginmanager.h"
 
--- a/emailservices/emailclientapi/inc/emailclientpluginmanager.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailclientpluginmanager.h	Mon Aug 23 23:32:31 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef MEMAILPLUGINMANAGER_H_
 #define MEMAILPLUGINMANAGER_H_
 
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 
 class MEmailClientPluginManager
     {
--- a/emailservices/emailclientapi/inc/emailcontent.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailcontent.h	Mon Aug 23 23:32:31 2010 +0300
@@ -20,7 +20,7 @@
 
 #include <memailcontent.h>
 
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailapiutils.h"
 
 using namespace EmailInterface;
--- a/emailservices/emailclientapi/inc/emailfolder.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailfolder.h	Mon Aug 23 23:32:31 2010 +0300
@@ -19,9 +19,9 @@
 #define CEMAILFOLDER_H
 
 #include <emailapidefs.h>
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 #include <memailfolder.h>
-#include "mfsmaileventobserver.h"
+#include "MFSMailEventObserver.h"
 
 using namespace EmailInterface;
 
--- a/emailservices/emailclientapi/inc/emailmailbox.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmailbox.h	Mon Aug 23 23:32:31 2010 +0300
@@ -18,10 +18,10 @@
 #ifndef EMAILMAILBOX_H
 #define EMAILMAILBOX_H
 
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 #include <memailmailbox.h>
-#include "mfsmaileventobserver.h"
-#include "mfsmailrequestobserver.h"
+#include "MFSMailEventObserver.h"
+#include "MFSMailRequestObserver.h"
 #include "mmailboxcontentobserver.h"
 
 using namespace EmailInterface;
--- a/emailservices/emailclientapi/inc/emailmessage.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmessage.h	Mon Aug 23 23:32:31 2010 +0300
@@ -19,7 +19,7 @@
 #define EMAILMESSAGE_H
 
 #include <memailmessage.h>
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 #include "emailapiutils.h"
 #include "MFSMailRequestObserver.h"
 #include <QEventLoop>
--- a/emailservices/emailclientapi/inc/emailmessagesearch.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmessagesearch.h	Mon Aug 23 23:32:31 2010 +0300
@@ -22,8 +22,8 @@
 #include <memailmessagesearch.h>
 #include <emailsorting.h>
 
-#include "cfsmailclient.h"
-#include "mfsmailboxsearchobserver.h"
+#include "CFSMailClient.h"
+#include "MFSMailBoxSearchObserver.h"
 #include "emailapiutils.h"
 
 using namespace EmailInterface;
--- a/emailservices/emailclientapi/inc/emailmultipart.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmultipart.h	Mon Aug 23 23:32:31 2010 +0300
@@ -19,7 +19,7 @@
 #ifndef EMAILMULTIPART_H_
 #define EMAILMULTIPART_H_
 // INCLUDES
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 
--- a/emailservices/emailclientapi/inc/emailtextcontent.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailtextcontent.h	Mon Aug 23 23:32:31 2010 +0300
@@ -20,7 +20,7 @@
 #define EMAILTEXTCONTENT_H_
 
 // INCLUDES
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include <memailcontent.h>
 #include "emailapiutils.h"
 
--- a/emailservices/emailclientapi/inc/messageiterator.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/inc/messageiterator.h	Mon Aug 23 23:32:31 2010 +0300
@@ -20,7 +20,7 @@
                                                                              
 #include <mmessageiterator.h>                                                                             
 #include "emailapidefs.h"
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 
 using namespace EmailInterface;
 
--- a/emailservices/emailclientapi/src/emailaddress.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailaddress.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include "emailaddress.h"
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailclientapi.hrh"
 
 // -----------------------------------------------------------------------------
--- a/emailservices/emailclientapi/src/emailapiutils.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailapiutils.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include <e32std.h>
-#include "cfsmailplugin.h"
+#include "CFSMailPlugin.h"
 #include "emailapidefs.h"
 #include "emailclientapiimpldefs.h"
 #include "emailapiutils.h"
--- a/emailservices/emailclientapi/src/emailclientapiimpl.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailclientapiimpl.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -29,8 +29,8 @@
 #include "emailapiutils.h"
 #include "emailmailbox.h"
 #include <memailaddress.h>
-#include "cfsmailplugin.h"
-#include "cfsmailclient.h"
+#include "CFSMailPlugin.h"
+#include "CFSMailClient.h"
 #include "emailclientapiimpldefs.h"
 #include "emailmailboxcache.h"
 #include "emailclientapi.hrh"
--- a/emailservices/emailclientapi/src/emailcontent.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailcontent.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -18,7 +18,7 @@
 #include <apmstd.h>
 
 #include "emailcontent.h"
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailclientapi.hrh"
 #include "emailapiutils.h"
 
--- a/emailservices/emailclientapi/src/emailfolder.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailfolder.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -20,8 +20,8 @@
 #include "emailapiutils.h"
 #include "messageiterator.h"
 #include "emailsorting.h"
-#include "cfsmailfolder.h"
-#include "cfsmailplugin.h"
+#include "CFSMailFolder.h"
+#include "CFSMailPlugin.h"
 #include "emailclientapi.hrh"
 #include "emailclientapiimpldefs.h"
 
--- a/emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailinterfacefactoryimpl.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -20,7 +20,7 @@
 
 #include "emailinterfacefactoryimpl.h"
 #include "emailcontent.h"
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailclientapiimpldefs.h"
 #include "emailclientapiimpl.h"
 #include "emailaddress.h"
--- a/emailservices/emailclientapi/src/emailmailbox.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmailbox.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -31,14 +31,14 @@
 #include "emailfolder.h"
 #include "emailmessage.h"
 #include "emailmessagesearch.h"
-#include "cfsmailclient.h"
+#include "CFSMailClient.h"
 #include "emailclientapiimpl.h"
-#include "cfsmailplugin.h"
-#include "cfsmailbox.h"
-#include "cfsmailfolder.h"
+#include "CFSMailPlugin.h"
+#include "CFSMailBox.h"
+#include "CFSMailFolder.h"
 #include "emailclientapi.hrh"
 
-#include <XQServiceRequest.h>
+#include <xqservicerequest.h>
 #include "email_services_api.h"
 
 // Constants
--- a/emailservices/emailclientapi/src/emailmessage.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmessage.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -33,10 +33,10 @@
 #include "emailtextcontent.h"
 #include "emailmultipart.h"
 #include "emailattachment.h"
-#include "cfsmailplugin.h"
-#include "cfsmailclient.h"
+#include "CFSMailPlugin.h"
+#include "CFSMailClient.h"
 
-#include <XQServiceRequest.h>
+#include <xqservicerequest.h>
 #include "email_services_api.h"
 
 const TInt KSendMessageRequestId = 100;
--- a/emailservices/emailclientapi/src/messageiterator.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailclientapi/src/messageiterator.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -18,10 +18,10 @@
 #include "emailmessage.h"
 #include "messageiterator.h"
 #include "emailapiutils.h"
-#include "cfsmailplugin.h"
+#include "CFSMailPlugin.h"
 #include "emailapiutils.h"
 #include "emailclientapi.hrh"
-#include "mfsmailiterator.h"
+#include "MFSMailIterator.h"
 
 // number of messages in chunk to retrive from protocol plugin. Actual chunk
 // size is one less because last element is used for reference to next chunk
--- a/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/bwins/fsfwcommonlibu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -1,261 +1,235 @@
 EXPORTS
 	??1CEmailExtension@@UAE@XZ @ 1 NONAME ; CEmailExtension::~CEmailExtension(void)
-	?CancelAllRequestsL@CFSMailRequestHandler@@QAEXXZ @ 2 NONAME ; void CFSMailRequestHandler::CancelAllRequestsL(void)
-	?SaveL@CFSMailMessagePart@@QAEXXZ @ 3 NONAME ; void CFSMailMessagePart::SaveL(void)
-	?CreateMessageToSend@CFSMailBox@@QAEPAVCFSMailMessage@@XZ @ 4 NONAME ; class CFSMailMessage * CFSMailBox::CreateMessageToSend(void)
-	?FindExtension@TEmailExtensions@@QBEHABVTUid@@@Z @ 5 NONAME ; int TEmailExtensions::FindExtension(class TUid const &) const
-	?SendMessageL@CFSMailBox@@QAEXAAVCFSMailMessage@@@Z @ 6 NONAME ; void CFSMailBox::SendMessageL(class CFSMailMessage &)
-	?GetStandardFolderId@CFSMailBox@@QAE?AVTFSMailMsgId@@W4TFSFolderType@@@Z @ 7 NONAME ; class TFSMailMsgId CFSMailBox::GetStandardFolderId(enum TFSFolderType)
-	?ResetFlag@CFSMailMessageBase@@QAEXH@Z @ 8 NONAME ; void CFSMailMessageBase::ResetFlag(int)
-	?ListMrusL@CFSMailBox@@QBEPAVMDesC16Array@@XZ @ 9 NONAME ; class MDesC16Array * CFSMailBox::ListMrusL(void) const
-	?IsMRInfoProcessorSet@CFSMailBoxBase@@QAEHXZ @ 10 NONAME ; int CFSMailBoxBase::IsMRInfoProcessorSet(void)
-	??1CFSMailFolderBase@@UAE@XZ @ 11 NONAME ; CFSMailFolderBase::~CFSMailFolderBase(void)
-	??0TEmailExtensions@@QAE@XZ @ 12 NONAME ; TEmailExtensions::TEmailExtensions(void)
-	?SetFolderType@CFSMailFolderBase@@QAEXW4TFSFolderType@@@Z @ 13 NONAME ; void CFSMailFolderBase::SetFolderType(enum TFSFolderType)
-	?GetNmMessageEnvelope@CFSMailMessageBase@@QAEPAVNmMessageEnvelope@@XZ @ 14 NONAME ; class NmMessageEnvelope * CFSMailMessageBase::GetNmMessageEnvelope(void)
-	?GetName@CFSMailBoxBase@@QBEAAVTDesC16@@XZ @ 15 NONAME ; class TDesC16 & CFSMailBoxBase::GetName(void) const
-	?SaveMessageL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 16 NONAME ; int CFSMailMessage::SaveMessageL(class MFSMailRequestObserver &)
-	?AttachmentListL@CFSMailMessage@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 17 NONAME ; void CFSMailMessage::AttachmentListL(class RPointerArray<class CFSMailMessagePart> &)
-	?NewL@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 18 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewL(class TFSMailMsgId)
-	?FetchMessagesPartsL@CFSMailMessagePart@@QAEHABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@I@Z @ 19 NONAME ; int CFSMailMessagePart::FetchMessagesPartsL(class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, unsigned int)
-	?AddPluginL@CFSMailRequestHandler@@QAEXVTUid@@PAVCFSMailPlugin@@@Z @ 20 NONAME ; void CFSMailRequestHandler::AddPluginL(class TUid, class CFSMailPlugin *)
-	?CurrentSyncState@CFSMailBox@@QBE?AW4TSSMailSyncState@@XZ @ 21 NONAME ; enum TSSMailSyncState CFSMailBox::CurrentSyncState(void) const
-	?SetAttachmentNameL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CFSMailMessagePart::SetAttachmentNameL(class TDesC16 const &)
-	?SaveMessagePartsL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 23 NONAME ; int CFSMailMessage::SaveMessagePartsL(class MFSMailRequestObserver &)
-	?MoveMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@1@Z @ 24 NONAME ; void CFSMailBox::MoveMessagesL(class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
-	?GetFolderName@CFSMailFolderBase@@QBEAAVTDesC16@@XZ @ 25 NONAME ; class TDesC16 & CFSMailFolderBase::GetFolderName(void) const
-	?GetDisplayName@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 26 NONAME ; class TDesC16 & CFSMailAddress::GetDisplayName(void) const
-	?SetSubject@CFSMailMessageBase@@QAEXABVTDesC16@@@Z @ 27 NONAME ; void CFSMailMessageBase::SetSubject(class TDesC16 const &)
-	?CreateReplyMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@HABVTDesC16@@@Z @ 28 NONAME ; class CFSMailMessage * CFSMailBox::CreateReplyMessage(class TFSMailMsgId, int, class TDesC16 const &)
-	??1CFSMailBoxBase@@UAE@XZ @ 29 NONAME ; CFSMailBoxBase::~CFSMailBoxBase(void)
-	?NewLC@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 30 NONAME ; class CFSMailBox * CFSMailBox::NewLC(class TFSMailMsgId)
-	?ConstructL@CFSMailMessageBase@@IAEXABVNmMessageEnvelope@@@Z @ 31 NONAME ; void CFSMailMessageBase::ConstructL(class NmMessageEnvelope const &)
-	?NewLC@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 32 NONAME ; class CFSMailFolder * CFSMailFolder::NewLC(class TFSMailMsgId)
-	?Uid@CEmailExtension@@QBE?AVTUid@@XZ @ 33 NONAME ; class TUid CEmailExtension::Uid(void) const
-	?GetNmMessage@CFSMailMessage@@QAEPAVNmMessage@@XZ @ 34 NONAME ; class NmMessage * CFSMailMessage::GetNmMessage(void)
-	?GetContentToBufferL@CFSMailMessagePart@@QAEXAAVTDes16@@I@Z @ 35 NONAME ; void CFSMailMessagePart::GetContentToBufferL(class TDes16 &, unsigned int)
-	?BlockCopyFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 36 NONAME ; void CFSMailFolderBase::BlockCopyFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?ClearSearchResultCache@CFSMailBox@@QAEXXZ @ 37 NONAME ; void CFSMailBox::ClearSearchResultCache(void)
-	?CancelRequestL@CFSMailRequestHandler@@QAEXH@Z @ 38 NONAME ; void CFSMailRequestHandler::CancelRequestL(int)
-	?ExtensionL@CExtendableEmail@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 39 NONAME ; class CEmailExtension * CExtendableEmail::ExtensionL(class TUid const &)
-	?ListFolders@CFSMailBox@@QAEXVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 40 NONAME ; void CFSMailBox::ListFolders(class TFSMailMsgId, class RPointerArray<class CFSMailFolder> &)
-	?NewL@CFSMailMessage@@SAPAV1@ABVNmMessage@@@Z @ 41 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class NmMessage const &)
-	?HtmlBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 42 NONAME ; class CFSMailMessagePart * CFSMailMessage::HtmlBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?GetEmailAddress@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 43 NONAME ; class TDesC16 & CFSMailAddress::GetEmailAddress(void) const
-	?FSMailSortCriteria2NM@NmConverter@@SA?AVNmMailSortCriteria@@VTFSMailSortCriteria@@@Z @ 44 NONAME ; class NmMailSortCriteria NmConverter::FSMailSortCriteria2NM(class TFSMailSortCriteria)
-	?NewL@CFSMailBox@@SAPAV1@VTFSMailMsgId@@@Z @ 45 NONAME ; class CFSMailBox * CFSMailBox::NewL(class TFSMailMsgId)
-	?CreateMessageToSendL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 46 NONAME ; int CFSMailBox::CreateMessageToSendL(class MFSMailRequestObserver &)
-	?ContentID@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 47 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentID(void)
-	?RemoveChildPartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 48 NONAME ; int CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId, class MFSMailRequestObserver &)
-	??1CFSMailFolder@@UAE@XZ @ 49 NONAME ; CFSMailFolder::~CFSMailFolder(void)
-	?IsRelatedTo@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 50 NONAME ; class TFSMailMsgId CFSMailMessageBase::IsRelatedTo(void) const
-	?GetContentFileL@CFSMailMessagePart@@QAE?AVRFile@@XZ @ 51 NONAME ; class RFile CFSMailMessagePart::GetContentFileL(void)
-	?AppendBCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 52 NONAME ; void CFSMailMessageBase::AppendBCCRecipient(class CFSMailAddress *)
-	?ExtensionL@CFSMailFolder@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 53 NONAME ; class CEmailExtension * CFSMailFolder::ExtensionL(class TUid const &)
-	??1CFSMailIterator@@UAE@XZ @ 54 NONAME ; CFSMailIterator::~CFSMailIterator(void)
-	?RemoveDownLoadedAttachmentsL@CFSMailMessagePart@@QAEXXZ @ 55 NONAME ; void CFSMailMessagePart::RemoveDownLoadedAttachmentsL(void)
-	?IsMessageL@CFSMailMessage@@UBEHXZ @ 56 NONAME ; int CFSMailMessage::IsMessageL(void) const
-	?GetNmMailbox@CFSMailBoxBase@@QAEPAVNmMailbox@@XZ @ 57 NONAME ; class NmMailbox * CFSMailBoxBase::GetNmMailbox(void)
-	?CreateReplyMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@HAAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 58 NONAME ; int CFSMailBox::CreateReplyMessageL(class TFSMailMsgId, int, class MFSMailRequestObserver &, class TDesC16 const &)
-	?NewL@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 59 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewL(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
-	?FetchLoadState@CFSMailMessagePart@@QBE?AW4TFSPartFetchState@@XZ @ 60 NONAME ; enum TFSPartFetchState CFSMailMessagePart::FetchLoadState(void) const
-	?toTTime@NmConverter@@SA?AVTTime@@ABVQDateTime@@@Z @ 61 NONAME ; class TTime NmConverter::toTTime(class QDateTime const &)
-	?RequestHandler@CFSMailMessageBase@@QAEAAVCFSMailRequestHandler@@XZ @ 62 NONAME ; class CFSMailRequestHandler & CFSMailMessageBase::RequestHandler(void)
-	?ContentTypeMatches@CFSMailMessagePart@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CFSMailMessagePart::ContentTypeMatches(class TDesC16 const &)
-	?ReleaseExtension@CFSMailFolder@@UAEXPAVCEmailExtension@@@Z @ 64 NONAME ; void CFSMailFolder::ReleaseExtension(class CEmailExtension *)
-	?nmIdToMailMsgId@NmConverter@@SA?AVTFSMailMsgId@@VNmId@@@Z @ 65 NONAME ; class TFSMailMsgId NmConverter::nmIdToMailMsgId(class NmId)
-	?ReleaseExtension@CExtendableEmail@@UAEXPAVCEmailExtension@@@Z @ 66 NONAME ; void CExtendableEmail::ReleaseExtension(class CEmailExtension *)
-	?ChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@@Z @ 67 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::ChildPartL(class TFSMailMsgId)
-	?GetId@CFSMailBoxBase@@QBE?AVTFSMailMsgId@@XZ @ 68 NONAME ; class TFSMailMsgId CFSMailBoxBase::GetId(void) const
-	?RefreshNowL@CFSMailBox@@QAEHXZ @ 69 NONAME ; int CFSMailBox::RefreshNowL(void)
-	?ContentDispositionParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 70 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentDispositionParameters(void)
-	?GetSettingsUid@CFSMailBoxBase@@QAE?BVTUid@@XZ @ 71 NONAME ; class TUid const CFSMailBoxBase::GetSettingsUid(void)
-	??1CFSMailMessage@@UAE@XZ @ 72 NONAME ; CFSMailMessage::~CFSMailMessage(void)
-	?GetStatus@CFSMailBoxBase@@QBE?AW4TFSMailBoxStatus@@XZ @ 73 NONAME ; enum TFSMailBoxStatus CFSMailBoxBase::GetStatus(void) const
-	?GoOfflineL@CFSMailBox@@QAEXXZ @ 74 NONAME ; void CFSMailBox::GoOfflineL(void)
-	?NewChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@ABVTDesC16@@@Z @ 75 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewChildPartL(class TFSMailMsgId, class TDesC16 const &)
-	?SetFolderId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 76 NONAME ; void CFSMailMessageBase::SetFolderId(class TFSMailMsgId)
-	?Remove@TEmailExtensions@@QAEXPBVCEmailExtension@@@Z @ 77 NONAME ; void TEmailExtensions::Remove(class CEmailExtension const *)
-	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@AAVRFile@@ABVTDesC8@@@Z @ 78 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class RFile &, class TDesC8 const &)
-	?ConstructL@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 79 NONAME ; void CFSMailMessageBase::ConstructL(class TFSMailMsgId)
-	?GetLocalTextContentLC@CFSMailMessagePart@@QAEPAVHBufC16@@XZ @ 80 NONAME ; class HBufC16 * CFSMailMessagePart::GetLocalTextContentLC(void)
-	?GetMRInfo@CFSMailMessagePart@@QAEAAVMMRInfoObject@@XZ @ 81 NONAME ; class MMRInfoObject & CFSMailMessagePart::GetMRInfo(void)
-	?SetRelatedTo@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 82 NONAME ; void CFSMailMessageBase::SetRelatedTo(class TFSMailMsgId)
-	?CreateForwardMessage@CFSMailBox@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@ABVTDesC16@@@Z @ 83 NONAME ; class CFSMailMessage * CFSMailBox::CreateForwardMessage(class TFSMailMsgId, class TDesC16 const &)
-	?SetStatus@CFSMailBoxBase@@QAEXW4TFSMailBoxStatus@@@Z @ 84 NONAME ; void CFSMailBoxBase::SetStatus(enum TFSMailBoxStatus)
-	?SetContentIDL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 85 NONAME ; void CFSMailMessagePart::SetContentIDL(class TDesC16 const &)
-	?NewL@CFSMailAddress@@SAPAV1@ABVNmAddress@@@Z @ 86 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(class NmAddress const &)
-	?SetSender@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 87 NONAME ; void CFSMailMessageBase::SetSender(class CFSMailAddress *)
-	?SetCredentialsL@CFSMailBox@@QAEXABVTDesC16@@0@Z @ 88 NONAME ; void CFSMailBox::SetCredentialsL(class TDesC16 const &, class TDesC16 const &)
-	?NewLC@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 89 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewLC(class TFSMailMsgId)
-	??0CFSMailRequestHandler@@IAE@XZ @ 90 NONAME ; CFSMailRequestHandler::CFSMailRequestHandler(void)
-	??1CFSMailAddress@@UAE@XZ @ 91 NONAME ; CFSMailAddress::~CFSMailAddress(void)
-	?SetParentFolderId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 92 NONAME ; void CFSMailFolderBase::SetParentFolderId(class TFSMailMsgId)
-	?AttachmentNameL@CFSMailMessagePart@@QAEAAVTDesC16@@XZ @ 93 NONAME ; class TDesC16 & CFSMailMessagePart::AttachmentNameL(void)
-	?GetToRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 94 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetToRecipients(void)
-	?GetContentClass@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 95 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentClass(void)
-	?GetContentType@CFSMailMessagePart@@QBEABVTDesC16@@XZ @ 96 NONAME ; class TDesC16 const & CFSMailMessagePart::GetContentType(void) const
-	?SetOwnMailAddressL@CFSMailBoxBase@@QAEXPAVCFSMailAddress@@@Z @ 97 NONAME ; void CFSMailBoxBase::SetOwnMailAddressL(class CFSMailAddress *)
-	?GetSubFolderCount@CFSMailFolderBase@@QBEIXZ @ 98 NONAME ; unsigned int CFSMailFolderBase::GetSubFolderCount(void) const
-	?SetMRInfoProcessorL@CFSMailBoxBase@@QAEXPAVMMRInfoProcessor@@@Z @ 99 NONAME ; void CFSMailBoxBase::SetMRInfoProcessorL(class MMRInfoProcessor *)
-	?ContentSize@CFSMailMessagePart@@QBEIXZ @ 100 NONAME ; unsigned int CFSMailMessagePart::ContentSize(void) const
-	?toQString@NmConverter@@SA?AVQString@@ABVTDesC16@@@Z @ 101 NONAME ; class QString NmConverter::toQString(class TDesC16 const &)
-	?NewLC@CFSMailRequestHandler@@SAPAV1@AAV?$RPointerArray@VCImplementationInformation@@@@AAV?$RPointerArray@VCFSMailPlugin@@@@@Z @ 102 NONAME ; class CFSMailRequestHandler * CFSMailRequestHandler::NewLC(class RPointerArray<class CImplementationInformation> &, class RPointerArray<class CFSMailPlugin> &)
-	?SetMessagePartsStatus@CFSMailMessagePart@@QAEXW4TFSPartFetchState@@@Z @ 103 NONAME ; void CFSMailMessagePart::SetMessagePartsStatus(enum TFSPartFetchState)
-	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 104 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
-	?SetContentType@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 105 NONAME ; void CFSMailMessagePart::SetContentType(class TDesC16 const &)
-	??_ECExtendableEmail@@UAE@I@Z @ 106 NONAME ; CExtendableEmail::~CExtendableEmail(unsigned int)
-	?NewLC@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 107 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewLC(class TFSMailMsgId)
-	?AppendAttachmentsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 108 NONAME ; void CFSMailMessagePart::AppendAttachmentsL(class RPointerArray<class CFSMailMessagePart> &)
-	?AppendToRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 109 NONAME ; void CFSMailMessageBase::AppendToRecipient(class CFSMailAddress *)
-	?SupportsCopyFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 110 NONAME ; int CFSMailFolder::SupportsCopyFromL(enum TFSFolderType)
-	?NewL@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 111 NONAME ; class CFSMailMessage * CFSMailMessage::NewL(class TFSMailMsgId)
-	?GetLastSyncStatusL@CFSMailBox@@QAE?AVTFSProgress@@XZ @ 112 NONAME ; class TFSProgress CFSMailBox::GetLastSyncStatusL(void)
-	?NextL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 113 NONAME ; int CFSMailIterator::NextL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?NewLC@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 114 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewLC(class TFSMailMsgId)
-	?SetSubFolderCount@CFSMailFolderBase@@QAEXI@Z @ 115 NONAME ; void CFSMailFolderBase::SetSubFolderCount(unsigned int)
-	?RemoveDownLoadedAttachmentsL@CFSMailBox@@QAEXXZ @ 116 NONAME ; void CFSMailBox::RemoveDownLoadedAttachmentsL(void)
-	?GetMailBoxId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 117 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetMailBoxId(void) const
-	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@V?$RArray@VTFSMailMsgId@@@@@Z @ 118 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &, class RArray<class TFSMailMsgId>)
-	?FetchedContentSize@CFSMailMessagePart@@QBEIXZ @ 119 NONAME ; unsigned int CFSMailMessagePart::FetchedContentSize(void) const
-	?GetSubFoldersL@CFSMailFolder@@QAEXAAV?$RPointerArray@VCFSMailFolder@@@@@Z @ 120 NONAME ; void CFSMailFolder::GetSubFoldersL(class RPointerArray<class CFSMailFolder> &)
-	?ConstructL@CFSMailRequestHandler@@IAEXV?$RPointerArray@VCImplementationInformation@@@@V?$RPointerArray@VCFSMailPlugin@@@@@Z @ 121 NONAME ; void CFSMailRequestHandler::ConstructL(class RPointerArray<class CImplementationInformation>, class RPointerArray<class CFSMailPlugin>)
-	?NewLC@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 122 NONAME ; class CFSMailIterator * CFSMailIterator::NewLC(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?SetContentSize@CFSMailMessagePart@@QAEXI@Z @ 123 NONAME ; void CFSMailMessagePart::SetContentSize(unsigned int)
-	?GetTempDirL@CFSMailRequestHandler@@QAEAAVTDesC16@@XZ @ 124 NONAME ; class TDesC16 & CFSMailRequestHandler::GetTempDirL(void)
-	?ClearBccRecipients@CFSMailMessageBase@@QAEXXZ @ 125 NONAME ; void CFSMailMessageBase::ClearBccRecipients(void)
-	?CancelSearch@CFSMailBox@@QAEXXZ @ 126 NONAME ; void CFSMailBox::CancelSearch(void)
-	?SetUnseenCount@CFSMailFolderBase@@QAEXI@Z @ 127 NONAME ; void CFSMailFolderBase::SetUnseenCount(unsigned int)
-	?GetMailBoxStatus@CFSMailBox@@QAE?AW4TFSMailBoxStatus@@XZ @ 128 NONAME ; enum TFSMailBoxStatus CFSMailBox::GetMailBoxStatus(void)
-	?SaveMessageL@CFSMailMessage@@QAEXXZ @ 129 NONAME ; void CFSMailMessage::SaveMessageL(void)
-	?IsFlagSet@CFSMailMessageBase@@QBEHH@Z @ 130 NONAME ; int CFSMailMessageBase::IsFlagSet(int) const
-	?SetReplyToAddress@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 131 NONAME ; void CFSMailMessageBase::SetReplyToAddress(class CFSMailAddress *)
-	?GetBCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 132 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetBCCRecipients(void)
-	?NewL@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 133 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewL(class TFSMailMsgId)
-	??1CFSMailMessageBase@@UAE@XZ @ 134 NONAME ; CFSMailMessageBase::~CFSMailMessageBase(void)
-	?SetContentDisposition@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 135 NONAME ; void CFSMailMessagePart::SetContentDisposition(class TDesC16 const &)
-	?NewL@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 136 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewL(class TFSMailMsgId)
-	?GetMessageCount@CFSMailFolderBase@@QBEIXZ @ 137 NONAME ; unsigned int CFSMailFolderBase::GetMessageCount(void) const
-	?RemoveChildPartL@CFSMailMessagePart@@QAEXVTFSMailMsgId@@@Z @ 138 NONAME ; void CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId)
-	?ConstructL@CFSMailFolderBase@@IAEXVTFSMailMsgId@@@Z @ 139 NONAME ; void CFSMailFolderBase::ConstructL(class TFSMailMsgId)
-	?CopyContentFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 140 NONAME ; void CFSMailMessagePart::CopyContentFileL(class TDesC16 const &)
-	?GetParentFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 141 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetParentFolderId(void) const
-	?RemoveContentL@CFSMailMessagePart@@QAEXXZ @ 142 NONAME ; void CFSMailMessagePart::RemoveContentL(void)
-	?ReleaseExtension@CFSMailMessageBase@@UAEXPAVCEmailExtension@@@Z @ 143 NONAME ; void CFSMailMessageBase::ReleaseExtension(class CEmailExtension *)
-	??_ECFSMailRequestHandler@@UAE@I@Z @ 144 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(unsigned int)
-	?IsMessageL@CFSMailMessagePart@@UBEHXZ @ 145 NONAME ; int CFSMailMessagePart::IsMessageL(void) const
-	?NewL@CFSMailAddress@@SAPAV1@XZ @ 146 NONAME ; class CFSMailAddress * CFSMailAddress::NewL(void)
-	?AddNewAttachmentL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@VTFSMailMsgId@@0@Z @ 147 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId, class TDesC16 const &)
-	?GetSender@CFSMailMessageBase@@QBEPAVCFSMailAddress@@XZ @ 148 NONAME ; class CFSMailAddress * CFSMailMessageBase::GetSender(void) const
-	?ExtensionL@CFSMailBox@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 149 NONAME ; class CEmailExtension * CFSMailBox::ExtensionL(class TUid const &)
-	?GetMailBoxId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 150 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMailBoxId(void) const
-	?ContentDescription@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 151 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDescription(void)
-	?SendMessageL@CFSMailBox@@QAEHAAVCFSMailMessage@@AAVMFSMailRequestObserver@@@Z @ 152 NONAME ; int CFSMailBox::SendMessageL(class CFSMailMessage &, class MFSMailRequestObserver &)
-	?GetFolderType@CFSMailFolderBase@@QBE?AW4TFSFolderType@@XZ @ 153 NONAME ; enum TFSFolderType CFSMailFolderBase::GetFolderType(void) const
-	?FetchMessagesL@CFSMailFolder@@QAEHABV?$RArray@VTFSMailMsgId@@@@W4TFSMailDetails@@AAVMFSMailRequestObserver@@@Z @ 154 NONAME ; int CFSMailFolder::FetchMessagesL(class RArray<class TFSMailMsgId> const &, enum TFSMailDetails, class MFSMailRequestObserver &)
-	?AddNewAttachmentL@CFSMailMessage@@QAEHABVTDesC16@@AAVMFSMailRequestObserver@@@Z @ 155 NONAME ; int CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class MFSMailRequestObserver &)
-	?toQDateTime@NmConverter@@SA?AVQDateTime@@ABVTTime@@@Z @ 156 NONAME ; class QDateTime NmConverter::toQDateTime(class TTime const &)
-	?IsMRInfoSet@CFSMailMessagePart@@QAEHXZ @ 157 NONAME ; int CFSMailMessagePart::IsMRInfoSet(void)
-	?SetContentClass@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 158 NONAME ; void CFSMailMessagePart::SetContentClass(class TDesC16 const &)
-	?GetNmFolder@CFSMailFolderBase@@QAEPAVNmFolder@@XZ @ 159 NONAME ; class NmFolder * CFSMailFolderBase::GetNmFolder(void)
-	?GetFolderId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 160 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetFolderId(void) const
-	?ContentDisposition@CFSMailMessagePart@@QAEABVTDesC16@@XZ @ 161 NONAME ; class TDesC16 const & CFSMailMessagePart::ContentDisposition(void)
-	?BlockMoveFromL@CFSMailFolderBase@@QAEXV?$RArray@W4TFSFolderType@@@@W4TFSMailBoxStatus@@@Z @ 162 NONAME ; void CFSMailFolderBase::BlockMoveFromL(class RArray<enum TFSFolderType>, enum TFSMailBoxStatus)
-	?GetConnectionId@CFSMailBox@@QAEHAAK@Z @ 163 NONAME ; int CFSMailBox::GetConnectionId(unsigned long &)
-	?ReadOnlyPartSize@CFSMailMessagePart@@QBEIXZ @ 164 NONAME ; unsigned int CFSMailMessagePart::ReadOnlyPartSize(void) const
-	?RemoveDownLoadedAttachmentsL@CFSMailFolder@@QAEXXZ @ 165 NONAME ; void CFSMailFolder::RemoveDownLoadedAttachmentsL(void)
-	?NewLC@CFSMailAddress@@SAPAV1@XZ @ 166 NONAME ; class CFSMailAddress * CFSMailAddress::NewLC(void)
-	?ChildPartsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@W4TFSMailMessagePartDataSource@1@@Z @ 167 NONAME ; void CFSMailMessagePart::ChildPartsL(class RPointerArray<class CFSMailMessagePart> &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?SetDisplayName@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 168 NONAME ; void CFSMailAddress::SetDisplayName(class TDesC16 const &)
-	?SetMailBoxId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 169 NONAME ; void CFSMailMessageBase::SetMailBoxId(class TFSMailMsgId)
-	?GetFlags@CFSMailMessageBase@@QBEHXZ @ 170 NONAME ; int CFSMailMessageBase::GetFlags(void) const
-	?CopyMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@AAV2@VTFSMailMsgId@@2@Z @ 171 NONAME ; void CFSMailBox::CopyMessagesL(class RArray<class TFSMailMsgId> const &, class RArray<class TFSMailMsgId> &, class TFSMailMsgId, class TFSMailMsgId)
-	?ClearToRecipients@CFSMailMessageBase@@QAEXXZ @ 172 NONAME ; void CFSMailMessageBase::ClearToRecipients(void)
-	?IsConnectionAllowedWhenRoaming@CFSMailBox@@QAEHAAH@Z @ 173 NONAME ; int CFSMailBox::IsConnectionAllowedWhenRoaming(int &)
-	?CopyMessageAsChildPartL@CFSMailMessagePart@@QAEPAV1@VTFSMailMsgId@@PAVCFSMailMessage@@@Z @ 174 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::CopyMessageAsChildPartL(class TFSMailMsgId, class CFSMailMessage *)
-	?PreviousL@CFSMailIterator@@UAEHVTFSMailMsgId@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 175 NONAME ; int CFSMailIterator::PreviousL(class TFSMailMsgId, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?CancelSyncL@CFSMailBox@@QAEXXZ @ 176 NONAME ; void CFSMailBox::CancelSyncL(void)
-	?ListFolders@CFSMailBox@@QAEAAV?$RPointerArray@VCFSMailFolder@@@@XZ @ 177 NONAME ; class RPointerArray<class CFSMailFolder> & CFSMailBox::ListFolders(void)
-	?PlainTextBodyPartL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@W4TFSMailMessagePartDataSource@2@@Z @ 178 NONAME ; class CFSMailMessagePart * CFSMailMessage::PlainTextBodyPartL(enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	??0CExtendableEmail@@IAE@XZ @ 179 NONAME ; CExtendableEmail::CExtendableEmail(void)
-	?SetName@CFSMailBoxBase@@QAEXABVTDesC16@@@Z @ 180 NONAME ; void CFSMailBoxBase::SetName(class TDesC16 const &)
-	?CleanTempDirL@CFSMailRequestHandler@@QAEXXZ @ 181 NONAME ; void CFSMailRequestHandler::CleanTempDirL(void)
-	?SupportsMoveFromL@CFSMailFolder@@QAEHW4TFSFolderType@@@Z @ 182 NONAME ; int CFSMailFolder::SupportsMoveFromL(enum TFSFolderType)
-	?toRPointerArray@NmConverter@@SA?AV?$RPointerArray@VCFSMailAddress@@@@ABV?$QList@VNmAddress@@@@@Z @ 183 NONAME ; class RPointerArray<class CFSMailAddress> NmConverter::toRPointerArray(class QList<class NmAddress> const &)
-	?UpdateMessageFlagsL@CFSMailBox@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@@Z @ 184 NONAME ; int CFSMailBox::UpdateMessageFlagsL(class TFSMailMsgId, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &)
-	?GetDate@CFSMailMessageBase@@QBE?AVTTime@@XZ @ 185 NONAME ; class TTime CFSMailMessageBase::GetDate(void) const
-	?PreviousL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 186 NONAME ; int CFSMailIterator::PreviousL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?ReleaseExtension@CFSMailBox@@UAEXPAVCEmailExtension@@@Z @ 187 NONAME ; void CFSMailBox::ReleaseExtension(class CEmailExtension *)
-	?NewLC@CFSMailMessage@@SAPAV1@VTFSMailMsgId@@@Z @ 188 NONAME ; class CFSMailMessage * CFSMailMessage::NewLC(class TFSMailMsgId)
-	?GetRCLInfo@CFSMailBoxBase@@QAEXAAVTUid@@AAI@Z @ 189 NONAME ; void CFSMailBoxBase::GetRCLInfo(class TUid &, unsigned int &)
-	?MRInfoProcessorL@CFSMailBoxBase@@QAEAAVMMRInfoProcessor@@XZ @ 190 NONAME ; class MMRInfoProcessor & CFSMailBoxBase::MRInfoProcessorL(void)
-	?GetUnreadCount@CFSMailFolderBase@@QBEIXZ @ 191 NONAME ; unsigned int CFSMailFolderBase::GetUnreadCount(void) const
-	?FindBodyPartL@CFSMailMessagePart@@QAEPAV1@ABVTDesC16@@W4TFSMailMessagePartDataSource@1@@Z @ 192 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::FindBodyPartL(class TDesC16 const &, enum CFSMailMessagePart::TFSMailMessagePartDataSource)
-	?GetTempFileL@CFSMailRequestHandler@@QAE?AVRFile@@VTFSMailMsgId@@V?$TBuf@$0BAA@@@@Z @ 193 NONAME ; class RFile CFSMailRequestHandler::GetTempFileL(class TFSMailMsgId, class TBuf<256>)
-	?CreateForwardMessageL@CFSMailBox@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@ABVTDesC16@@@Z @ 194 NONAME ; int CFSMailBox::CreateForwardMessageL(class TFSMailMsgId, class MFSMailRequestObserver &, class TDesC16 const &)
-	?OwnMailAddress@CFSMailBoxBase@@QAEAAVCFSMailAddress@@XZ @ 195 NONAME ; class CFSMailAddress & CFSMailBoxBase::OwnMailAddress(void)
-	?SetMailBoxId@CFSMailFolderBase@@QAEXVTFSMailMsgId@@@Z @ 196 NONAME ; void CFSMailFolderBase::SetMailBoxId(class TFSMailMsgId)
-	?SetContent@CFSMailMessagePart@@QAEXAAVTDes16@@@Z @ 197 NONAME ; void CFSMailMessagePart::SetContent(class TDes16 &)
-	?RemoveMessageL@CFSMailFolder@@QAEXVTFSMailMsgId@@@Z @ 198 NONAME ; void CFSMailFolder::RemoveMessageL(class TFSMailMsgId)
-	?CreateMessageFromFileL@CFSMailBox@@QAEPAVCFSMailMessage@@ABVRFile@@@Z @ 199 NONAME ; class CFSMailMessage * CFSMailBox::CreateMessageFromFileL(class RFile const &)
-	?CompleteRequest@CFSMailRequestHandler@@QAEXH@Z @ 200 NONAME ; void CFSMailRequestHandler::CompleteRequest(int)
-	?GetFolderId@CFSMailFolderBase@@QBE?AVTFSMailMsgId@@XZ @ 201 NONAME ; class TFSMailMsgId CFSMailFolderBase::GetFolderId(void) const
-	?SetMRInfo@CFSMailMessagePart@@QAEXPAVMMRInfoObject@@@Z @ 202 NONAME ; void CFSMailMessagePart::SetMRInfo(class MMRInfoObject *)
-	?GoOnlineL@CFSMailBox@@QAEXXZ @ 203 NONAME ; void CFSMailBox::GoOnlineL(void)
-	?SetMessageCount@CFSMailFolderBase@@QAEXI@Z @ 204 NONAME ; void CFSMailFolderBase::SetMessageCount(unsigned int)
-	??1CFSMailMessagePart@@UAE@XZ @ 205 NONAME ; CFSMailMessagePart::~CFSMailMessagePart(void)
-	?NewLC@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 206 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class TFSMailMsgId, class TFSMailMsgId)
-	?NewLC@CFSMailMessagePart@@SAPAV1@ABVNmId@@ABVNmMessagePart@@@Z @ 207 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewLC(class NmId const &, class NmMessagePart const &)
-	??1TEmailExtensions@@QAE@XZ @ 208 NONAME ; TEmailExtensions::~TEmailExtensions(void)
-	?ContentTypeParameters@CFSMailMessagePart@@QAEAAVCDesC16Array@@XZ @ 209 NONAME ; class CDesC16Array & CFSMailMessagePart::ContentTypeParameters(void)
-	?GetNmMessagePart@CFSMailMessagePart@@QAEPAVNmMessagePart@@XZ @ 210 NONAME ; class NmMessagePart * CFSMailMessagePart::GetNmMessagePart(void)
-	?NMMailSortCriteria2FS@NmConverter@@SA?AVTFSMailSortCriteria@@VNmMailSortCriteria@@@Z @ 211 NONAME ; class TFSMailSortCriteria NmConverter::NMMailSortCriteria2FS(class NmMailSortCriteria)
-	?SetContentDescription@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 212 NONAME ; void CFSMailMessagePart::SetContentDescription(class TDesC16 const &)
-	?GetPluginByUid@CFSMailRequestHandler@@QAEPAVCFSMailPlugin@@VTFSMailMsgId@@@Z @ 213 NONAME ; class CFSMailPlugin * CFSMailRequestHandler::GetPluginByUid(class TFSMailMsgId)
-	?FetchMessagePartL@CFSMailMessagePart@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@I@Z @ 214 NONAME ; int CFSMailMessagePart::FetchMessagePartL(class TFSMailMsgId, class MFSMailRequestObserver &, unsigned int)
-	?InitAsyncRequestL@CFSMailRequestHandler@@QAE?AVTFSPendingRequest@@VTUid@@AAVMFSMailRequestObserver@@@Z @ 215 NONAME ; class TFSPendingRequest CFSMailRequestHandler::InitAsyncRequestL(class TUid, class MFSMailRequestObserver &)
-	?SetContentFromFileL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 216 NONAME ; void CFSMailMessagePart::SetContentFromFileL(class TDesC16 const &)
-	?GetNmAddress@CFSMailAddress@@QAE?AVNmAddress@@XZ @ 217 NONAME ; class NmAddress CFSMailAddress::GetNmAddress(void)
-	?GetBrandingIdL@CFSMailBox@@QAEAAVTDesC16@@XZ @ 218 NONAME ; class TDesC16 & CFSMailBox::GetBrandingIdL(void)
-	?NewL@CFSMailFolder@@SAPAV1@VTFSMailMsgId@@@Z @ 219 NONAME ; class CFSMailFolder * CFSMailFolder::NewL(class TFSMailMsgId)
-	?RemoveAllRequests@CFSMailRequestHandler@@AAEXXZ @ 220 NONAME ; void CFSMailRequestHandler::RemoveAllRequests(void)
-	?SetFetchedContentSize@CFSMailMessagePart@@QAEXI@Z @ 221 NONAME ; void CFSMailMessagePart::SetFetchedContentSize(unsigned int)
-	?SetMessageId@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 222 NONAME ; void CFSMailMessageBase::SetMessageId(class TFSMailMsgId)
-	?ListMessagesL@CFSMailFolder@@QAEPAVMFSMailIterator@@W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 223 NONAME ; class MFSMailIterator * CFSMailFolder::ListMessagesL(enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
-	?NextL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 224 NONAME ; int CFSMailIterator::NextL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
-	?SetFolderName@CFSMailFolderBase@@QAEXABVTDesC16@@@Z @ 225 NONAME ; void CFSMailFolderBase::SetFolderName(class TDesC16 const &)
-	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@ABVTDesC16@@VTFSMailMsgId@@@Z @ 226 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId)
-	?SetSettingsUid@CFSMailBoxBase@@QAEXVTUid@@@Z @ 227 NONAME ; void CFSMailBoxBase::SetSettingsUid(class TUid)
-	??0CEmailExtension@@IAE@ABVTUid@@@Z @ 228 NONAME ; CEmailExtension::CEmailExtension(class TUid const &)
-	?GetUnseenCount@CFSMailFolderBase@@QBEIXZ @ 229 NONAME ; unsigned int CFSMailFolderBase::GetUnseenCount(void) const
-	?SetDate@CFSMailMessageBase@@QAEXVTTime@@@Z @ 230 NONAME ; void CFSMailMessageBase::SetDate(class TTime)
-	?SetReadOnlyPartSize@CFSMailMessagePart@@QAEXI@Z @ 231 NONAME ; void CFSMailMessagePart::SetReadOnlyPartSize(unsigned int)
-	?mailMsgIdToNmId@NmConverter@@SA?AVNmId@@VTFSMailMsgId@@@Z @ 232 NONAME ; class NmId NmConverter::mailMsgIdToNmId(class TFSMailMsgId)
-	?SetEmailAddress@CFSMailAddress@@QAEXABVTDesC16@@@Z @ 233 NONAME ; void CFSMailAddress::SetEmailAddress(class TDesC16 const &)
-	?SetUnreadCount@CFSMailFolderBase@@QAEXI@Z @ 234 NONAME ; void CFSMailFolderBase::SetUnreadCount(unsigned int)
-	?SetRCLInfo@CFSMailBoxBase@@QAEXVTUid@@I@Z @ 235 NONAME ; void CFSMailBoxBase::SetRCLInfo(class TUid, unsigned int)
-	??1CExtendableEmail@@UAE@XZ @ 236 NONAME ; CExtendableEmail::~CExtendableEmail(void)
-	?qstringToHBufCLC@NmConverter@@SAPAVHBufC16@@ABVQString@@@Z @ 237 NONAME ; class HBufC16 * NmConverter::qstringToHBufCLC(class QString const &)
-	?AppendCCRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 238 NONAME ; void CFSMailMessageBase::AppendCCRecipient(class CFSMailAddress *)
-	?HasCapability@CFSMailBox@@QBEHW4TFSMailBoxCapabilities@@@Z @ 239 NONAME ; int CFSMailBox::HasCapability(enum TFSMailBoxCapabilities) const
-	?GetSubject@CFSMailMessageBase@@QBEAAVTDesC16@@XZ @ 240 NONAME ; class TDesC16 & CFSMailMessageBase::GetSubject(void) const
-	?GetMessageId@CFSMailMessageBase@@QBE?AVTFSMailMsgId@@XZ @ 241 NONAME ; class TFSMailMsgId CFSMailMessageBase::GetMessageId(void) const
-	?NewL@CFSMailIterator@@SAPAV1@AAVMFSMailIterator@@PAVCFSMailRequestHandler@@@Z @ 242 NONAME ; class CFSMailIterator * CFSMailIterator::NewL(class MFSMailIterator &, class CFSMailRequestHandler *)
-	?RefreshNowL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@@Z @ 243 NONAME ; int CFSMailBox::RefreshNowL(class MFSMailRequestObserver &)
-	?Extension@TEmailExtensions@@QBEPAVCEmailExtension@@H@Z @ 244 NONAME ; class CEmailExtension * TEmailExtensions::Extension(int) const
-	??1CFSMailRequestHandler@@UAE@XZ @ 245 NONAME ; CFSMailRequestHandler::~CFSMailRequestHandler(void)
-	?DecRef@CEmailExtension@@QAEIXZ @ 246 NONAME ; unsigned int CEmailExtension::DecRef(void)
-	?AddL@TEmailExtensions@@QAEXPAVCEmailExtension@@@Z @ 247 NONAME ; void TEmailExtensions::AddL(class CEmailExtension *)
-	?GetPartId@CFSMailMessagePart@@QBE?AVTFSMailMsgId@@XZ @ 248 NONAME ; class TFSMailMsgId CFSMailMessagePart::GetPartId(void) const
-	?ClearCcRecipients@CFSMailMessageBase@@QAEXXZ @ 249 NONAME ; void CFSMailMessageBase::ClearCcRecipients(void)
-	?ExtensionL@CFSMailMessageBase@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 250 NONAME ; class CEmailExtension * CFSMailMessageBase::ExtensionL(class TUid const &)
-	?GetReplyToAddress@CFSMailMessageBase@@QAEABVCFSMailAddress@@XZ @ 251 NONAME ; class CFSMailAddress const & CFSMailMessageBase::GetReplyToAddress(void)
-	?IncRef@CEmailExtension@@QAEXXZ @ 252 NONAME ; void CEmailExtension::IncRef(void)
-	??1CFSMailBox@@UAE@XZ @ 253 NONAME ; CFSMailBox::~CFSMailBox(void)
-	?SetFlag@CFSMailMessageBase@@QAEXH@Z @ 254 NONAME ; void CFSMailMessageBase::SetFlag(int)
-	?MoveMessagesL@CFSMailBox@@QAEHAAVMFSMailRequestObserver@@ABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@2@Z @ 255 NONAME ; int CFSMailBox::MoveMessagesL(class MFSMailRequestObserver &, class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
-	??_ECEmailExtension@@UAE@I@Z @ 256 NONAME ; CEmailExtension::~CEmailExtension(unsigned int)
-	?GetCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 257 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetCCRecipients(void)
-	?NewL@CFSMailMessagePart@@SAPAV1@VTFSMailMsgId@@0@Z @ 258 NONAME ; class CFSMailMessagePart * CFSMailMessagePart::NewL(class TFSMailMsgId, class TFSMailMsgId)
-	?RemoveMessageL@CFSMailFolder@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 259 NONAME ; int CFSMailFolder::RemoveMessageL(class TFSMailMsgId, class MFSMailRequestObserver &)
+	?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)
+	??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)
+	?SetUnseenCount@CFSMailFolderBase@@QAEXI@Z @ 16 NONAME ; void CFSMailFolderBase::SetUnseenCount(unsigned int)
+	?GetNmMessageEnvelope@CFSMailMessageBase@@QAEPAVNmMessageEnvelope@@XZ @ 17 NONAME ; class NmMessageEnvelope * CFSMailMessageBase::GetNmMessageEnvelope(void)
+	?GetName@CFSMailBoxBase@@QBEAAVTDesC16@@XZ @ 18 NONAME ; class TDesC16 & CFSMailBoxBase::GetName(void) const
+	?SaveMessageL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 19 NONAME ; int CFSMailMessage::SaveMessageL(class MFSMailRequestObserver &)
+	?GetMailBoxStatus@CFSMailBox@@QAE?AW4TFSMailBoxStatus@@XZ @ 20 NONAME ; enum TFSMailBoxStatus CFSMailBox::GetMailBoxStatus(void)
+	?AttachmentListL@CFSMailMessage@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 21 NONAME ; void CFSMailMessage::AttachmentListL(class RPointerArray<class CFSMailMessagePart> &)
+	?SaveMessageL@CFSMailMessage@@QAEXXZ @ 22 NONAME ; void CFSMailMessage::SaveMessageL(void)
+	?NewL@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 23 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewL(class TFSMailMsgId)
+	?FetchMessagesPartsL@CFSMailMessagePart@@QAEHABV?$RArray@VTFSMailMsgId@@@@AAVMFSMailRequestObserver@@I@Z @ 24 NONAME ; int CFSMailMessagePart::FetchMessagesPartsL(class RArray<class TFSMailMsgId> const &, class MFSMailRequestObserver &, unsigned int)
+	?SetReplyToAddress@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 25 NONAME ; void CFSMailMessageBase::SetReplyToAddress(class CFSMailAddress *)
+	?IsFlagSet@CFSMailMessageBase@@QBEHH@Z @ 26 NONAME ; int CFSMailMessageBase::IsFlagSet(int) const
+	?NewL@CFSMailMessageBase@@SAPAV1@VTFSMailMsgId@@@Z @ 27 NONAME ; class CFSMailMessageBase * CFSMailMessageBase::NewL(class TFSMailMsgId)
+	?GetBCCRecipients@CFSMailMessageBase@@QAE?AV?$RPointerArray@VCFSMailAddress@@@@XZ @ 28 NONAME ; class RPointerArray<class CFSMailAddress> CFSMailMessageBase::GetBCCRecipients(void)
+	?AddPluginL@CFSMailRequestHandler@@QAEXVTUid@@PAVCFSMailPlugin@@@Z @ 29 NONAME ; void CFSMailRequestHandler::AddPluginL(class TUid, class CFSMailPlugin *)
+	?SetContentDisposition@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 30 NONAME ; void CFSMailMessagePart::SetContentDisposition(class TDesC16 const &)
+	??1CFSMailMessageBase@@UAE@XZ @ 31 NONAME ; CFSMailMessageBase::~CFSMailMessageBase(void)
+	?CurrentSyncState@CFSMailBox@@QBE?AW4TSSMailSyncState@@XZ @ 32 NONAME ; enum TSSMailSyncState CFSMailBox::CurrentSyncState(void) const
+	?NewL@CFSMailFolderBase@@SAPAV1@VTFSMailMsgId@@@Z @ 33 NONAME ; class CFSMailFolderBase * CFSMailFolderBase::NewL(class TFSMailMsgId)
+	?SetAttachmentNameL@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 34 NONAME ; void CFSMailMessagePart::SetAttachmentNameL(class TDesC16 const &)
+	?GetMessageCount@CFSMailFolderBase@@QBEIXZ @ 35 NONAME ; unsigned int CFSMailFolderBase::GetMessageCount(void) const
+	?RemoveChildPartL@CFSMailMessagePart@@QAEXVTFSMailMsgId@@@Z @ 36 NONAME ; void CFSMailMessagePart::RemoveChildPartL(class TFSMailMsgId)
+	?SaveMessagePartsL@CFSMailMessage@@QAEHAAVMFSMailRequestObserver@@@Z @ 37 NONAME ; int CFSMailMessage::SaveMessagePartsL(class MFSMailRequestObserver &)
+	?MoveMessagesL@CFSMailBox@@QAEXABV?$RArray@VTFSMailMsgId@@@@VTFSMailMsgId@@1@Z @ 38 NONAME ; void CFSMailBox::MoveMessagesL(class RArray<class TFSMailMsgId> const &, class TFSMailMsgId, class TFSMailMsgId)
+	?GetFolderName@CFSMailFolderBase@@QBEAAVTDesC16@@XZ @ 39 NONAME ; class TDesC16 & CFSMailFolderBase::GetFolderName(void) const
+	?GetDisplayName@CFSMailAddress@@QBEAAVTDesC16@@XZ @ 40 NONAME ; class TDesC16 & CFSMailAddress::GetDisplayName(void) const
+	?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)
+	?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 &)
+	?UpdateMessageFlagsL@CFSMailBox@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailMessage@@@@AAVMFSMailRequestObserver@@@Z @ 122 NONAME ; int CFSMailBox::UpdateMessageFlagsL(class TFSMailMsgId, class RPointerArray<class CFSMailMessage> &, class MFSMailRequestObserver &)
+	?SetFolderId@CFSMailMessageBase@@QAEXVTFSMailMsgId@@@Z @ 123 NONAME ; void CFSMailMessageBase::SetFolderId(class TFSMailMsgId)
+	?Remove@TEmailExtensions@@QAEXPBVCEmailExtension@@@Z @ 124 NONAME ; void TEmailExtensions::Remove(class CEmailExtension const *)
+	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@AAVRFile@@ABVTDesC8@@@Z @ 125 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class RFile &, class TDesC8 const &)
+	?ConstructL@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 126 NONAME ; void CFSMailMessageBase::ConstructL(class TFSMailMsgId)
+	?GetLocalTextContentLC@CFSMailMessagePart@@QAEPAVHBufC16@@XZ @ 127 NONAME ; class HBufC16 * CFSMailMessagePart::GetLocalTextContentLC(void)
+	?GetMRInfo@CFSMailMessagePart@@QAEAAVMMRInfoObject@@XZ @ 128 NONAME ; class MMRInfoObject & CFSMailMessagePart::GetMRInfo(void)
+	?GetDate@CFSMailMessageBase@@QBE?AVTTime@@XZ @ 129 NONAME ; class TTime CFSMailMessageBase::GetDate(void) const
+	?PreviousL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 130 NONAME ; int CFSMailIterator::PreviousL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?ReleaseExtension@CFSMailBox@@UAEXPAVCEmailExtension@@@Z @ 131 NONAME ; void CFSMailBox::ReleaseExtension(class CEmailExtension *)
+	?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)
+	?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)
+	?RemoveAllRequests@CFSMailRequestHandler@@AAEXXZ @ 179 NONAME ; void CFSMailRequestHandler::RemoveAllRequests(void)
+	?SetMessagePartsStatus@CFSMailMessagePart@@QAEXW4TFSPartFetchState@@@Z @ 180 NONAME ; void CFSMailMessagePart::SetMessagePartsStatus(enum TFSPartFetchState)
+	?SearchL@CFSMailBox@@QAEXABV?$RPointerArray@VTDesC16@@@@ABVTFSMailSortCriteria@@AAVMFSMailBoxSearchObserver@@@Z @ 181 NONAME ; void CFSMailBox::SearchL(class RPointerArray<class TDesC16> const &, class TFSMailSortCriteria const &, class MFSMailBoxSearchObserver &)
+	?SetMessageId@CFSMailMessageBase@@IAEXVTFSMailMsgId@@@Z @ 182 NONAME ; void CFSMailMessageBase::SetMessageId(class TFSMailMsgId)
+	?SetContentType@CFSMailMessagePart@@QAEXABVTDesC16@@@Z @ 183 NONAME ; void CFSMailMessagePart::SetContentType(class TDesC16 const &)
+	??_ECExtendableEmail@@UAE@I@Z @ 184 NONAME ; CExtendableEmail::~CExtendableEmail(unsigned int)
+	?NextL@CFSMailIterator@@UAEHABVTDesC16@@IAAV?$RPointerArray@VCFSMailMessage@@@@@Z @ 185 NONAME ; int CFSMailIterator::NextL(class TDesC16 const &, unsigned int, class RPointerArray<class CFSMailMessage> &)
+	?ListMessagesL@CFSMailFolder@@QAEPAVMFSMailIterator@@W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 186 NONAME ; class MFSMailIterator * CFSMailFolder::ListMessagesL(enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
+	?NewLC@CFSMailBoxBase@@SAPAV1@VTFSMailMsgId@@@Z @ 187 NONAME ; class CFSMailBoxBase * CFSMailBoxBase::NewLC(class TFSMailMsgId)
+	?AppendAttachmentsL@CFSMailMessagePart@@QAEXAAV?$RPointerArray@VCFSMailMessagePart@@@@@Z @ 188 NONAME ; void CFSMailMessagePart::AppendAttachmentsL(class RPointerArray<class CFSMailMessagePart> &)
+	?SetFolderName@CFSMailFolderBase@@QAEXABVTDesC16@@@Z @ 189 NONAME ; void CFSMailFolderBase::SetFolderName(class TDesC16 const &)
+	?AppendToRecipient@CFSMailMessageBase@@QAEXPAVCFSMailAddress@@@Z @ 190 NONAME ; void CFSMailMessageBase::AppendToRecipient(class CFSMailAddress *)
+	?AddNewAttachmentL@CFSMailMessage@@QAEPAVCFSMailMessagePart@@ABVTDesC16@@VTFSMailMsgId@@@Z @ 191 NONAME ; class CFSMailMessagePart * CFSMailMessage::AddNewAttachmentL(class TDesC16 const &, class TFSMailMsgId)
+	?SetSettingsUid@CFSMailBoxBase@@QAEXVTUid@@@Z @ 192 NONAME ; void CFSMailBoxBase::SetSettingsUid(class TUid)
+	??0CEmailExtension@@IAE@ABVTUid@@@Z @ 193 NONAME ; CEmailExtension::CEmailExtension(class TUid const &)
+	?GetUnseenCount@CFSMailFolderBase@@QBEIXZ @ 194 NONAME ; unsigned int CFSMailFolderBase::GetUnseenCount(void) const
+	?SetReadOnlyPartSize@CFSMailMessagePart@@QAEXI@Z @ 195 NONAME ; void CFSMailMessagePart::SetReadOnlyPartSize(unsigned int)
+	?SetDate@CFSMailMessageBase@@QAEXVTTime@@@Z @ 196 NONAME ; void CFSMailMessageBase::SetDate(class TTime)
+	?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)
 
--- a/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/eabi/fsfwcommonlibu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -13,284 +13,258 @@
 	_ZN10CFSMailBox13MoveMessagesLER22MFSMailRequestObserverRK6RArrayI12TFSMailMsgIdES3_S3_ @ 12 NONAME
 	_ZN10CFSMailBox13MoveMessagesLERK6RArrayI12TFSMailMsgIdES1_S1_ @ 13 NONAME
 	_ZN10CFSMailBox14GetBrandingIdLEv @ 14 NONAME
-	_ZN10CFSMailBox15GetConnectionIdERm @ 15 NONAME
-	_ZN10CFSMailBox15SetCredentialsLERK7TDesC16S2_ @ 16 NONAME
-	_ZN10CFSMailBox16GetMailBoxStatusEv @ 17 NONAME
-	_ZN10CFSMailBox16ReleaseExtensionEP15CEmailExtension @ 18 NONAME
-	_ZN10CFSMailBox18CreateReplyMessageE12TFSMailMsgIdiRK7TDesC16 @ 19 NONAME
-	_ZN10CFSMailBox18GetLastSyncStatusLEv @ 20 NONAME
-	_ZN10CFSMailBox19CreateMessageToSendEv @ 21 NONAME
-	_ZN10CFSMailBox19CreateReplyMessageLE12TFSMailMsgIdiR22MFSMailRequestObserverRK7TDesC16 @ 22 NONAME
-	_ZN10CFSMailBox19GetStandardFolderIdE13TFSFolderType @ 23 NONAME
-	_ZN10CFSMailBox19UpdateMessageFlagsLE12TFSMailMsgIdR13RPointerArrayI14CFSMailMessageER22MFSMailRequestObserver @ 24 NONAME
-	_ZN10CFSMailBox20CreateForwardMessageE12TFSMailMsgIdRK7TDesC16 @ 25 NONAME
-	_ZN10CFSMailBox20CreateMessageToSendLER22MFSMailRequestObserver @ 26 NONAME
-	_ZN10CFSMailBox21CreateForwardMessageLE12TFSMailMsgIdR22MFSMailRequestObserverRK7TDesC16 @ 27 NONAME
-	_ZN10CFSMailBox22ClearSearchResultCacheEv @ 28 NONAME
-	_ZN10CFSMailBox22CreateMessageFromFileLERK5RFile @ 29 NONAME
-	_ZN10CFSMailBox28RemoveDownLoadedAttachmentsLEv @ 30 NONAME
-	_ZN10CFSMailBox30IsConnectionAllowedWhenRoamingERi @ 31 NONAME
-	_ZN10CFSMailBox4NewLE12TFSMailMsgId @ 32 NONAME
-	_ZN10CFSMailBox5NewLCE12TFSMailMsgId @ 33 NONAME
-	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver @ 34 NONAME
-	_ZN10CFSMailBox7SearchLERK13RPointerArrayI7TDesC16ERK19TFSMailSortCriteriaR24MFSMailBoxSearchObserver6RArrayI12TFSMailMsgIdE @ 35 NONAME
-	_ZN10CFSMailBox9GoOnlineLEv @ 36 NONAME
-	_ZN10CFSMailBoxD0Ev @ 37 NONAME
-	_ZN10CFSMailBoxD1Ev @ 38 NONAME
-	_ZN10CFSMailBoxD2Ev @ 39 NONAME
-	_ZN11NmConverter11toQDateTimeERK5TTime @ 40 NONAME
-	_ZN11NmConverter15mailMsgIdToNmIdE12TFSMailMsgId @ 41 NONAME
-	_ZN11NmConverter15nmIdToMailMsgIdE4NmId @ 42 NONAME
-	_ZN11NmConverter15toRPointerArrayERK5QListI9NmAddressE @ 43 NONAME
-	_ZN11NmConverter16qstringToHBufCLCERK7QString @ 44 NONAME
-	_ZN11NmConverter21FSMailSortCriteria2NME19TFSMailSortCriteria @ 45 NONAME
-	_ZN11NmConverter21NMMailSortCriteria2FSE18NmMailSortCriteria @ 46 NONAME
-	_ZN11NmConverter7toTTimeERK9QDateTime @ 47 NONAME
-	_ZN11NmConverter9toQStringERK7TDesC16 @ 48 NONAME
-	_ZN13CFSMailFolder10ExtensionLERK4TUid @ 49 NONAME
-	_ZN13CFSMailFolder13ListMessagesLE14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 50 NONAME
-	_ZN13CFSMailFolder14FetchMessagesLERK6RArrayI12TFSMailMsgIdE14TFSMailDetailsR22MFSMailRequestObserver @ 51 NONAME
-	_ZN13CFSMailFolder14GetSubFoldersLER13RPointerArrayIS_E @ 52 NONAME
-	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgId @ 53 NONAME
-	_ZN13CFSMailFolder16ReleaseExtensionEP15CEmailExtension @ 54 NONAME
-	_ZN13CFSMailFolder17SupportsCopyFromLE13TFSFolderType @ 55 NONAME
-	_ZN13CFSMailFolder17SupportsMoveFromLE13TFSFolderType @ 56 NONAME
-	_ZN13CFSMailFolder28RemoveDownLoadedAttachmentsLEv @ 57 NONAME
-	_ZN13CFSMailFolder4NewLE12TFSMailMsgId @ 58 NONAME
-	_ZN13CFSMailFolder5NewLCE12TFSMailMsgId @ 59 NONAME
-	_ZN13CFSMailFolderD0Ev @ 60 NONAME
-	_ZN13CFSMailFolderD1Ev @ 61 NONAME
-	_ZN13CFSMailFolderD2Ev @ 62 NONAME
-	_ZN14CFSMailAddress12GetNmAddressEv @ 63 NONAME
-	_ZN14CFSMailAddress14SetDisplayNameERK7TDesC16 @ 64 NONAME
-	_ZN14CFSMailAddress15SetEmailAddressERK7TDesC16 @ 65 NONAME
-	_ZN14CFSMailAddress4NewLERK9NmAddress @ 66 NONAME
-	_ZN14CFSMailAddress4NewLEv @ 67 NONAME
-	_ZN14CFSMailAddress5NewLCEv @ 68 NONAME
-	_ZN14CFSMailAddressD0Ev @ 69 NONAME
-	_ZN14CFSMailAddressD1Ev @ 70 NONAME
-	_ZN14CFSMailAddressD2Ev @ 71 NONAME
-	_ZN14CFSMailBoxBase10GetRCLInfoER4TUidRj @ 72 NONAME
-	_ZN14CFSMailBoxBase10SetRCLInfoE4TUidj @ 73 NONAME
-	_ZN14CFSMailBoxBase12GetNmMailboxEv @ 74 NONAME
-	_ZN14CFSMailBoxBase14GetSettingsUidEv @ 75 NONAME
-	_ZN14CFSMailBoxBase14OwnMailAddressEv @ 76 NONAME
-	_ZN14CFSMailBoxBase14SetSettingsUidE4TUid @ 77 NONAME
-	_ZN14CFSMailBoxBase16MRInfoProcessorLEv @ 78 NONAME
-	_ZN14CFSMailBoxBase18SetOwnMailAddressLEP14CFSMailAddress @ 79 NONAME
-	_ZN14CFSMailBoxBase19SetMRInfoProcessorLEP16MMRInfoProcessor @ 80 NONAME
-	_ZN14CFSMailBoxBase20IsMRInfoProcessorSetEv @ 81 NONAME
-	_ZN14CFSMailBoxBase4NewLE12TFSMailMsgId @ 82 NONAME
-	_ZN14CFSMailBoxBase5NewLCE12TFSMailMsgId @ 83 NONAME
-	_ZN14CFSMailBoxBase7SetNameERK7TDesC16 @ 84 NONAME
-	_ZN14CFSMailBoxBase9SetStatusE16TFSMailBoxStatus @ 85 NONAME
-	_ZN14CFSMailBoxBaseD0Ev @ 86 NONAME
-	_ZN14CFSMailBoxBaseD1Ev @ 87 NONAME
-	_ZN14CFSMailBoxBaseD2Ev @ 88 NONAME
-	_ZN14CFSMailMessage12GetNmMessageEv @ 89 NONAME
-	_ZN14CFSMailMessage12SaveMessageLER22MFSMailRequestObserver @ 90 NONAME
-	_ZN14CFSMailMessage12SaveMessageLEv @ 91 NONAME
-	_ZN14CFSMailMessage13HtmlBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 92 NONAME
-	_ZN14CFSMailMessage15AttachmentListLER13RPointerArrayI18CFSMailMessagePartE @ 93 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLER5RFileRK6TDesC8 @ 94 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC1612TFSMailMsgId @ 95 NONAME
-	_ZN14CFSMailMessage17AddNewAttachmentLERK7TDesC16R22MFSMailRequestObserver @ 96 NONAME
-	_ZN14CFSMailMessage17SaveMessagePartsLER22MFSMailRequestObserver @ 97 NONAME
-	_ZN14CFSMailMessage18PlainTextBodyPartLEN18CFSMailMessagePart28TFSMailMessagePartDataSourceE @ 98 NONAME
-	_ZN14CFSMailMessage4NewLE12TFSMailMsgId @ 99 NONAME
-	_ZN14CFSMailMessage4NewLERK9NmMessage @ 100 NONAME
-	_ZN14CFSMailMessage5NewLCE12TFSMailMsgId @ 101 NONAME
-	_ZN14CFSMailMessageD0Ev @ 102 NONAME
-	_ZN14CFSMailMessageD1Ev @ 103 NONAME
-	_ZN14CFSMailMessageD2Ev @ 104 NONAME
-	_ZN15CEmailExtension6DecRefEv @ 105 NONAME
-	_ZN15CEmailExtension6IncRefEv @ 106 NONAME
-	_ZN15CEmailExtensionC1ERK4TUid @ 107 NONAME
-	_ZN15CEmailExtensionC2ERK4TUid @ 108 NONAME
-	_ZN15CEmailExtensionD0Ev @ 109 NONAME
-	_ZN15CEmailExtensionD1Ev @ 110 NONAME
-	_ZN15CEmailExtensionD2Ev @ 111 NONAME
-	_ZN15CFSMailIterator4NewLER15MFSMailIteratorP21CFSMailRequestHandler @ 112 NONAME
-	_ZN15CFSMailIterator5NewLCER15MFSMailIteratorP21CFSMailRequestHandler @ 113 NONAME
-	_ZN15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 114 NONAME
-	_ZN15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 115 NONAME
-	_ZN15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 116 NONAME
-	_ZN15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 117 NONAME
-	_ZN15CFSMailIteratorD0Ev @ 118 NONAME
-	_ZN15CFSMailIteratorD1Ev @ 119 NONAME
-	_ZN15CFSMailIteratorD2Ev @ 120 NONAME
-	_ZN16CExtendableEmail10ExtensionLERK4TUid @ 121 NONAME
-	_ZN16CExtendableEmail16ReleaseExtensionEP15CEmailExtension @ 122 NONAME
-	_ZN16CExtendableEmailC1Ev @ 123 NONAME
-	_ZN16CExtendableEmailC2Ev @ 124 NONAME
-	_ZN16TEmailExtensions4AddLEP15CEmailExtension @ 125 NONAME
-	_ZN16TEmailExtensions6RemoveEPK15CEmailExtension @ 126 NONAME
-	_ZN16TEmailExtensionsC1Ev @ 127 NONAME
-	_ZN16TEmailExtensionsC2Ev @ 128 NONAME
-	_ZN16TEmailExtensionsD1Ev @ 129 NONAME
-	_ZN16TEmailExtensionsD2Ev @ 130 NONAME
-	_ZN17CFSMailFolderBase10ConstructLE12TFSMailMsgId @ 131 NONAME
-	_ZN17CFSMailFolderBase11GetNmFolderEv @ 132 NONAME
-	_ZN17CFSMailFolderBase12SetMailBoxIdE12TFSMailMsgId @ 133 NONAME
-	_ZN17CFSMailFolderBase13SetFolderNameERK7TDesC16 @ 134 NONAME
-	_ZN17CFSMailFolderBase13SetFolderTypeE13TFSFolderType @ 135 NONAME
-	_ZN17CFSMailFolderBase14BlockCopyFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 136 NONAME
-	_ZN17CFSMailFolderBase14BlockMoveFromLE6RArrayI13TFSFolderTypeE16TFSMailBoxStatus @ 137 NONAME
-	_ZN17CFSMailFolderBase14SetUnreadCountEj @ 138 NONAME
-	_ZN17CFSMailFolderBase14SetUnseenCountEj @ 139 NONAME
-	_ZN17CFSMailFolderBase15SetMessageCountEj @ 140 NONAME
-	_ZN17CFSMailFolderBase17SetParentFolderIdE12TFSMailMsgId @ 141 NONAME
-	_ZN17CFSMailFolderBase17SetSubFolderCountEj @ 142 NONAME
-	_ZN17CFSMailFolderBase4NewLE12TFSMailMsgId @ 143 NONAME
-	_ZN17CFSMailFolderBase5NewLCE12TFSMailMsgId @ 144 NONAME
-	_ZN17CFSMailFolderBaseD0Ev @ 145 NONAME
-	_ZN17CFSMailFolderBaseD1Ev @ 146 NONAME
-	_ZN17CFSMailFolderBaseD2Ev @ 147 NONAME
-	_ZN18CFSMailMessageBase10ConstructLE12TFSMailMsgId @ 148 NONAME
-	_ZN18CFSMailMessageBase10ConstructLERK17NmMessageEnvelope @ 149 NONAME
-	_ZN18CFSMailMessageBase10ExtensionLERK4TUid @ 150 NONAME
-	_ZN18CFSMailMessageBase10SetSubjectERK7TDesC16 @ 151 NONAME
-	_ZN18CFSMailMessageBase11SetFolderIdE12TFSMailMsgId @ 152 NONAME
-	_ZN18CFSMailMessageBase12SetMailBoxIdE12TFSMailMsgId @ 153 NONAME
-	_ZN18CFSMailMessageBase12SetMessageIdE12TFSMailMsgId @ 154 NONAME
-	_ZN18CFSMailMessageBase12SetRelatedToE12TFSMailMsgId @ 155 NONAME
-	_ZN18CFSMailMessageBase14RequestHandlerEv @ 156 NONAME
-	_ZN18CFSMailMessageBase15GetCCRecipientsEv @ 157 NONAME
-	_ZN18CFSMailMessageBase15GetToRecipientsEv @ 158 NONAME
-	_ZN18CFSMailMessageBase16GetBCCRecipientsEv @ 159 NONAME
-	_ZN18CFSMailMessageBase16ReleaseExtensionEP15CEmailExtension @ 160 NONAME
-	_ZN18CFSMailMessageBase17AppendCCRecipientEP14CFSMailAddress @ 161 NONAME
-	_ZN18CFSMailMessageBase17AppendToRecipientEP14CFSMailAddress @ 162 NONAME
-	_ZN18CFSMailMessageBase17ClearCcRecipientsEv @ 163 NONAME
-	_ZN18CFSMailMessageBase17ClearToRecipientsEv @ 164 NONAME
-	_ZN18CFSMailMessageBase17GetReplyToAddressEv @ 165 NONAME
-	_ZN18CFSMailMessageBase17SetReplyToAddressEP14CFSMailAddress @ 166 NONAME
-	_ZN18CFSMailMessageBase18AppendBCCRecipientEP14CFSMailAddress @ 167 NONAME
-	_ZN18CFSMailMessageBase18ClearBccRecipientsEv @ 168 NONAME
-	_ZN18CFSMailMessageBase20GetNmMessageEnvelopeEv @ 169 NONAME
-	_ZN18CFSMailMessageBase4NewLE12TFSMailMsgId @ 170 NONAME
-	_ZN18CFSMailMessageBase5NewLCE12TFSMailMsgId @ 171 NONAME
-	_ZN18CFSMailMessageBase7SetDateE5TTime @ 172 NONAME
-	_ZN18CFSMailMessageBase7SetFlagEi @ 173 NONAME
-	_ZN18CFSMailMessageBase9ResetFlagEi @ 174 NONAME
-	_ZN18CFSMailMessageBase9SetSenderEP14CFSMailAddress @ 175 NONAME
-	_ZN18CFSMailMessageBaseD0Ev @ 176 NONAME
-	_ZN18CFSMailMessageBaseD1Ev @ 177 NONAME
-	_ZN18CFSMailMessageBaseD2Ev @ 178 NONAME
-	_ZN18CFSMailMessagePart10ChildPartLE12TFSMailMsgId @ 179 NONAME
-	_ZN18CFSMailMessagePart10SetContentER6TDes16 @ 180 NONAME
-	_ZN18CFSMailMessagePart11ChildPartsLER13RPointerArrayIS_ENS_28TFSMailMessagePartDataSourceE @ 181 NONAME
-	_ZN18CFSMailMessagePart11IsMRInfoSetEv @ 182 NONAME
-	_ZN18CFSMailMessagePart13FindBodyPartLERK7TDesC16NS_28TFSMailMessagePartDataSourceE @ 183 NONAME
-	_ZN18CFSMailMessagePart13NewChildPartLE12TFSMailMsgIdRK7TDesC16 @ 184 NONAME
-	_ZN18CFSMailMessagePart13SetContentIDLERK7TDesC16 @ 185 NONAME
-	_ZN18CFSMailMessagePart14RemoveContentLEv @ 186 NONAME
-	_ZN18CFSMailMessagePart14SetContentSizeEj @ 187 NONAME
-	_ZN18CFSMailMessagePart14SetContentTypeERK7TDesC16 @ 188 NONAME
-	_ZN18CFSMailMessagePart15AttachmentNameLEv @ 189 NONAME
-	_ZN18CFSMailMessagePart15GetContentClassEv @ 190 NONAME
-	_ZN18CFSMailMessagePart15GetContentFileLEv @ 191 NONAME
-	_ZN18CFSMailMessagePart15SetContentClassERK7TDesC16 @ 192 NONAME
-	_ZN18CFSMailMessagePart16CopyContentFileLERK7TDesC16 @ 193 NONAME
-	_ZN18CFSMailMessagePart16GetNmMessagePartEv @ 194 NONAME
-	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgId @ 195 NONAME
-	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgIdR22MFSMailRequestObserver @ 196 NONAME
-	_ZN18CFSMailMessagePart17AddNewAttachmentLERK7TDesC1612TFSMailMsgIdS2_ @ 197 NONAME
-	_ZN18CFSMailMessagePart17FetchMessagePartLE12TFSMailMsgIdR22MFSMailRequestObserverj @ 198 NONAME
-	_ZN18CFSMailMessagePart18AppendAttachmentsLER13RPointerArrayIS_E @ 199 NONAME
-	_ZN18CFSMailMessagePart18ContentDescriptionEv @ 200 NONAME
-	_ZN18CFSMailMessagePart18ContentDispositionEv @ 201 NONAME
-	_ZN18CFSMailMessagePart18ContentTypeMatchesERK7TDesC16 @ 202 NONAME
-	_ZN18CFSMailMessagePart18SetAttachmentNameLERK7TDesC16 @ 203 NONAME
-	_ZN18CFSMailMessagePart19FetchMessagesPartsLERK6RArrayI12TFSMailMsgIdER22MFSMailRequestObserverj @ 204 NONAME
-	_ZN18CFSMailMessagePart19GetContentToBufferLER6TDes16j @ 205 NONAME
-	_ZN18CFSMailMessagePart19SetContentFromFileLERK7TDesC16 @ 206 NONAME
-	_ZN18CFSMailMessagePart19SetReadOnlyPartSizeEj @ 207 NONAME
-	_ZN18CFSMailMessagePart21ContentTypeParametersEv @ 208 NONAME
-	_ZN18CFSMailMessagePart21GetLocalTextContentLCEv @ 209 NONAME
-	_ZN18CFSMailMessagePart21SetContentDescriptionERK7TDesC16 @ 210 NONAME
-	_ZN18CFSMailMessagePart21SetContentDispositionERK7TDesC16 @ 211 NONAME
-	_ZN18CFSMailMessagePart21SetFetchedContentSizeEj @ 212 NONAME
-	_ZN18CFSMailMessagePart21SetMessagePartsStatusE17TFSPartFetchState @ 213 NONAME
-	_ZN18CFSMailMessagePart23CopyMessageAsChildPartLE12TFSMailMsgIdP14CFSMailMessage @ 214 NONAME
-	_ZN18CFSMailMessagePart28ContentDispositionParametersEv @ 215 NONAME
-	_ZN18CFSMailMessagePart28RemoveDownLoadedAttachmentsLEv @ 216 NONAME
-	_ZN18CFSMailMessagePart4NewLE12TFSMailMsgIdS0_ @ 217 NONAME
-	_ZN18CFSMailMessagePart5NewLCE12TFSMailMsgIdS0_ @ 218 NONAME
-	_ZN18CFSMailMessagePart5NewLCERK4NmIdRK13NmMessagePart @ 219 NONAME
-	_ZN18CFSMailMessagePart5SaveLEv @ 220 NONAME
-	_ZN18CFSMailMessagePart9ContentIDEv @ 221 NONAME
-	_ZN18CFSMailMessagePart9GetMRInfoEv @ 222 NONAME
-	_ZN18CFSMailMessagePart9SetMRInfoEP13MMRInfoObject @ 223 NONAME
-	_ZN18CFSMailMessagePartD0Ev @ 224 NONAME
-	_ZN18CFSMailMessagePartD1Ev @ 225 NONAME
-	_ZN18CFSMailMessagePartD2Ev @ 226 NONAME
-	_ZN21CFSMailRequestHandler10AddPluginLE4TUidP13CFSMailPlugin @ 227 NONAME
-	_ZN21CFSMailRequestHandler10ConstructLE13RPointerArrayI26CImplementationInformationES0_I13CFSMailPluginE @ 228 NONAME
-	_ZN21CFSMailRequestHandler11GetTempDirLEv @ 229 NONAME
-	_ZN21CFSMailRequestHandler12GetTempFileLE12TFSMailMsgId4TBufILi256EE @ 230 NONAME
-	_ZN21CFSMailRequestHandler13CleanTempDirLEv @ 231 NONAME
-	_ZN21CFSMailRequestHandler14CancelRequestLEi @ 232 NONAME
-	_ZN21CFSMailRequestHandler14GetPluginByUidE12TFSMailMsgId @ 233 NONAME
-	_ZN21CFSMailRequestHandler15CompleteRequestEi @ 234 NONAME
-	_ZN21CFSMailRequestHandler17InitAsyncRequestLE4TUidR22MFSMailRequestObserver @ 235 NONAME
-	_ZN21CFSMailRequestHandler17RemoveAllRequestsEv @ 236 NONAME
-	_ZN21CFSMailRequestHandler18CancelAllRequestsLEv @ 237 NONAME
-	_ZN21CFSMailRequestHandler4NewLER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 238 NONAME
-	_ZN21CFSMailRequestHandler5NewLCER13RPointerArrayI26CImplementationInformationERS0_I13CFSMailPluginE @ 239 NONAME
-	_ZN21CFSMailRequestHandlerC1Ev @ 240 NONAME
-	_ZN21CFSMailRequestHandlerC2Ev @ 241 NONAME
-	_ZN21CFSMailRequestHandlerD0Ev @ 242 NONAME
-	_ZN21CFSMailRequestHandlerD1Ev @ 243 NONAME
-	_ZN21CFSMailRequestHandlerD2Ev @ 244 NONAME
-	_ZNK10CFSMailBox13HasCapabilityE22TFSMailBoxCapabilities @ 245 NONAME
-	_ZNK10CFSMailBox16CurrentSyncStateEv @ 246 NONAME
-	_ZNK10CFSMailBox9ListMrusLEv @ 247 NONAME
-	_ZNK14CFSMailAddress14GetDisplayNameEv @ 248 NONAME
-	_ZNK14CFSMailAddress15GetEmailAddressEv @ 249 NONAME
-	_ZNK14CFSMailBoxBase5GetIdEv @ 250 NONAME
-	_ZNK14CFSMailBoxBase7GetNameEv @ 251 NONAME
-	_ZNK14CFSMailBoxBase9GetStatusEv @ 252 NONAME
-	_ZNK14CFSMailMessage10IsMessageLEv @ 253 NONAME
-	_ZNK15CEmailExtension3UidEv @ 254 NONAME
-	_ZNK16TEmailExtensions13FindExtensionERK4TUid @ 255 NONAME
-	_ZNK16TEmailExtensions9ExtensionEi @ 256 NONAME
-	_ZNK17CFSMailFolderBase11GetFolderIdEv @ 257 NONAME
-	_ZNK17CFSMailFolderBase12GetMailBoxIdEv @ 258 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderNameEv @ 259 NONAME
-	_ZNK17CFSMailFolderBase13GetFolderTypeEv @ 260 NONAME
-	_ZNK17CFSMailFolderBase14GetUnreadCountEv @ 261 NONAME
-	_ZNK17CFSMailFolderBase14GetUnseenCountEv @ 262 NONAME
-	_ZNK17CFSMailFolderBase15GetMessageCountEv @ 263 NONAME
-	_ZNK17CFSMailFolderBase17GetParentFolderIdEv @ 264 NONAME
-	_ZNK17CFSMailFolderBase17GetSubFolderCountEv @ 265 NONAME
-	_ZNK18CFSMailMessageBase10GetSubjectEv @ 266 NONAME
-	_ZNK18CFSMailMessageBase11GetFolderIdEv @ 267 NONAME
-	_ZNK18CFSMailMessageBase11IsRelatedToEv @ 268 NONAME
-	_ZNK18CFSMailMessageBase12GetMailBoxIdEv @ 269 NONAME
-	_ZNK18CFSMailMessageBase12GetMessageIdEv @ 270 NONAME
-	_ZNK18CFSMailMessageBase7GetDateEv @ 271 NONAME
-	_ZNK18CFSMailMessageBase8GetFlagsEv @ 272 NONAME
-	_ZNK18CFSMailMessageBase9GetSenderEv @ 273 NONAME
-	_ZNK18CFSMailMessageBase9IsFlagSetEi @ 274 NONAME
-	_ZNK18CFSMailMessagePart10IsMessageLEv @ 275 NONAME
-	_ZNK18CFSMailMessagePart11ContentSizeEv @ 276 NONAME
-	_ZNK18CFSMailMessagePart14FetchLoadStateEv @ 277 NONAME
-	_ZNK18CFSMailMessagePart14GetContentTypeEv @ 278 NONAME
-	_ZNK18CFSMailMessagePart16ReadOnlyPartSizeEv @ 279 NONAME
-	_ZNK18CFSMailMessagePart18FetchedContentSizeEv @ 280 NONAME
-	_ZNK18CFSMailMessagePart9GetPartIdEv @ 281 NONAME
-	_ZTI15CEmailExtension @ 282 NONAME
-	_ZTI16CExtendableEmail @ 283 NONAME
-	_ZTI21CFSMailRequestHandler @ 284 NONAME
-	_ZTV15CEmailExtension @ 285 NONAME
-	_ZTV16CExtendableEmail @ 286 NONAME
-	_ZTV21CFSMailRequestHandler @ 287 NONAME
-	_ZThn4_N15CFSMailIterator5NextLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 288 NONAME
-	_ZThn4_N15CFSMailIterator5NextLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 289 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLE12TFSMailMsgIdjR13RPointerArrayI14CFSMailMessageE @ 290 NONAME
-	_ZThn4_N15CFSMailIterator9PreviousLERK7TDesC16jR13RPointerArrayI14CFSMailMessageE @ 291 NONAME
-	_ZThn4_N15CFSMailIteratorD0Ev @ 292 NONAME
-	_ZThn4_N15CFSMailIteratorD1Ev @ 293 NONAME
-	_ZN13CFSMailFolder14RemoveMessageLE12TFSMailMsgIdR22MFSMailRequestObserver @ 294 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
+	_ZN18CFSMailMessagePart16GetNmMessagePartEv @ 179 NONAME
+	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgId @ 180 NONAME
+	_ZN18CFSMailMessagePart16RemoveChildPartLE12TFSMailMsgIdR22MFSMailRequestObserver @ 181 NONAME
+	_ZN18CFSMailMessagePart17AddNewAttachmentLERK7TDesC1612TFSMailMsgIdS2_ @ 182 NONAME
+	_ZN18CFSMailMessagePart17FetchMessagePartLE12TFSMailMsgIdR22MFSMailRequestObserverj @ 183 NONAME
+	_ZN18CFSMailMessagePart18AppendAttachmentsLER13RPointerArrayIS_E @ 184 NONAME
+	_ZN18CFSMailMessagePart18ContentDescriptionEv @ 185 NONAME
+	_ZN18CFSMailMessagePart18ContentDispositionEv @ 186 NONAME
+	_ZN18CFSMailMessagePart18SetAttachmentNameLERK7TDesC16 @ 187 NONAME
+	_ZN18CFSMailMessagePart19FetchMessagesPartsLERK6RArrayI12TFSMailMsgIdER22MFSMailRequestObserverj @ 188 NONAME
+	_ZN18CFSMailMessagePart19GetContentToBufferLER6TDes16j @ 189 NONAME
+	_ZN18CFSMailMessagePart19SetReadOnlyPartSizeEj @ 190 NONAME
+	_ZN18CFSMailMessagePart21ContentTypeParametersEv @ 191 NONAME
+	_ZN18CFSMailMessagePart21GetLocalTextContentLCEv @ 192 NONAME
+	_ZN18CFSMailMessagePart21SetContentDescriptionERK7TDesC16 @ 193 NONAME
+	_ZN18CFSMailMessagePart21SetContentDispositionERK7TDesC16 @ 194 NONAME
+	_ZN18CFSMailMessagePart21SetFetchedContentSizeEj @ 195 NONAME
+	_ZN18CFSMailMessagePart21SetMessagePartsStatusE17TFSPartFetchState @ 196 NONAME
+	_ZN18CFSMailMessagePart28ContentDispositionParametersEv @ 197 NONAME
+	_ZN18CFSMailMessagePart4NewLE12TFSMailMsgIdS0_ @ 198 NONAME
+	_ZN18CFSMailMessagePart5NewLCE12TFSMailMsgIdS0_ @ 199 NONAME
+	_ZN18CFSMailMessagePart5NewLCERK4NmIdRK13NmMessagePart @ 200 NONAME
+	_ZN18CFSMailMessagePart5SaveLEv @ 201 NONAME
+	_ZN18CFSMailMessagePart9ContentIDEv @ 202 NONAME
+	_ZN18CFSMailMessagePart9GetMRInfoEv @ 203 NONAME
+	_ZN18CFSMailMessagePart9SetMRInfoEP13MMRInfoObject @ 204 NONAME
+	_ZN18CFSMailMessagePartD0Ev @ 205 NONAME
+	_ZN18CFSMailMessagePartD1Ev @ 206 NONAME
+	_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
 
--- a/emailservices/emailcommon/inc/CFSMailBox.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBox.h	Mon Aug 23 23:32:31 2010 +0300
@@ -379,10 +379,6 @@
 						    const TFSMailSortCriteria& aSortCriteria,
 					 	    MFSMailBoxSearchObserver& aSearchObserver );
 
-	 IMPORT_C void SearchL( const RPointerArray<TDesC>& aSearchStrings,
-						    const TFSMailSortCriteria& aSortCriteria,
-					 	    MFSMailBoxSearchObserver& aSearchObserver,
-                            RArray<TFSMailMsgId> aFolderIds );
     /**
      * Cancels current search. Does nothing if there is not any search ongoing.
      * The search client will not be called back after this function is called.
@@ -411,19 +407,6 @@
      */    
 	 IMPORT_C void AddObserver(const TFSMailMsgId aFolderId, MFSMailEventObserver& aObserver);
 
-    /** 
-     *  Get a list of most recently used addresses of this 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.
-     *        
-     * @return Array of descriptors containing MRUs. Ownership
-     *         is transferred. Empty if no entries are found.
-     */
-     IMPORT_C MDesCArray* ListMrusL() const;
-
     /**
      * Returns the current synchronizing state of this mailbox.
      *
@@ -432,58 +415,12 @@
      IMPORT_C TSSMailSyncState CurrentSyncState() const;
 
     /**
-     * mailbox capability check for user
-     *
-     * @param aCapa mailbox capability to be checked
-     */
-	 IMPORT_C TBool HasCapability(const TFSMailBoxCapabilities aCapability) const; 
-
-    /**
      * mailbox connection status accessor
      *
      * @return connection status, online / offline
      */
-	 IMPORT_C TFSMailBoxStatus GetMailBoxStatus( );
-
-    /**
-     * mailbox authentication data mutator
-     *
-     * @param aUsername account user name
-     * @param aPassword account password
-     */
-     IMPORT_C void SetCredentialsL( const TDesC& aUsername, const TDesC& aPassword );
+	    IMPORT_C TFSMailBoxStatus GetMailBoxStatus( );
 
-     /**
-      * removes downloaded attachments from local/terminal memory 
-      */
-     IMPORT_C void RemoveDownLoadedAttachmentsL();
-	 
-     /**
-      * reads connection id from plugin
-      *
-      * @param  aConnectionId reference to connection id
-      * @return KErrNone or error code
-      */
-     IMPORT_C TInt GetConnectionId( TUint32& aConnectionId );
-
-     /**
-      * checks from plugin if connection is allowed when roaming
-      *
-      * @param  aConnectionAllowed 
-      * @return KErrNone or error code
-      */
-     IMPORT_C TInt IsConnectionAllowedWhenRoaming( TBool& aConnectionAllowed) ;
-
-     /**
-      * creates email from RFC822 format data stream located
-      * in given attachment file
-      *
-      * @param  aFile access to file containing data stream contents
-      *         given by user
-      *
-      * return new email object, ownership is transferred to user
-      */
-      IMPORT_C CFSMailMessage* CreateMessageFromFileL( const RFile& aFile );
 
 public: // from  CExtendableEmail
 
@@ -512,102 +449,6 @@
      */
   	 CFSMailBox();
 
-    /**
-     * Function used internally to inform that Mru list related to this
-     * mailbox should now be updated using the given recipient info. In
-     * other words this function makes sure that the given recipients are
-     * found from the mru list in which the mrus of this mailbox are stored.
-     * Mrus are stored in the plugin.
-     *
-     * @param aRecipients email recipients in TO-field
-     * @param aCCRecipients email recipients in CC-field
-     * @param aBCCRecipients email recipients in BCC-field
-     */
-    void UpdateMrusL(
-        const RPointerArray<CFSMailAddress>& aRecipients,
-        const RPointerArray<CFSMailAddress>& aCCRecipients,
-        const RPointerArray<CFSMailAddress>& aBCCRecipients ) const;
-    
-    /**
-     * Function used to copy array contents to another array.
-     *
-     * @param aArrayToBeCopied Array that should be copied. 
-     * @return Copy of the given array.
-     */
-    CDesCArraySeg* CopyArrayL( MDesCArray& aArrayToBeCopied ) const;
-
-
-    /**
-     * Function used to update given mru list with
-     * recently used address info. If this info is already found
-     * from the mru list then it is moved to the end of the mru list.
-     * This way the most recent ones are found from the end
-     * of the list.
-     *
-     * @param aMruList Mru list that should be updated.
-     * @param aNewRecentlyUsedOnes Addresses that should be used
-     *                             to update the given mru list.
-     */
-    void UpdateMruListL(
-        CDesCArraySeg& aMruList,
-        const RPointerArray<CFSMailAddress>& aNewRecentlyUsedOnes ) const;
-
-
-    /**
-     * Function used to search an address from given mru list.
-     * Fucntion goes through the addresses in the mru list
-     * and returns the first one matching the given address.
-     *
-     * @param aMruList Mru list that is searched through.
-     * @param searchedAddress Address that is searched from the
-     *                        given mru list.
-     * @param aPos Reference parameter used to return the position
-     *             of a matching address if such was found.
-     * @return Integer value to indicate whether the searched address
-     *         was found or not. Zero is returned if the address was found.
-     *         Otherwise 1 is returned.
-     */
-    TInt FindAddressFromMruList( CDesCArraySeg& aMruList,
-                             TDesC& searchedAddress,
-                             TInt& aPos ) const;
-
-    /**
-     * Removes the oldest entry from the mru list and adds
-     * given address info to the mru list. 
-     *
-     * @param aMruList Mru list.
-     * @param aToBeAdded Address info to be added into the mru list.
-     */
-    void AddAndRemoveExcessMruL( CDesCArraySeg& aMruList,
-                                 CFSMailAddress& aToBeAdded ) const;
-
-    /**
-     * Function to append mru entry to the mru list. This implementation
-     * adds display name and then the address in this order into the
-     * mru list.
-     *
-     * @param aMruList Mru list.
-     * @param aToBeAdded Address info to be added into the mru list.
-     */
-    void AppendMruItemL( CDesCArraySeg& aMruList,
-                         CFSMailAddress& aToBeAppended ) const;
-
-    /**
-     * Function to set the already existing entry in the mru list
-     * as the most recent one.
-     *
-     * @param aMruList Mru list that should be edited.
-     * @param aPosition Position where from the address element of
-     *                  the most recent address is found. The display
-     *                  name of the address is found with index one less
-     *                  from the mru list.
-     * @param aMostRecent After removal of the mru entry with given index,
-     *                    this entry is added into the mru list as the
-     *                    most recently used one.
-     */
-    void SetAsMostRecentMruL( CDesCArraySeg& aMruList,
-                              TInt aPosition,
-                              CFSMailAddress& aMostRecent ) const;
 
  private: // data
  
--- a/emailservices/emailcommon/inc/CFSMailBoxBase.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailBoxBase.h	Mon Aug 23 23:32:31 2010 +0300
@@ -81,23 +81,6 @@
      * @param aMailBoxName mailbox name
      */
      IMPORT_C void SetName( const TDesC& aMailBoxName );
-	 		
-    /**
-     * retuns mailbox status accessor
-     *
-     * @return mailbox status
-     */
-     IMPORT_C TFSMailBoxStatus GetStatus( ) const;
-
-    /**
-     * mailbox status mutator
-     *
-     * @param aStatus mailbox status
-     */
-     //<cmail>
-     //function definition is empty, we need to remove it if not needed
-     //</cmail>
-     IMPORT_C void SetStatus( const TFSMailBoxStatus aStatus );
 
 	/*
 	 * Function to set context of Remote Contact Lookup service for
@@ -108,53 +91,19 @@
 	 * @param aMailBoxId mailbox id in plugin
 	 */
      IMPORT_C void SetRCLInfo(const TUid aProtocolUid, const TUint aMailBoxId);
- 
-	/*
-     * Function to retrieve Remote Contact Lookup service context for
-     * this mailbox.
-     *
-     * @param aProtocolUid specifies Ecom implementation UID of
-     *        "Remote Contact Lookup Protocol Adaptation API" to use.
-     * @param aMailBoxId mailbox id in plugin
-     */
-     IMPORT_C void GetRCLInfo(TUid& aProtocolUid, TUint& aAccountUid);
 
-    /**
-     * returns settings view id for mailbox
-     *
-     * @return settings view id
-     */
-     IMPORT_C const TUid GetSettingsUid();
-
-    /**
+    /*
      * sets settings view id for mailbox
      *
      * @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
 	 *
 	 * @param aMrInfoProcessor meeting info Processor, ownership transferred
 	 */ 
-	 IMPORT_C void SetMRInfoProcessorL(MMRInfoProcessor* aMrInfoProcessor);
+	   IMPORT_C void SetMRInfoProcessorL(MMRInfoProcessor* aMrInfoProcessor);
 
     /**
      * mailbox own address accessor
--- a/emailservices/emailcommon/inc/CFSMailFolder.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailFolder.h	Mon Aug 23 23:32:31 2010 +0300
@@ -109,23 +109,11 @@
                                     TFSMailDetails aDetails,
                                     MFSMailRequestObserver& aObserver );
     /**
-     * method to check if this folder allows copying from given folder type
-     *
-     * @param aFolderType folder type
-     */
-     IMPORT_C TBool SupportsCopyFromL( TFSFolderType aFolderType );
-
-    /**
      * method to check if this folder allows moving from given folder type
      *
      * @param aFolderType folder type
      */
      IMPORT_C TBool SupportsMoveFromL( TFSFolderType aFolderType );
-
-     /**
-      * removes downloaded attachments from local/terminal memory 
-      */
-     IMPORT_C void RemoveDownLoadedAttachmentsL();
      
 public: // from  CExtendableEmail
 
--- a/emailservices/emailcommon/inc/CFSMailMessage.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailMessage.h	Mon Aug 23 23:32:31 2010 +0300
@@ -144,14 +144,6 @@
                     EDataSourceMessageStore);
 // </qmail>
 
-    /**
-     * Returns ETrue if this part is actually a message.
-     * In that case it shoud safe to cast this part to CFSMailMessage
-     * 
-     * @return true if this message part is a message
-     */        
-     IMPORT_C TBool IsMessageL() const;
-
      /**
      * Returns a flat list of message parts that can be handled as attachments.
      * Excludes message parts that are multipart and parts that are considered
--- a/emailservices/emailcommon/inc/CFSMailMessageBase.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailMessageBase.h	Mon Aug 23 23:32:31 2010 +0300
@@ -68,20 +68,6 @@
      */
      IMPORT_C TFSMailMsgId GetMessageId() const;
      
-    /**
-     * if email is related to another email, for example due reply / forward,
-     * related email id is returned
-     *
-     * @return related email id
-     */
-     IMPORT_C TFSMailMsgId IsRelatedTo() const;
-
-    /**
-     * set email related to another email, for example due reply / forward
-     *
-     * @param aMessageId related email id
-     */
-     IMPORT_C void SetRelatedTo( const TFSMailMsgId aMessageId );
 
     /**
      * email parent folder id accessor
@@ -329,12 +315,6 @@
  private: // data
 
     /**
-     * id of another email or part this object is related to
-     * due some reason, like in reply or forward email use cases
-     */
-     TFSMailMsgId    iRelatedTo;
-
-    /**
      * email mailbox id
      */
      TFSMailMsgId    iMailBoxId;
--- a/emailservices/emailcommon/inc/CFSMailMessagePart.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailMessagePart.h	Mon Aug 23 23:32:31 2010 +0300
@@ -239,18 +239,6 @@
                                                  const TDesC& aContentType );
 
     /**
-     * Copies given email object as new child part of this email part or email.
-     *
-     * @param aInsertBefore defines place of where new child part is created,
-     * if aInsertBefore is NULL id then new part is added as last.
-     * @param aMessage message to be copied as child part
-     *
-     * @return new child part, ownership is transferred to user
-     */        
-     IMPORT_C CFSMailMessagePart* CopyMessageAsChildPartL( TFSMailMsgId aInsertBefore,
-                                                           CFSMailMessage* aMessage);
-
-    /**
      * Removes child part (and it's children, if any) from this email part
      * 
      * @param aPartId part id of the email part to be removed
@@ -278,33 +266,7 @@
      * @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);
-
-    /**
-     * Sets email part contents from given file, possible old contents are replaced.
-     *
-     * @param aFilePath defines the target file
-     */
-     IMPORT_C void SetContentFromFileL(const TDesC& aFilePath);
-
-    /**
-     * Removes from message store fetched contents of this part
-     * and possible child parts
-     *
-     */  
-     IMPORT_C void RemoveContentL();
+       
     
     /**
      * returns email part full content size (in bytes)
@@ -333,20 +295,6 @@
      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
@@ -412,15 +360,6 @@
 // </qmail>
 
     /**
-     * Checks that content type matches given.
-     * 
-     * @param aContentType body part content type to be checked
-     *
-     * @return ETrue if content type of message part matches tto given
-     */
-     IMPORT_C TBool ContentTypeMatches( const TDesC& aContentType );
-
-    /**
      * starts email part fetching from email server
      * 
      * @param aMessagePartId message part id of email part to be fetched
@@ -494,12 +433,6 @@
      */
      IMPORT_C void SetReadOnlyPartSize(const TUint aReadOnlyPartSize);
      
-     /**
-      * removes attachment downloaded contents from local/terminal memory
-      *
-      */
-     IMPORT_C void RemoveDownLoadedAttachmentsL();
-     
 // <qmail>
      /**
  	 * gets the new NmMessagePart object
--- a/emailservices/emailcommon/src/CFSMailBox.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailBox.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -32,7 +32,6 @@
 #include "CFSMailAddress.h"
 // </qmail>
 
-const TInt KMaxMruEntries( 150 );
 
 // ================= MEMBER FUNCTIONS ==========================================
 // -----------------------------------------------------------------------------
@@ -208,7 +207,7 @@
 {
     NM_FUNCTION;
     
-    CFSMailMessage* message = NULL;
+    CFSMailMessage* message(NULL);
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         TRAPD(err,message = plugin->CreateMessageToSendL( GetId() ));
@@ -309,7 +308,7 @@
 {
     NM_FUNCTION;
     
-    CFSMailMessage* message = NULL;
+    CFSMailMessage* message(NULL);
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
         {
         TRAPD(err,message = plugin->CreateForwardMessageL( GetId(), 
@@ -615,17 +614,6 @@
                                 aSourceFolderId, aDestinationFolderId );    
         }
 }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::SearchL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::SearchL( const RPointerArray<TDesC>& /*aSearchStrings*/,
-                                   const TFSMailSortCriteria&  /*aSortCriteria*/,
-                                   MFSMailBoxSearchObserver&   /*aSearchObserver*/,
-                                   const RArray<TFSMailMsgId>  /*aFolderIds */ )
-    {
-    NM_FUNCTION;
-    }
     
 // -----------------------------------------------------------------------------
 // CFSMailBox::SearchL
@@ -691,22 +679,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CFSMailBox::ListMrusL
-// -----------------------------------------------------------------------------
-EXPORT_C MDesCArray* CFSMailBox::ListMrusL() const
-    {
-    NM_FUNCTION;
-    
-    MDesCArray* mruList(0);
-    if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId() ) )
-        {
-        mruList = plugin->GetMrusL( GetId() );
-        }
-    return mruList;
-    }
-
-
-// -----------------------------------------------------------------------------
 // CFSMailBox::CurrentSyncState
 // -----------------------------------------------------------------------------
 EXPORT_C TSSMailSyncState CFSMailBox::CurrentSyncState() const
@@ -721,24 +693,6 @@
     return syncState;
     }
 
-// -----------------------------------------------------------------------------
-// CFSMailBox::HasCapability
-// -----------------------------------------------------------------------------
-EXPORT_C TBool CFSMailBox::HasCapability( const TFSMailBoxCapabilities aCapability ) const
-{
-    NM_FUNCTION;
-    
-    TBool capability = EFalse;
-    if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
-        {
-        TRAPD( err,capability = plugin->MailboxHasCapabilityL( aCapability,GetId() )) ;
-        if ( err != KErrNone )
-            {
-            capability = EFalse;
-            }
-        }
-    return capability;
-}
 
 // -----------------------------------------------------------------------------
 // CFSMailBox::GetMailBoxStatus
@@ -755,309 +709,7 @@
     return status;
 }
 
-// -----------------------------------------------------------------------------
-// CFSMailBox::SetCredentialsL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::SetCredentialsL( const TDesC& aUsername, const TDesC& aPassword )
-    {
-    NM_FUNCTION;
-    
-    if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId() ) )
-        {
-        plugin->SetCredentialsL( GetId(), aUsername, aPassword );
-        }
-    }
 
-// -----------------------------------------------------------------------------
-// CFSMailBox::RemoveDownLoadedAttachmentsL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBox::RemoveDownLoadedAttachmentsL()
-    {
-    NM_FUNCTION;
-    
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() );
-    if ( plugin )
-        {
-        // get inbox folder from plugin
-        TFSMailMsgId folderId = GetStandardFolderId( EFSInbox );
-        CFSMailFolder* folder = plugin->GetFolderByUidL( GetId(), folderId );
-        if ( folder )
-            {
-            folder->RemoveDownLoadedAttachmentsL();
-            delete folder;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::GetConnectionId
-// -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailBox::GetConnectionId( TUint32& aConnectionId )
-    {
-    NM_FUNCTION;
-    
-    TInt rcode = KErrNotSupported;
-    if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
-        {
-        rcode = plugin->GetConnectionId( GetId(), aConnectionId );
-        }
-    return rcode;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::IsConnectionAllowedWhenRoaming
-// -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailBox::IsConnectionAllowedWhenRoaming( TBool& aConnectionAllowed )
-    {
-    NM_FUNCTION;
-    
-    TInt rcode = KErrNotSupported;
-    if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
-        {
-        rcode = plugin->IsConnectionAllowedWhenRoaming( GetId(), aConnectionAllowed );
-        }
-    return rcode;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::CreateMessageFromFileL
-// -----------------------------------------------------------------------------
-EXPORT_C CFSMailMessage* CFSMailBox::CreateMessageFromFileL( const RFile& aFile )
-{
-    NM_FUNCTION;
-    
-    CFSMailMessage* message = NULL;
-    if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
-    {
-		message = plugin->CreateMessageFromFileL( GetId(), aFile );
-    }
-    return message;
-}
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::UpdateMrusL
-// -----------------------------------------------------------------------------
-void CFSMailBox::UpdateMrusL(
-    const RPointerArray<CFSMailAddress>& aRecipients,
-    const RPointerArray<CFSMailAddress>& aCCRecipients,
-    const RPointerArray<CFSMailAddress>& aBCCRecipients ) const
-    {
-    NM_FUNCTION;
-    
-    // First lets make a copy of the current mru list
-    // whose content we can later alter as we wish
-    MDesCArray* currentMruList( NULL );
-
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId());
-    if ( !plugin )
-        {
-        User::Leave( KErrGeneral );
-        }
-    currentMruList = plugin->GetMrusL( GetId() );
-    if ( !currentMruList )
-        {
-        // This should not happen because previous function
-        // should leave in error cases and if there are no
-        // entries then the pointer should still be pointing
-        // to valid array.
-        User::Leave( KErrGeneral );
-        }
-    
-    CDesCArraySeg* newMruList( NULL );
-    TRAPD( error, newMruList = CopyArrayL( *currentMruList ) );
-        
-    delete currentMruList;
-       
-    if ( error != KErrNone )
-        {
-        User::Leave( error );
-        }
-        
-    CleanupStack::PushL( newMruList );
-        
-    // Now check that all given recipients are found from the
-    // mru list.
-
-    // Notice that the order here has a meaning. For example
-    // if the latest used address is appended to the end, then
-    // the aRecipients' addresses are found from the end because
-    // they are updated after cc and bcc recipients.
-    UpdateMruListL( *newMruList, aBCCRecipients );
-    UpdateMruListL( *newMruList, aCCRecipients );
-    UpdateMruListL( *newMruList, aRecipients );
-    
-    // Finally update the new mru list to the plugin
-    plugin->SetMrusL( GetId(), newMruList );
-    
-    CleanupStack::PopAndDestroy( newMruList );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::CopyArrayL
-// -----------------------------------------------------------------------------    
-CDesCArraySeg* CFSMailBox::CopyArrayL( MDesCArray& aArrayToBeCopied ) const
-    {
-    NM_FUNCTION;
-    
-    CDesCArraySeg* newArray = new (ELeave) CDesCArraySeg( 10 );
-    CleanupStack::PushL( newArray );
-    
-    TInt itemCount( aArrayToBeCopied.MdcaCount() );
-    TInt index( 0 );
-    while ( index < itemCount )
-        {        
-        newArray->AppendL( aArrayToBeCopied.MdcaPoint( index ) );
-        ++index;
-        }
-    
-    CleanupStack::Pop( newArray );
-    return newArray;
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::UpdateMruListL
-// -----------------------------------------------------------------------------
-void CFSMailBox::UpdateMruListL(
-    CDesCArraySeg& aMruList,
-    const RPointerArray<CFSMailAddress>& aNewRecentlyUsedOnes ) const
-    {
-    NM_FUNCTION;
-    
-    TUint newCount( aNewRecentlyUsedOnes.Count() );
-    TUint newIndexer( 0 );
-    
-    while ( newIndexer < newCount )
-        {
-        if ( aNewRecentlyUsedOnes[newIndexer] )
-            {
-            // The address is used as a search string because every
-            // address does not have a display name
-            TDesC& searchedAddress(
-                aNewRecentlyUsedOnes[newIndexer]->GetEmailAddress() );
-            TInt position( -1 );
-            
-            TInt found(
-                FindAddressFromMruList( aMruList, searchedAddress, position ) );
-            
-            if ( found != 0 )
-                {
-                AddAndRemoveExcessMruL( aMruList,
-                                        *aNewRecentlyUsedOnes[newIndexer] );
-                }
-            else
-                {
-                SetAsMostRecentMruL( aMruList,
-                                     position,
-                                     *aNewRecentlyUsedOnes[newIndexer] );
-                }
-            }        
-        
-        ++newIndexer;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::FindAddressFromMruList
-// -----------------------------------------------------------------------------
-TInt CFSMailBox::FindAddressFromMruList( CDesCArraySeg& aMruList,
-                                         TDesC& searchedAddress,
-                                         TInt& aPos ) const
-    {
-    NM_FUNCTION;
-    
-    // CDesCArray::Find() is not used here because there is
-    // possibility that we have to go through the whole array
-    // and return the index for one specific match. Find() returns
-    // only the index of the first match and searching for the rest
-    // using Find() would cause undesired complexity.
-    
-    
-    const TInt KMruListCount( aMruList.Count() );
-    // Start indexing from 1 because the first
-    // address is on that index if it exists.
-    TInt mruListIndexer( 1 );
-    while( mruListIndexer < KMruListCount )
-        {
-        TPtrC address( aMruList[mruListIndexer] );
-        if ( address == searchedAddress )
-            {
-            aPos = mruListIndexer;
-            return 0;
-            }
-        
-        // We are only interested of the addresses so let's
-        // check only every other descriptor.
-        // (the addresses)
-        mruListIndexer = mruListIndexer + 2;
-        }
-    
-    aPos = aMruList.Count();
-    return 1;
-    }
-
-
-
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::AddAndRemoveExcessMruL
-// -----------------------------------------------------------------------------
-void CFSMailBox::AddAndRemoveExcessMruL( CDesCArraySeg& aMruList,
-                                         CFSMailAddress& aToBeAdded ) const
-    {
-    NM_FUNCTION;
-    
-    if ( aMruList.Count() == KMaxMruEntries )
-        {
-        // Remove the oldest entry pair from the beginning
-        aMruList.Delete( 0, 2 );
-        }
-    // Latest address is always found from the end.
-    AppendMruItemL( aMruList, aToBeAdded );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::SetAsMostRecentMruL
-// -----------------------------------------------------------------------------
-void CFSMailBox::SetAsMostRecentMruL( CDesCArraySeg& aMruList,
-                                      TInt aPosition,
-                                      CFSMailAddress& aMostRecent ) const
-    {
-    NM_FUNCTION;
-    
-    // Position of the address is given so the possible display name is
-    // in the previous slot. Delete both.
-    aMruList.Delete( aPosition - 1, 2 );
-    // Latest address is always found from the end.
-    AppendMruItemL( aMruList, aMostRecent );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailBox::AppendMruItemL
-// -----------------------------------------------------------------------------
-void CFSMailBox::AppendMruItemL( CDesCArraySeg& aMruList,
-                                 CFSMailAddress& aToBeAppended ) const
-    {
-    NM_FUNCTION;
-    
-    // In the array, display name is always the first and then comes
-    // the actual address.
-    
-    // <cmail> avoid setting email address as display name so it won't 
-    // be displayed twice in the list
-    TDesC* displayName  = &aToBeAppended.GetDisplayName();    
-    TDesC* emailAddress = &aToBeAppended.GetEmailAddress();
-
-    if( displayName->Length() > 0 && displayName->Compare(*emailAddress) == 0 )
-    {
-        aMruList.AppendL( KNullDesC );
-    }
-    else
-    {
-        aMruList.AppendL( *displayName );                
-    }
-    
-    aMruList.AppendL( *emailAddress );    
-    }
 
 // -----------------------------------------------------------------------------
 // CFSMailBox::ReleaseExtension
@@ -1085,7 +737,7 @@
     if ( aInterfaceUid == KMailboxExtMrCalInfo )
         {
 // </qmail>        
-        if ( extension == NULL )
+        if ( !extension )
             {
             extension = new ( ELeave ) CMRCalendarInfoImpl();
             CleanupStack::PushL( extension );
--- a/emailservices/emailcommon/src/CFSMailBoxBase.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailBoxBase.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -146,7 +146,7 @@
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetName
 // -----------------------------------------------------------------------------
-EXPORT_C TDesC& CFSMailBoxBase::GetName()const
+EXPORT_C TDesC& CFSMailBoxBase::GetName() const
 {
     NM_FUNCTION;
     
@@ -161,7 +161,7 @@
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetName
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetName( const TDesC& aMailBoxName )
+EXPORT_C void CFSMailBoxBase::SetName(const TDesC& aMailBoxName)
 {
     NM_FUNCTION;
     
@@ -175,36 +175,7 @@
     iNmPrivateMailbox->mName = qtName;
 // </qmail>
 }
-
 // -----------------------------------------------------------------------------
-// CFSMailBoxBase::GetStatus
-// -----------------------------------------------------------------------------
-EXPORT_C TFSMailBoxStatus CFSMailBoxBase::GetStatus( ) const
-{
-    NM_FUNCTION;
-    
-	return EFSMailBoxOffline;
-}
-
-// -----------------------------------------------------------------------------
-// CFSMailBoxBase::SetStatus
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetStatus( const TFSMailBoxStatus /*aStatus*/ )
-{
-    NM_FUNCTION;
-}
-
-// -----------------------------------------------------------------------------
-// CFSMailBoxBase::GetRCLInfo
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::GetRCLInfo(TUid& aProtocolUid, TUint& aAccountUid)
-{
-    NM_FUNCTION;
-    
-	aProtocolUid = iProtocolUid;
-	aAccountUid = iAccountUid;
-}
-
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetRCLInfo
 // -----------------------------------------------------------------------------
@@ -215,18 +186,6 @@
 	iProtocolUid = aProtocolUid;
 	iAccountUid = aAccountUid;
 }
-
-// -----------------------------------------------------------------------------
-// CFSMailBoxBase::GetSettingsUid
-// -----------------------------------------------------------------------------
-EXPORT_C const TUid CFSMailBoxBase::GetSettingsUid()
-	{
-    NM_FUNCTION;
-    
-	return iSettingsUid;
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetSettingsUid
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailBoxBase::SetSettingsUid(const TUid aUid)
@@ -235,34 +194,6 @@
     
 		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
 // -----------------------------------------------------------------------------
@@ -280,7 +211,7 @@
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::OwnMailAddress
 // -----------------------------------------------------------------------------
-EXPORT_C CFSMailAddress& CFSMailBoxBase::OwnMailAddress( )
+EXPORT_C CFSMailAddress& CFSMailBoxBase::OwnMailAddress()
 {
     NM_FUNCTION;
     
@@ -290,17 +221,22 @@
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetOwnMailAddress
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetOwnMailAddressL( CFSMailAddress* aOwnMailAddress)
+EXPORT_C void CFSMailBoxBase::SetOwnMailAddressL(CFSMailAddress* aOwnMailAddress)
 {
     NM_FUNCTION;
+// <qmail>
+    if (!aOwnMailAddress)
+        {
+        User::Leave(KErrArgument);
+        }
+// </qmail>
+    if(iOwnMailAddress)
+        {
+        delete iOwnMailAddress;
+        }
+    iOwnMailAddress = aOwnMailAddress;
     
-	if(iOwnMailAddress)
-		{
-		delete iOwnMailAddress;
-		}
-	iOwnMailAddress = aOwnMailAddress;
-
-	// set also branding id based on domain name
+    // set also branding id based on domain name
     TPtrC ptr = OwnMailAddress().GetEmailAddress();
     TInt index = ptr.Locate('@') + 1;
     if(index > 0 && ptr.Length() > 0)
--- a/emailservices/emailcommon/src/CFSMailFolder.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailFolder.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,11 +21,8 @@
 #include <nmcommonheaders.h>
 // </qmail>
 
-//<cmail>
 #include "CFSMailFolder.h"
 #include "CFSMailPlugin.h"
-//</cmail>
-
 #include "CFSMailIterator.h"
 #include "CFSMailRequestObserver.h"
 
@@ -74,8 +71,8 @@
     CFSMailFolderBase::ConstructL( aFolderId );
 // </qmail>
     
-	// get requesthandler pointer
-	iRequestHandler = static_cast<CFSMailRequestHandler*>(Dll::Tls());
+  // get requesthandler pointer
+    iRequestHandler = static_cast<CFSMailRequestHandler*>(Dll::Tls());
 }
 
 // -----------------------------------------------------------------------------
@@ -90,43 +87,42 @@
 // CFSMailFolder::ListMessagesL
 // -----------------------------------------------------------------------------
 EXPORT_C MFSMailIterator* CFSMailFolder::ListMessagesL( const TFSMailDetails aDetails,
-        						const RArray<TFSMailSortCriteria>& aSorting)
+                    const RArray<TFSMailSortCriteria>& aSorting )
 {
     NM_FUNCTION;
     
-	CFSMailIterator* iterator = NULL;
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
-		{
-		MFSMailIterator* pluginIterator =
-		plugin->ListMessagesL(GetMailBoxId(),GetFolderId(),aDetails,aSorting);
-		if(pluginIterator)
-			{
-			iterator = CFSMailIterator::NewL(*pluginIterator,iRequestHandler );
-			}
-		}
-	return iterator;
+    CFSMailIterator* iterator(NULL);
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
+        {
+        MFSMailIterator* pluginIterator =
+        plugin->ListMessagesL(GetMailBoxId(),GetFolderId(),aDetails,aSorting);
+        if(pluginIterator)
+            {
+            iterator = CFSMailIterator::NewL(*pluginIterator,iRequestHandler );
+            }
+        }
+  return iterator;
 }
 
 // -----------------------------------------------------------------------------
 // CFSMailFolder::FetchMessagesL
 // -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailFolder::FetchMessagesL( 	const RArray<TFSMailMsgId>& aMessageIds,
-     							 				TFSMailDetails aDetails,
-     							 				MFSMailRequestObserver& aObserver )
-	{
+EXPORT_C TInt CFSMailFolder::FetchMessagesL( const RArray<TFSMailMsgId>& aMessageIds,
+                          TFSMailDetails aDetails,
+                          MFSMailRequestObserver& aObserver )
+  {
     NM_FUNCTION;
     
-	// init asynchronous request
-	CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId());
+    // init asynchronous request
+    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId());
     TFSPendingRequest request = 
-    	iRequestHandler->InitAsyncRequestL(	GetFolderId().PluginId(), aObserver );
-
-    TInt err = KErrNone;
+        iRequestHandler->InitAsyncRequestL( GetFolderId().PluginId(), aObserver );
+    TInt err (KErrNone);
     
     if (plugin)
         {
         MFSMailRequestObserver* observer = request.iObserver;
-        TRAP(err,plugin->FetchMessagesL(	GetMailBoxId(),
+        TRAP(err,plugin->FetchMessagesL(  GetMailBoxId(),
                                             GetFolderId(),
                                             aMessageIds,
                                             aDetails,
@@ -138,56 +134,54 @@
         err = KErrNotFound;        
         }
     
-    if(err != KErrNone)
+    if (err != KErrNone)
         {
         iRequestHandler->CompleteRequest(request.iRequestId);
         User::Leave(err);
         }
     return request.iRequestId;
-    
-	}
+  }
 
 
 // -----------------------------------------------------------------------------
 // CFSMailFolder::GetSubFoldersL
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolder::GetSubFoldersL(RPointerArray<CFSMailFolder>& aSubFolders)
+EXPORT_C void CFSMailFolder::GetSubFoldersL( RPointerArray<CFSMailFolder>& aSubFolders )
 {
     NM_FUNCTION;
     
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
-		{
-		TRAPD(err,plugin->ListFoldersL( GetMailBoxId(), GetFolderId(), aSubFolders));
-		if(err != KErrNone)
-			{
-			aSubFolders.ResetAndDestroy();
-			}
-		}
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
+        {
+        TRAPD(err,plugin->ListFoldersL( GetMailBoxId(), GetFolderId(), aSubFolders));
+        if(err != KErrNone)
+            {
+            aSubFolders.ResetAndDestroy();
+            }
+        }
 }
-	
+  
 // -----------------------------------------------------------------------------
 // CFSMailFolder::RemoveMessageL
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolder::RemoveMessageL(TFSMailMsgId aMessage)
+EXPORT_C void CFSMailFolder::RemoveMessageL( TFSMailMsgId aMessage )
 {
     NM_FUNCTION;
     
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
-		{
-		RArray<TFSMailMsgId> messages;
-		messages.Reset();
-		messages.AppendL(aMessage);
-		plugin->DeleteMessagesByUidL(GetMailBoxId(),GetFolderId(),messages);
-		messages.Close();
-		}
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
+        {
+        RArray<TFSMailMsgId> messages;
+        messages.AppendL(aMessage);
+        plugin->DeleteMessagesByUidL(GetMailBoxId(),GetFolderId(),messages);
+        messages.Close();
+    }
 }
 
 // <qmail>
 // -----------------------------------------------------------------------------
 // CFSMailFolder::RemoveMessageL
 // -----------------------------------------------------------------------------
-EXPORT_C TInt CFSMailFolder::RemoveMessageL(TFSMailMsgId aMessage,
-                                            MFSMailRequestObserver& aObserver)
+EXPORT_C TInt CFSMailFolder::RemoveMessageL( TFSMailMsgId aMessage,
+                                             MFSMailRequestObserver& aObserver )
 {
     NM_FUNCTION;
 
@@ -196,14 +190,13 @@
     TFSPendingRequest request = 
         iRequestHandler->InitAsyncRequestL( GetFolderId().PluginId(), aObserver );
 
-    TInt err = KErrNone;
+    TInt err(KErrNone);
     
     if (plugin)
         {
         MFSMailRequestObserver* observer = request.iObserver;
         
         RArray<TFSMailMsgId> messages;
-        messages.Reset();
         messages.AppendL(aMessage);
         
         TRAP(err,plugin->DeleteMessagesByUidL(
@@ -230,132 +223,58 @@
 // </qmail>
 
 // -----------------------------------------------------------------------------
-// CFSMailFolder::SupportsCopyFromL
-// -----------------------------------------------------------------------------
-EXPORT_C TBool CFSMailFolder::SupportsCopyFromL( TFSFolderType aFolderType )
-	{
-    NM_FUNCTION;
-    
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
-		{
-		TFSMailBoxStatus onlineStatus = plugin->GetMailBoxStatus(GetMailBoxId());
-		if(onlineStatus == EFSMailBoxOnline)
-			{
-			for(TInt i=0;i<iCopyOnlineBlocked.Count();i++)
-				{
-				if(iCopyOnlineBlocked[i] == aFolderType)
-					{
-					return EFalse;
-					}			
-				}
-			}
-		else if(onlineStatus == EFSMailBoxOffline)
-			{
-			for(TInt i=0;i<iCopyOfflineBlocked.Count();i++)
-				{
-				if(iCopyOfflineBlocked[i] == aFolderType)
-					{
-					return EFalse;
-					}
-				}
-			}
-		}
-		return ETrue;
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailFolder::SupportsMoveFromL
 // -----------------------------------------------------------------------------
 EXPORT_C TBool CFSMailFolder::SupportsMoveFromL( TFSFolderType aFolderType )
-	{
+{
     NM_FUNCTION;
     
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
-		{
-		TFSMailBoxStatus onlineStatus = plugin->GetMailBoxStatus(GetMailBoxId());
-		if(onlineStatus == EFSMailBoxOnline)
-			{
-			for(TInt i=0;i<iMoveOnlineBlocked.Count();i++)
-				{
-				if(iMoveOnlineBlocked[i] == aFolderType)
-					{
-					return EFalse;
-					}			
-				}
-			}
-		else if(onlineStatus == EFSMailBoxOffline)
-			{
-			for(TInt i=0;i<iMoveOfflineBlocked.Count();i++)
-				{
-				if(iMoveOfflineBlocked[i] == aFolderType)
-					{
-					return EFalse;
-					}
-				}
-			}
-		}
-		return ETrue;
-	
-	}
-// -----------------------------------------------------------------------------
-// CFSMailFolder::RemoveDownLoadedAttachmentsL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailFolder::RemoveDownLoadedAttachmentsL()
-    {
-    NM_FUNCTION;
-    
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId());
-    if(plugin != NULL)
+    TBool ret(ETrue);
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetFolderId()))
         {
-        MFSMailIterator* iterator = NULL;
-
-        // select message details to be listed
-        TFSMailDetails details(EFSMsgDataEnvelope);
-        
-        // sorting is free, give empty array
-        RArray<TFSMailSortCriteria> sorting;
-        sorting.Reset();
-        iterator = plugin->ListMessagesL( GetMailBoxId(),
-                                          GetFolderId(),
-                                          details,
-                                          sorting );
-        if(iterator)
+        TFSMailBoxStatus onlineStatus = plugin->GetMailBoxStatus(GetMailBoxId());
+        if (onlineStatus == EFSMailBoxOnline)
             {
-            TFSMailMsgId nullId;
-            RPointerArray<CFSMailMessage> messages;
-            messages.Reset();
-            iterator->NextL(nullId,GetMessageCount(),messages);
-            for(TInt i=0;i<messages.Count();i++)
+            for(TInt i(0); i < iMoveOnlineBlocked.Count(); i++)
                 {
-                if(messages[i]->IsFlagSet(EFSMsgFlag_Attachments))
+                if (iMoveOnlineBlocked[i] == aFolderType)
                     {
-                messages[i]->RemoveDownLoadedAttachmentsL();
-                }
+                    ret = EFalse;
+                    }     
                 }
-            messages.ResetAndDestroy();
-            delete iterator;
             }
-        }
+        else if (onlineStatus == EFSMailBoxOffline)
+            {
+            for (TInt i(0); i < iMoveOfflineBlocked.Count(); i++)
+                {
+                if(iMoveOfflineBlocked[i] == aFolderType)
+                    {
+                    ret = EFalse;
+                    }
+                }
+            }
     }
+    return ret;
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailFolder::ReleaseExtension
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailFolder::ReleaseExtension( CEmailExtension* aExtension )
-    {
+{
     NM_FUNCTION;
     
     // no specialized behaviour, call base class
     CExtendableEmail::ReleaseExtension( aExtension );
-    }
+}
     
 // -----------------------------------------------------------------------------
 // CFSMailFolder::ExtensionL
 // -----------------------------------------------------------------------------
 EXPORT_C CEmailExtension* CFSMailFolder::ExtensionL( const TUid& aInterfaceUid )
-    {
+{
     NM_FUNCTION;
     
     return CExtendableEmail::ExtensionL( aInterfaceUid );
-    }
+}
 
--- a/emailservices/emailcommon/src/CFSMailMessage.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessage.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -42,10 +42,10 @@
 {
     NM_FUNCTION;
     
-  	CFSMailMessage* message = new (ELeave) CFSMailMessage();
-  	CleanupStack:: PushL(message);
-  	message->ConstructL( aMessageId );
-  	return message;
+    CFSMailMessage* message = new (ELeave) CFSMailMessage();
+    CleanupStack:: PushL(message);
+    message->ConstructL( aMessageId );
+    return message;
 } 
 
 // -----------------------------------------------------------------------------
@@ -55,9 +55,9 @@
 {
     NM_FUNCTION;
     
-  	CFSMailMessage* message =  CFSMailMessage::NewLC(aMessageId);
-  	CleanupStack:: Pop(message);
-  	return message;
+    CFSMailMessage* message =  CFSMailMessage::NewLC(aMessageId);
+    CleanupStack:: Pop(message);
+    return message;
 }
 
 // <qmail>
@@ -144,20 +144,32 @@
 {
     NM_FUNCTION;
 
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId());
-    TFSPendingRequest request = iRequestHandler->InitAsyncRequestL(
-            GetMessageId().PluginId(), aOperationObserver);
-    MFSMailRequestObserver* observer = request.iObserver;
-    if (plugin)
+    
+
+
+    TFSPendingRequest request;
+    request.iRequestId = 0;
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
         {
+        request = iRequestHandler->InitAsyncRequestL(GetMessageId().PluginId(), 
+                                                        aOperationObserver);
+        MFSMailRequestObserver* observer = request.iObserver;
         iMessageBufferForAsyncOp.Reset();
         iMessageBufferForAsyncOp.AppendL(this);
         // It saves only message header - notice that iMessageBufferForAsyncOp ownership is not transferred
         // to plugin - array contains 'self' pointer so it should not be destroy by plugin
-        plugin->StoreMessagesL(GetMailBoxId(), iMessageBufferForAsyncOp,
-                *observer, request.iRequestId);
+        TRAPD(err, plugin->StoreMessagesL(GetMailBoxId(), iMessageBufferForAsyncOp,
+                *observer, request.iRequestId));
+        if(err != KErrNone)
+            {
+            iRequestHandler->CompleteRequest(request.iRequestId);
+            User::Leave(err);
+            }
         }
-
+    else
+        {
+        User::Leave(KErrNotFound);
+        }
     return request.iRequestId;
 }
 //</qmail>
@@ -172,15 +184,7 @@
 
     RPointerArray<CFSMailMessagePart> messageParts;
     CleanupResetAndDestroyPushL(messageParts);
-
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId());
-    TFSPendingRequest request = iRequestHandler->InitAsyncRequestL(
-            GetMessageId().PluginId(), aOperationObserver);
-    MFSMailRequestObserver* observer = request.iObserver;
-
-    //Message part storer can be used to store attachements as well
-    //AttachmentListL(messageParts);
-
+    
     CFSMailMessagePart *plainTextPart = PlainTextBodyPartL(EDataSourceLocal);
     if (plainTextPart)
         {
@@ -191,12 +195,22 @@
         {
         messageParts.AppendL(htmlPart);
         }
-
-    if (plugin)
+        
+    TFSPendingRequest request;
+    request.iRequestId = 0;
+    if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
         {
+        request = iRequestHandler->InitAsyncRequestL(
+                         GetMessageId().PluginId(), aOperationObserver);
+        MFSMailRequestObserver* observer = request.iObserver;
         // Ownership of parts array is transferred to plugin - it will take care about reseting them
-        plugin->StoreMessagePartsL(messageParts, *observer,
-                request.iRequestId);
+        TRAPD(err, plugin->StoreMessagePartsL(messageParts, *observer,
+                request.iRequestId));
+        if(err != KErrNone)
+            {
+            iRequestHandler->CompleteRequest(request.iRequestId);
+            User::Leave(err);
+            }
         // message parts array removed from CleanupStack (not destroyed)
         CleanupStack::Pop(1, &messageParts);
         }
@@ -204,6 +218,7 @@
         {
         // message parts array removed from CleanupStack and destroyed
         CleanupStack::PopAndDestroy(1, &messageParts);
+        User::Leave(KErrNotFound);
         }
 
     return request.iRequestId;
@@ -217,8 +232,7 @@
                                                                 const TDesC8& aMimeType )
     {
     NM_FUNCTION;
-    
-    CFSMailMessagePart* newPart = NULL;
+    CFSMailMessagePart* newPart(NULL);
     if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
         {
         TBuf<KMaxDataTypeLength> contentType;
@@ -237,11 +251,9 @@
             apaSession.Close();
             contentType.Copy(dataType.iDataType.Des());
             }
-        
         // get file name
         TFileName fileName;
         aFile.FullName( fileName );
-
         // get new part from plugin
         newPart = plugin->NewChildPartFromFileL(    GetMailBoxId(),
                                                     GetFolderId(),
@@ -249,14 +261,17 @@
                                                     GetPartId(),
                                                     contentType,
                                                     aFile );
-        // set attachment name
-        newPart->SetAttachmentNameL(fileName);
-
-        // store new message part
-        newPart->SaveL();
-        
-        // set flag
-        SetFlag(EFSMsgFlag_Attachments);
+        if (newPart)
+            {
+            CleanupStack::PushL(newPart);
+            // set attachment name
+            newPart->SetAttachmentNameL(fileName);
+            // store new message part
+            newPart->SaveL();
+            // set flag
+            SetFlag(EFSMsgFlag_Attachments);
+            CleanupStack::Pop(newPart);
+            }
         }
     return newPart;
     }
@@ -269,39 +284,39 @@
     {
     NM_FUNCTION;
 
-	CFSMailMessagePart* newPart = NULL;
-	
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
-		{
-	    // use recognizer to find out ContentType 
-	    RApaLsSession apaSession;
-		TDataRecognitionResult dataType;
-		TBufC8<KMaxDataTypeLength> buf;
-	    User::LeaveIfError(apaSession.Connect());
-	    User::LeaveIfError(apaSession.RecognizeData(aFilePath, buf, dataType));
-	    apaSession.Close();
+    CFSMailMessagePart* newPart(NULL);
+  
+    if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
+        {
+        // use recognizer to find out ContentType 
+        RApaLsSession apaSession;
+        TDataRecognitionResult dataType;
+        TBufC8<KMaxDataTypeLength> buf;
+        User::LeaveIfError(apaSession.Connect());
+        User::LeaveIfError(apaSession.RecognizeData(aFilePath, buf, dataType));
+        apaSession.Close();
 
-	    // Create new message part with correct Content-Type
-		TBuf<KMaxDataTypeLength> contentType;
-		contentType.Copy(dataType.iDataType.Des());
-	    newPart = plugin->NewChildPartFromFileL( 	GetMailBoxId(),
-	    											GetFolderId(),
-	    											GetMessageId(),
-	    											GetPartId(),
-	    											contentType,
-	    											aFilePath );
-
-		
-	    // Set attachment name
-	    newPart->SetAttachmentNameL(aFilePath);
-
-		// store message part
-		newPart->SaveL();
-
-		// set flag
-        SetFlag(EFSMsgFlag_Attachments);
-		}
-		
+        // Create new message part with correct Content-Type
+        TBuf<KMaxDataTypeLength> contentType;
+        contentType.Copy(dataType.iDataType.Des());
+        newPart = plugin->NewChildPartFromFileL(  GetMailBoxId(),
+                            GetFolderId(),
+                            GetMessageId(),
+                            GetPartId(),
+                            contentType,
+                            aFilePath );
+        if (newPart)
+            {
+            CleanupStack::PushL(newPart);
+            // set attachment name
+            newPart->SetAttachmentNameL(aFilePath);
+            // store new message part
+            newPart->SaveL();
+            // set flag
+            SetFlag(EFSMsgFlag_Attachments);
+            CleanupStack::Pop(newPart);
+            }
+        }
     return newPart;
 }
 
@@ -367,11 +382,11 @@
 EXPORT_C void CFSMailMessage::AttachmentListL(
     RPointerArray<CFSMailMessagePart>& aParts )
     {
+    // First list all message parts
+    AppendAttachmentsL( aParts );
+    
     NM_FUNCTION;
     
-    // First list all message parts
-    AppendAttachmentsL( aParts ); 
-
     // special case, if single part content type is not given,
     // default type is text/plain
     if ( aParts.Count() == 1 && aParts[0]->GetContentType().Length() == 0)
@@ -435,13 +450,13 @@
     CFSMailMessagePart* part = FindBodyPartL(KFSMailContentTypeTextPlain, aDataSource);
     
     // special case, single part content type is not given
-    if(part == NULL && iMessageParts.Count() == 1 && iMessageParts[0]->GetContentType().Length() == 0)
-    	{
-    	part = iMessageParts[0];
-    	iMessageParts.Remove(0);
-    	}
+    if (!part && iMessageParts.Count() == 1 && iMessageParts[0]->GetContentType().Length() == 0)
+      {
+      part = iMessageParts[0];
+      iMessageParts.Remove(0);
+      }
     iMessageParts.ResetAndDestroy();
-	iReadMessageParts = ETrue;
+    iReadMessageParts = ETrue;
     return part;
 }
 // </qmail>
@@ -462,18 +477,6 @@
 }
 // </qmail>
 
-// <qmail>
-// -----------------------------------------------------------------------------
-// CFSMailMessage::IsMessageL
-// -----------------------------------------------------------------------------
-EXPORT_C TBool CFSMailMessage::IsMessageL() const
-	{
-    NM_FUNCTION;
-    
-    return CFSMailMessagePart::IsMessageL();
-	}
-// </qmail>
-
 // -----------------------------------------------------------------------------
 // CFSMailMessage::ContentTypeParameters()
 // -----------------------------------------------------------------------------
--- a/emailservices/emailcommon/src/CFSMailMessageBase.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessageBase.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -63,8 +63,8 @@
     NM_FUNCTION;
     
 // <qmail> unnecessary member initialization removed: iSubject, iFlags </qmail>
-  	// set request handler pointer
-	iRequestHandler = static_cast<CFSMailRequestHandler*>(Dll::Tls());
+    // set request handler pointer
+  iRequestHandler = static_cast<CFSMailRequestHandler*>(Dll::Tls());
 }
 
 // -----------------------------------------------------------------------------
@@ -78,13 +78,13 @@
     // Construction of shared data object
     iNmPrivateMessageEnvelope = new NmMessageEnvelopePrivate();
 
-	// typedef long int TInt32 -> typedef unsigned int quint32
+  // typedef long int TInt32 -> typedef unsigned int quint32
     iNmPrivateMessageEnvelope->mMessageId.setId32((quint32)aMessageId.Id() );
 
-	// typedef unsigned int TUint -> typedef unsigned int quint32
+  // typedef unsigned int TUint -> typedef unsigned int quint32
     iNmPrivateMessageEnvelope->mMessageId.setPluginId32((quint32)aMessageId.PluginId().iUid);
 
-    // construct the CFSMailAddress object and connect it with NmAddress private data
+    // construct the CFSMailAddress object and connect it with NmAddress private data 
     iSender = CFSMailAddress::NewL(iNmPrivateMessageEnvelope->mSender);
 // </qmail>
 }
@@ -109,11 +109,11 @@
 {
     NM_FUNCTION;
     
-	if(iSender)
-		{
-		delete iSender;
-		iSender = NULL;
-		}
+  if(iSender)
+    {
+    delete iSender;
+    iSender = NULL;
+    }
 // <qmail> unnecessary member destruction removed: iSubject, iToRecipients, iCcRecipients, iBccRecipients </qmail>
 }
 
@@ -132,7 +132,7 @@
     if(id.IsNullId()){
         id = TFSMailMsgId(iNmPrivateMessageEnvelope->mFolderId);
     }
-	
+  
     return id;
 // </qmail>
 }
@@ -210,13 +210,20 @@
     NM_FUNCTION;
     
 // <qmail>
-	// store sender
-	if (iSender)
-		{
-		delete iSender;
+    // store sender
+    if (iSender)
+        {
+        delete iSender;
         iSender = NULL;
-		}
-	iSender = aSender;
+        }
+    if (!aSender) 
+        {
+        TRAP_IGNORE(iSender = CFSMailAddress::NewL());
+        }
+    else 
+        {
+        iSender = aSender;
+        }   
     iNmPrivateMessageEnvelope->mSender = iSender->GetNmAddress();
 // </qmail>
 }
@@ -228,7 +235,7 @@
 {
     NM_FUNCTION;
     
-	return iSender;
+  return iSender;
 }
 
 // -----------------------------------------------------------------------------
@@ -278,8 +285,10 @@
     NM_FUNCTION;
     
 // <qmail>
-    iNmPrivateMessageEnvelope->mToRecipients.append(
-        aRecipient->GetNmAddress());
+    if (aRecipient) 
+        {
+        iNmPrivateMessageEnvelope->mToRecipients.append(aRecipient->GetNmAddress());
+        }
 // </qmail>
 }
 
@@ -291,8 +300,11 @@
     NM_FUNCTION;
     
 // <qmail>
-    iNmPrivateMessageEnvelope->mCcRecipients.append(
-        aRecipient->GetNmAddress());
+    if (aRecipient) 
+        {
+        iNmPrivateMessageEnvelope->mCcRecipients.append(
+            aRecipient->GetNmAddress());
+        }
 // </qmail>
 }
 
@@ -304,8 +316,11 @@
     NM_FUNCTION;
     
 // <qmail>
-    iNmPrivateMessageEnvelope->mBccRecipients.append(
-        aRecipient->GetNmAddress());
+    if (aRecipient)
+        {
+        iNmPrivateMessageEnvelope->mBccRecipients.append(
+            aRecipient->GetNmAddress());
+        }
 // </qmail>      
 }
 
@@ -313,37 +328,37 @@
 // CFSMailMessageBase::ClearToRecipients
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailMessageBase::ClearToRecipients( )
-	{
+{
     NM_FUNCTION;
     
 // <qmail>
     iNmPrivateMessageEnvelope->mToRecipients.clear();
 // </qmail>
-	}
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailMessageBase::ClearCcRecipients
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailMessageBase::ClearCcRecipients( )
-	{
+{
     NM_FUNCTION;
     
 // <qmail>
     iNmPrivateMessageEnvelope->mCcRecipients.clear();
 // </qmail>
-	}
+}
 
 // -----------------------------------------------------------------------------
 // CFSMailMessageBase::ClearBccRecipients
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailMessageBase::ClearBccRecipients( )
-	{
+{
     NM_FUNCTION;
     
 // <qmail>
     iNmPrivateMessageEnvelope->mBccRecipients.clear();
 // </qmail>
-	}
+}
 
 //<qmail>
 // -----------------------------------------------------------------------------
@@ -451,38 +466,18 @@
 }
 
 // -----------------------------------------------------------------------------
-// CFSMailMessageBase::IsRelatedTo
-// -----------------------------------------------------------------------------
-EXPORT_C TFSMailMsgId CFSMailMessageBase::IsRelatedTo() const
-	{
-    NM_FUNCTION;
-    
-	return iRelatedTo;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailMessageBase::SetRelatedTo
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailMessageBase::SetRelatedTo( const TFSMailMsgId aMessageId )
-	{
-    NM_FUNCTION;
-    
-	iRelatedTo = aMessageId;
-	}
-
-// -----------------------------------------------------------------------------
 // CFSMailMessageBase::SetReplyToAddress
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailMessageBase::SetReplyToAddress(CFSMailAddress* aReplyToAddress)
 {
     NM_FUNCTION;
     
-	// store sender
-	if (iReplyTo)
-		{
-		delete iReplyTo;
-		}
-	iReplyTo = aReplyToAddress;
+  // store sender
+  if (iReplyTo)
+    {
+    delete iReplyTo;
+    }
+  iReplyTo = aReplyToAddress;
 
 }
 
@@ -493,14 +488,14 @@
 {
     NM_FUNCTION;
     
-	return *iReplyTo;
+    return *iReplyTo;
 }
 
 EXPORT_C CFSMailRequestHandler& CFSMailMessageBase::RequestHandler( )
 {
     NM_FUNCTION;
     
-	return *iRequestHandler;
+    return *iRequestHandler;
 }
 
 // <qmail>
--- a/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -431,17 +431,11 @@
 	HBufC* contentClass = HBufC::New(aContentClass.Length());
 	
 	// store new mailbox name
-	if(contentClass)
-	{
-		delete iContentClass;
-		iContentClass = contentClass;
-		iContentClass->Des().Copy(aContentClass);
-	}
-		iContentClass->ReAlloc(aContentClass.Length());
-		if(iContentClass)
-		{
-			iContentClass->Des().Copy(aContentClass);		
-		}
+	delete iContentClass;
+	iContentClass = contentClass;
+	iContentClass->Des().Copy(aContentClass);
+	iContentClass->ReAlloc(aContentClass.Length());
+	iContentClass->Des().Copy(aContentClass);		
 	}
 
 // -----------------------------------------------------------------------------
@@ -495,95 +489,6 @@
 //</qmail>    
 	}
 	
-// -----------------------------------------------------------------------------
-// CFSMailMessagePart::CopyMessageAsChildPartL
-// -----------------------------------------------------------------------------
-EXPORT_C CFSMailMessagePart* CFSMailMessagePart::CopyMessageAsChildPartL(
-													TFSMailMsgId aInsertBefore,
-													CFSMailMessage* aMessage)
-	{
-    NM_FUNCTION;
-	
-	CFSMailMessagePart* part = NULL;
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetPartId()))
-	{
-		part = plugin->CopyMessageAsChildPartL(GetMailBoxId(),GetFolderId(),GetMessageId(),GetPartId(),
-											aInsertBefore, *aMessage);
-	}
-	return part;
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailMessagePart::RemoveContentL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailMessagePart::RemoveContentL()
-	{
-    NM_FUNCTION;
-	
-	CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetPartId());
-	if(plugin == NULL)
-	    {
-	    plugin = iRequestHandler->GetPluginByUid(GetMessageId());
-	    }
-	
-	if(plugin != NULL)
-		{
-		RPointerArray<CFSMailMessagePart> parts;
-        CleanupResetAndDestroyPushL( parts );
-        plugin->ChildPartsL(GetMailBoxId(),GetFolderId(),GetMessageId(),GetPartId(),parts);
-        RArray<TFSMailMsgId> partIds;
-        CleanupClosePushL( partIds );
-        partIds.ReserveL( 1 + parts.Count() );
-		for(TInt i=0;i<parts.Count();i++)
-			{
-			partIds.AppendL( parts[i]->GetMessageId() );
-			}
-        partIds.AppendL( GetPartId() );
-		plugin->RemovePartContentL(GetMailBoxId(), GetFolderId(), GetMessageId(), partIds);
-        CleanupStack::PopAndDestroy( &partIds );
-        CleanupStack::PopAndDestroy( &parts );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CFSMailMessagePart::RemoveDownLoadedAttachmentsL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailMessagePart::RemoveDownLoadedAttachmentsL()
-    {
-    NM_FUNCTION;
-        
-    CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetPartId());
-    if(plugin == NULL)
-        {
-        plugin = iRequestHandler->GetPluginByUid(GetMessageId());
-        }
-    
-    if(plugin != NULL)
-        {
-        // get attachment list
-        RPointerArray<CFSMailMessagePart> attachments;
-        CleanupResetAndDestroyPushL( attachments );
-        DoAttachmentListL(attachments);
-
-        // copy attachment part ids
-        RArray<TFSMailMsgId> ids;
-        CleanupClosePushL( ids ); 
-        for(TInt i=0;i<attachments.Count();i++)
-            {
-            ids.AppendL(attachments[i]->GetPartId());
-            }
-        
-        // remove attachment fetched contents 
-        if(ids.Count())
-            {
-            TRAP_IGNORE(plugin->RemovePartContentL(GetMailBoxId(), GetFolderId(), GetMessageId(), ids));
-            }
-        
-        // clean tables
-        CleanupStack::PopAndDestroy( &ids );
-        CleanupStack::PopAndDestroy( &attachments );
-        }
-    }
 
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::GetContentFileL
@@ -611,34 +516,7 @@
 	
 	return iFile;
 	}
-	
-// -----------------------------------------------------------------------------
-// CFSMailMessagePart::SetContentFromFileL
-// -----------------------------------------------------------------------------
-EXPORT_C void CFSMailMessagePart::SetContentFromFileL(const TDesC& aFilePath)
-	{
-    NM_FUNCTION;
-    
-	if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetPartId()))
-		{
-		plugin->SetPartContentFromFileL(GetMailBoxId(), GetFolderId(),
-			GetMessageId(), GetPartId(), aFilePath );
-		}
-	}
 
-// -----------------------------------------------------------------------------
-// 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
@@ -1162,8 +1040,7 @@
             return this;
             }
         }
-    
-    CFSMailMessagePart* messagePart = NULL;
+    CFSMailMessagePart* messagePart(NULL);
     if (aDataSource == EDataSourceMessageStore)
         {
         if (CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetMessageId()))
@@ -1248,35 +1125,6 @@
 //</qmail>
 	
 // -----------------------------------------------------------------------------
-// CFSMailMessagePart::ContentTypeMatches
-// -----------------------------------------------------------------------------
-EXPORT_C TBool CFSMailMessagePart::ContentTypeMatches( const TDesC& aContentType )
-{
-    NM_FUNCTION;
-
-	TBuf<KMaxDataTypeLength> ptr;
-	TBool result(EFalse);
-//<qmail>
-	if ( !iNmPrivateMessagePart->mContentType.isNull() )
-    {
-        ptr.Copy(GetContentType());
-//</qmail>
-		TInt length = ptr.Locate(';');
-		if(length >= 0)
-			{
-			ptr.SetLength(length);
-			}
-		
-		if( !ptr.CompareF(aContentType) ) // case-insensitive comparision
-		{
-			result = ETrue;
-		}
-    }
-
-    return result;
-}
-
-// -----------------------------------------------------------------------------
 // CFSMailMessagePart::AppendAttachmentsL
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailMessagePart::AppendAttachmentsL(
@@ -1314,7 +1162,6 @@
         CleanupStack::PopAndDestroy( &messageParts );
         }
     }
-
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::FetchedContentSize
 // -----------------------------------------------------------------------------
@@ -1339,37 +1186,7 @@
 //</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
 // -----------------------------------------------------------------------------
@@ -1454,7 +1271,6 @@
 	    }
     return requestId;
     }
-
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::SetMessagePartsStatus
 // -----------------------------------------------------------------------------
@@ -1485,16 +1301,18 @@
             GetPartId(),
             aContentType, //contentType,
             aFilePath );
-
-        CleanupStack::PushL( newPart );
+        if (newPart) 
+            {
+            CleanupStack::PushL( newPart );
         
-        // Set attachment name
-        newPart->SetAttachmentNameL( aFilePath );
+            // Set attachment name
+            newPart->SetAttachmentNameL( aFilePath );
 
-        // save message part
-        newPart->SaveL();
+            // save message part
+            newPart->SaveL();
         
-        CleanupStack::Pop( newPart );
+            CleanupStack::Pop( newPart );
+            }
         }
 
     return newPart;
@@ -1527,7 +1345,6 @@
 {
     NM_FUNCTION;
 }
-
 //<qmail>
 // -----------------------------------------------------------------------------
 // CFSMailMessagePart::GetNmMessagePart
--- a/emailservices/emailframework/bwins/fsmailframeworku.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/bwins/fsmailframeworku.def	Mon Aug 23 23:32:31 2010 +0300
@@ -29,4 +29,5 @@
 	?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 &)
 
--- a/emailservices/emailframework/data/fsmailbrandmanager.rss	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/data/fsmailbrandmanager.rss	Mon Aug 23 23:32:31 2010 +0300
@@ -26,8 +26,8 @@
 #include <aol_brand_graphics.mbg>
 #include <mail_for_exchange_brand_graphics.mbg>
 
-#include "mailbrandmanager.hrh"
-#include "mailbrandmanager.rh"
+#include "MailBrandManager.hrh"
+#include "MailBrandManager.rh"
 
 // ---------------------------------------------------------
 //   
--- a/emailservices/emailframework/eabi/fsmailframeworku.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/eabi/fsmailframeworku.def	Mon Aug 23 23:32:31 2010 +0300
@@ -31,4 +31,5 @@
 	_ZN13CFSMailClientD0Ev @ 30 NONAME
 	_ZN13CFSMailClientD1Ev @ 31 NONAME
 	_ZN13CFSMailClientD2Ev @ 32 NONAME
+	_ZN13CFSMailClient13GetSignatureLERK12TFSMailMsgId @ 33 NONAME
 
--- a/emailservices/emailframework/inc/CFSMailClient.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailClient.h	Mon Aug 23 23:32:31 2010 +0300
@@ -409,6 +409,15 @@
       */     
      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
 
     /**
--- a/emailservices/emailframework/inc/CFSMailPlugin.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.h	Mon Aug 23 23:32:31 2010 +0300
@@ -1211,6 +1211,15 @@
                                         const TFSMailMsgId& /*aMessageId*/ )
                                         { 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	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.inl	Mon Aug 23 23:32:31 2010 +0300
@@ -177,3 +177,13 @@
     User::Leave( KErrFSMailPluginNotSupported );
     }
 // </qmail>
+
+// <qmail>
+// -----------------------------------------------------------------------------
+// CFSMailPlugin::GetSignatureL
+// -----------------------------------------------------------------------------
+inline HBufC* CFSMailPlugin::GetSignatureL( const TFSMailMsgId& /*aMailBoxId*/ )
+    {
+    return NULL;
+    }
+// </qmail>
--- a/emailservices/emailframework/inc/MFSMailPlugin.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/inc/MFSMailPlugin.h	Mon Aug 23 23:32:31 2010 +0300
@@ -21,9 +21,9 @@
 
 //  INCLUDES
 //<cmail>
-#include "mfsmailrequestobserver.h"
-#include "mfsmaileventobserver.h"
-#include "cfsmailbox.h"
+#include "MFSMailRequestObserver.h"
+#include "MFSMailEventObserver.h"
+#include "CFSMailBox.h"
 //</cmail>
 
 // FORWARD DECLARATIONS
--- a/emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailBrandManagerImpl.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -21,7 +21,7 @@
 #include <nmcommonheaders.h>
 //</qmail>
 
-#include <FSMAILBRANDMANAGER.rsg>
+#include <fsmailbrandmanager.rsg>
 #include <barsread.h>
 #include <bautils.h>
 #include <mmf/common/mmfcontrollerpluginresolver.h> // CleanupResetAndDestroy
--- a/emailservices/emailframework/src/CFSMailClient.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailClient.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -593,6 +593,27 @@
         }  
     }
 
+// <qmail>
+// -----------------------------------------------------------------------------
+// CFSMailClient::GetSignatureL
+// -----------------------------------------------------------------------------
+EXPORT_C HBufC* CFSMailClient::GetSignatureL( const TFSMailMsgId& aMailBoxId )
+    {
+    NM_FUNCTION;
+    HBufC* ret = NULL;
+    
+    // select plugin
+    CFSMailPlugin* plugin =
+        iFWImplementation->GetPluginManager().GetPluginByUid( aMailBoxId );
+    if ( plugin )
+        {
+        ret = plugin->GetSignatureL( aMailBoxId );
+        }
+
+    return ret;
+    }
+// </qmail>
+
 // -----------------------------------------------------------------------------
 // CFSMailClient::Close
 // -----------------------------------------------------------------------------
--- a/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Mon Aug 23 23:32:31 2010 +0300
@@ -38,7 +38,7 @@
 #include "baseplugindef.h"
 //</qmail>
 
-#include "basemrinfoobject.h"
+#include "BaseMrInfoObject.h"
 #include "Map.h"
 
 
--- a/emailservices/emailstore/base_plugin/src/BaseMrInfoObject.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/BaseMrInfoObject.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -18,7 +18,7 @@
 
 
 
-#include "basemrinfoobject.h"
+#include "BaseMrInfoObject.h"
 #include "BasePlugin.h"
 
 
--- a/emailservices/emailstore/base_plugin/src/basepluginmisc.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginmisc.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -204,6 +204,9 @@
     criteria.AddResultPropertyL( KMsgStorePropertySize );
     criteria.AddResultPropertyL( KMsgStorePropertyFrom );
     criteria.AddResultPropertyL( KMsgStorePropertySubject );
+    criteria.AddResultPropertyL( KMsgStorePropertyTo );
+    criteria.AddResultPropertyL( KMsgStorePropertyCc );
+    criteria.AddResultPropertyL( KMsgStorePropertyBcc );
 
     /**@ figure the lifecycle mgmnt of the handler.*/
     CSearchHandler* searchHandler = new (ELeave) CSearchHandler( aSearchObserver, *this, aMailBoxId );
--- a/emailservices/emailstore/message_store/server/src/MessageStoreSession.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/emailstore/message_store/server/src/MessageStoreSession.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -117,7 +117,14 @@
     // This could leave if a session is created while the store is unavailable.
     TRAPD( err, iServer.MessageStoreL().ObserveL( this ) );
     
-    if( err != KErrNone )
+    // We need to leave the Session active in the case of KErrInUse.  This is
+    // because if the observer is dropped during KErrInUse, they cannot
+    // re-establish connection, and they will not know when MS in no longer busy.
+    // As a result, they will retry for many seconds to connect, then permanently
+    // give up.  This is avoided by trapping KErrInUse.
+    // Thus, only dropSession and Leave for other errors
+    
+    if( err != KErrNone && err != KErrInUse )
     {
         iServer.DropSession( this );
         User::Leave( err );
--- a/emailservices/nmailagent/inc/nmmailagent.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmailagent/inc/nmmailagent.h	Mon Aug 23 23:32:31 2010 +0300
@@ -19,16 +19,17 @@
 #define NMMAILAGENT_H
 
 #include <nmcommon.h>
+#include <nmuieventsnotifier.h>
 
 class CHWRMVibra;
 class NmMailbox;
 class NmDataPluginFactory;
 class NmDataPluginInterface;
 class HbIndicator;
-class XQSystemToneService;
 class XQSettingsManager;
 class XQSettingsKey;
 
+
 class NmMailboxInfo
 {
 public:
@@ -43,10 +44,10 @@
     int mInboxCreatedMessages;
     int mInboxChangedMessages;
     int mInboxDeletedMessages;
-    QList<NmId> mUnreadMailIdList;
+    QList<NmId> mMailIdList; // all messages
+    QList<NmId> mNewUnreadMailIdList; // new unread messages
     int mOutboxMails;
     bool mActive;
-    bool mInboxActive;
 
     NmMailboxInfo();
 };
@@ -91,6 +92,10 @@
 
     void delayedMailboxCreated(const NmId mailboxId);
     
+    void handleViewStateChangedEvent(const NmUiEventsNotifier::NmUiEventType eventType,
+                                     const NmUiViewId viewId,
+                                     const NmId mailboxId);
+
 private:
 
     void initMailboxStatus();
@@ -121,6 +126,8 @@
 
     bool removeMailboxInfo(const NmId &id);
 
+    bool updateMailboxState(const NmId &mailboxId);
+    
     bool updateMailboxState(const NmId &mailboxId,
         bool active, bool refreshAlways);
 
@@ -133,34 +140,36 @@
 
     void updateSendIndicator();
     
+    void resetMailboxState(NmMailboxInfo *info); 
+
     void storeMailboxActive(const NmId &mailboxId, bool active);
-    
+
     bool isMailboxActive(const NmId &mailboxId);
-    
+
     void deleteStoredMailboxActivity(const NmId &mailboxId);
 
     bool launchMailbox(quint64 mailboxId);
 
     void handleMessageCreatedEvent(const NmId &folderId, const QList<NmId> &messageIds,
-        const NmId &mailboxId, bool &updateNeeded, bool &activate);
+        const NmId &mailboxId);
 
     void handleMessageChangedEvent(const NmId &folderId, const QList<NmId> &messageIds,
-        const NmId &mailboxId, bool &updateNeeded, bool &activate);
+        const NmId &mailboxId);
 
     void handleMessageDeletedEvent(const NmId &folderId, const QList<NmId> &messageIds,
-        const NmId &mailboxId, bool &updateNeeded, bool &activate);
+        const NmId &mailboxId);
 
 private: // data
 
     HbIndicator *mIndicator; // Owned;
-    XQSystemToneService *mSystemTone; // Owned.
     NmDataPluginFactory *mPluginFactory; // Not owned (singleton).
     QList<NmMailboxInfo*> mMailboxes;
     CHWRMVibra *mVibra; // Owned.
+    XQSettingsManager *mSettingManager; // Owned.
+    NmUiEventsNotifier *mUiEventsNotifier; // Owned.
     bool mAlertToneAllowed;
     int mLastOutboxCount;
     bool mUnreadIndicatorActive;
-    XQSettingsManager *mSettingManager; // Owned.
     int mSilenceMode;
 };
 
--- a/emailservices/nmailagent/src/nmmailagent.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmailagent/src/nmmailagent.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -58,8 +58,6 @@
         (settingKey.key() == cenrepSettingKey.key()));
 }
 
-
-
 /*!
     \class NmMailboxInfo
 
@@ -76,30 +74,32 @@
   mInboxChangedMessages(0),
   mInboxDeletedMessages(0),
   mOutboxMails(0),
-  mActive(false),
-  mInboxActive(false)
+  mActive(false)
   {
       NM_FUNCTION;
   }
 
+
 /*!
     \class NmMailAgent
 
-    \brief Main class for receiving email events. Activates and deactivates indicator.
- */
-NmMailAgent::NmMailAgent() :
-     mIndicator(NULL),
-     mSystemTone(NULL),
-     mPluginFactory(NULL),
-     mVibra(NULL),
-     mAlertToneAllowed(true),
-     mLastOutboxCount(0),
-     mUnreadIndicatorActive(false),
-     mSettingManager(NULL),
-     mSilenceMode(NmSilenceModeOn)  // by default silent mode is on
-     {
-     NM_FUNCTION;
-     }
+    \brief Main class for receiving email events. Activates and deactivates
+           the indicator.
+*/
+NmMailAgent::NmMailAgent()
+: mIndicator(NULL),
+  mPluginFactory(NULL),
+  mVibra(NULL),
+  mSettingManager(NULL),
+  mUiEventsNotifier(NULL),
+  mAlertToneAllowed(true),
+  mLastOutboxCount(0),
+  mUnreadIndicatorActive(false),
+  mSilenceMode(NmSilenceModeOn)  // by default silent mode is on
+{
+    NM_FUNCTION;
+}
+
 
 /*!
     Delayed start.
@@ -118,7 +118,7 @@
     Initialise the agent.
 
     \return true if succesfully started.
- */
+*/
 bool NmMailAgent::init()
 {
     NM_FUNCTION;
@@ -151,10 +151,6 @@
         mSilenceMode = NmSilenceModeOn;
     }
 
-    delete mSystemTone;
-    mSystemTone = NULL;
-    mSystemTone = new XQSystemToneService();
-
     delete mIndicator;
     mIndicator = NULL;
     mIndicator = new HbIndicator();
@@ -191,6 +187,18 @@
     mVibra = NULL;
     TRAP_IGNORE(mVibra = CHWRMVibra::NewL());
 
+    // Start monitoring the UI events.
+    delete mUiEventsNotifier;
+    mUiEventsNotifier = NULL;
+    mUiEventsNotifier = new NmUiEventsNotifier(this);
+
+    connect(mUiEventsNotifier,
+            SIGNAL(viewStateChanged(NmUiEventsNotifier::NmUiEventType,
+                                    NmUiViewId, NmId)),
+            this,
+            SLOT(handleViewStateChangedEvent(const NmUiEventsNotifier::NmUiEventType,
+                                             const NmUiViewId, const NmId)));
+
     // load all current mailboxes
     initMailboxStatus();
 
@@ -199,20 +207,24 @@
 
 /*!
     Destructor of NmMailAgent.
- */
+*/
 NmMailAgent::~NmMailAgent()
 {
     NM_FUNCTION;
 
     delete mIndicator;
     delete mVibra;
-    delete mSystemTone;
+
     if (mSettingManager) {
         mSettingManager->stopMonitoring(NmSilenceModeKey);
         delete mSettingManager;
     }
+
     qDeleteAll(mMailboxes);
 
+    delete mUiEventsNotifier;
+    mUiEventsNotifier = NULL;
+
     NmDataPluginFactory::releaseInstance(mPluginFactory);
 }
 
@@ -244,16 +256,16 @@
                 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 (activate) {
-                        if (!wasActive) {
-                            // do not activate the mailbox if it was left as hidden last time
-                            activate = false;
-                        }
-                        else {
-                            // otherwise, activate the mailbox and show inbox state
-                            mailboxInfo->mInboxActive = true;
-                        }
+                    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(),
@@ -300,33 +312,50 @@
         QList<NmMessageEnvelope*> messageList;
         plugin->listMessages(mailboxId, inboxId, messageList);
 
-        QList<NmId> newUnreadMessageIdList;
+        QList<NmId> newMessageIdList;
+
+        int unreadCount(0);
         foreach (const NmMessageEnvelope* envelope, messageList) {
             // if the message is not read, it is "unread"
-            if (!envelope->isRead()) {
-                quint64 messageId = envelope->messageId().id();
-                newUnreadMessageIdList.append(envelope->messageId());
+            quint64 messageId = envelope->messageId().id();
+            newMessageIdList.append(envelope->messageId());
+            bool read = envelope->isRead();
+
+            // This is a new unread mail
+            if (!read) {
+                unreadCount++;
+
+                // Iterate through all known ids. If the id can't be found the mail is new.
                 bool found(false);
-                // Iterate through all known ids. If the id can't be found the mail is new.
-                foreach (const NmId id, mailboxInfo.mUnreadMailIdList) {
+                foreach (const NmId id, mailboxInfo.mMailIdList) {
                     if (id.id() == messageId) {
                         found = true;
                         break;
                     }
                 }
 
+                // it was new unread message
                 if (!found) {
-                    newUnreadMessages++;
+					if (mailboxInfo.mNewUnreadMailIdList.indexOf(messageId)<0) {
+                        mailboxInfo.mNewUnreadMailIdList.append(messageId);
+                        newUnreadMessages++;
+					}
                 }
             }
+            else {
+                // message is now 'read' - make sure it is no longer in list new unread mails
+                mailboxInfo.mNewUnreadMailIdList.removeAll(messageId);
+            }
         }
         qDeleteAll(messageList);
 
         // Save updated list of unread message IDs
-        mailboxInfo.mUnreadMailIdList = newUnreadMessageIdList;
+        mailboxInfo.mMailIdList = newMessageIdList;
+
+        NM_COMMENT(QString("NmMailAgent::getUnreadCount(): totalCount=%1, newUnread=%2").
+            arg(mailboxInfo.mMailIdList.count()).
+            arg(newUnreadMessages));
     }
-    NM_COMMENT(QString("NmMailAgent::getUnreadCount(): count=%1, new=%2").
-        arg(mailboxInfo.mUnreadMailIdList.count()).arg(newUnreadMessages));
 
     return (newUnreadMessages > 0);
 }
@@ -358,7 +387,7 @@
 }
 
 /*!
-    Get list of unread counts in active mailboxes.
+    Get list of unread counts in all active mailboxes.
 
 	\returns total number of unread mails
  */
@@ -368,8 +397,8 @@
 
     int unreads = 0;
     foreach (const NmMailboxInfo *mailbox, mMailboxes) {
-        if (mailbox->mActive && mailbox->mInboxActive) {
-            unreads += mailbox->mUnreadMailIdList.count();
+        if (mailbox->mActive) {
+            unreads += mailbox->mNewUnreadMailIdList.count();
         }
     }
     return unreads;
@@ -389,6 +418,24 @@
 }
 
 /*!
+    Update mailbox visibility according to current status
+*/
+bool NmMailAgent::updateMailboxState(const NmId &mailboxId) 
+{
+    NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
+    bool shown = false;
+    
+    if( mailboxInfo->mActive && 
+        (mailboxInfo->mNewUnreadMailIdList.count() > 0 ||
+         mailboxInfo->mOutboxMails>0)) {
+        shown = true;
+    }
+    
+    return updateMailboxState(mailboxId,shown,false);
+}
+
+
+/*!
     Update the mailbox visibility and status.
 
     \param mailboxId id of the mailbox
@@ -452,7 +499,7 @@
     QList<QVariant> list;
     list.append(mailboxInfo.mId.id());
     list.append(mailboxInfo.mName);
-    list.append(mailboxInfo.mUnreadMailIdList.count());
+    list.append(mailboxInfo.mNewUnreadMailIdList.count());
     list.append(mailboxInfo.mSyncState);
     list.append(mailboxInfo.mConnectState);
     list.append(mailboxInfo.mOutboxMails);
@@ -482,14 +529,17 @@
     NM_FUNCTION;
 
     bool activated = false;
-    if (active != mUnreadIndicatorActive) {
-        if (active) {
-            mIndicator->activate(NmUnreadIndicatorName);
-            activated = true;
-        }
-        else {
-            mIndicator->deactivate(NmUnreadIndicatorName);
-        }
+    bool ok;
+    if (active) {
+        ok = mIndicator->activate(NmUnreadIndicatorName);
+        activated = true;
+    }
+    else {
+        ok = mIndicator->deactivate(NmUnreadIndicatorName);
+    }
+
+    // update the state only if the activation/deactivation was successful
+    if (ok) {
         mUnreadIndicatorActive = active;
     }
 
@@ -528,11 +578,9 @@
     \param folderId Id of the folder that includes the message
     \param messageIds Message ids that are checked
     \param mailboxId Id of the mailbox that includes the message
-    \param updateNeeded Set to <code>true</code> if update needed otherwise not touched
-    \param activate Set to <code>true</code> if activation needed otherwise not touched
  */
 void NmMailAgent::handleMessageCreatedEvent(const NmId &folderId, const QList<NmId> &messageIds,
-    const NmId &mailboxId, bool &updateNeeded, bool &activate)
+    const NmId &mailboxId)
 {
     NM_FUNCTION;
 
@@ -551,21 +599,32 @@
     }
 
     if (folderId == mailboxInfo->mInboxFolderId) {
+        mailboxInfo->mInboxCreatedMessages += messageIds.count();
+
         foreach (NmId messageId, messageIds) {
             bool messageUnread = false;
+            mailboxInfo->mMailIdList.append(messageId);
 
-            // Check the message if we can either play a tone or if the "@" is
-            // not visible at the moment
-            if (mAlertToneAllowed || !mUnreadIndicatorActive) {
+            // double check that the message ID is really new
+            bool newMessage = true;
+            if (mailboxInfo->mNewUnreadMailIdList.indexOf(messageId)>=0) {
+                newMessage = false;
+            }
+
+            // If it is a new message, update the mailbox status
+            if (newMessage) {
                 if (getMessageUnreadInfo(folderId, messageId, mailboxId, messageUnread)) {
                     if (messageUnread) {
-                        mailboxInfo->mUnreadMailIdList.append(messageId);
-                        mailboxInfo->mInboxActive = true;
+                        mailboxInfo->mNewUnreadMailIdList.append(messageId);
+                        NM_COMMENT(QString(" new unread messages: count=%1").
+                            arg(mailboxInfo->mNewUnreadMailIdList.count()));
+
+                        if (!mUnreadIndicatorActive) {
+                            // make the "@" appear immediatelly
+                            updateUnreadIndicator(true);
+                        }
                         updateMailboxState(mailboxId, true, false);
 
-                        // make the "@" appear immediatelly
-                        updateUnreadIndicator(true);
-
                         // Play the tone as well
                         playAlertTone();
                     }
@@ -574,21 +633,15 @@
         }
     }
 
-    if (folderId==mailboxInfo->mInboxFolderId) {
-        mailboxInfo->mInboxCreatedMessages += messageIds.count();
-    }
-
     // When created a new mail in the outbox, we are in sending state
     if (mailboxInfo->mOutboxFolderId == folderId) {
         // The first mail created in the outbox
         if (mailboxInfo->mOutboxMails <= 0) {
             NM_COMMENT("NmMailAgent: first mail in outbox");
         }
-        // Always activate the indicator
-        activate = true;
-        updateNeeded = true;
-
         mailboxInfo->mOutboxMails += messageIds.count();
+        
+        updateMailboxState(mailboxId,true,true);
         updateSendIndicator();
     }
 }
@@ -601,45 +654,39 @@
     \param folderId Id of the folder that includes the message
     \param messageIds Message ids that are checked
     \param mailboxId Id of the mailbox that includes the message
-    \param updateNeeded Set to <code>true</code> if update needed otherwise not touched
-    \param activate Set result value of updateUnreadCount method
  */
-void NmMailAgent::handleMessageChangedEvent(const NmId &folderId, 
+void NmMailAgent::handleMessageChangedEvent(const NmId &folderId,
     const QList<NmId> &messageIds,
-    const NmId &mailboxId,
-    bool &updateNeeded, bool &activate)
+    const NmId &mailboxId)
 {
+    NM_FUNCTION;
+
     NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
 
     // we are interested only about changes in the inbox
-    if (folderId == mailboxInfo->mInboxFolderId) {
+    if (mailboxInfo && folderId == mailboxInfo->mInboxFolderId) {
         mailboxInfo->mInboxChangedMessages++;
 
-        // If not currently syncronizing the mailbox, this may mean
-        // that a message was read/unread
-        if (mailboxInfo && mailboxInfo->mSyncState == SyncComplete) {
-            // If there was no unread mails in the list, do nothing
-            int oldCount(mailboxInfo->mUnreadMailIdList.count());
-            if (oldCount>0) {
-                // Check how many messages were unread earlier
-                int unreadMessages = 0;
-                foreach (NmId messageId, messageIds) {
-                    if (mailboxInfo->mUnreadMailIdList.indexOf(messageId)>=0) {
-                        unreadMessages++;
+        if (mailboxInfo->mNewUnreadMailIdList.count()>0) {
+            bool updateMailbox = false;
+
+            // Check how many messages was in the list of new unread mails
+            foreach (NmId messageId, messageIds) {
+                if (mailboxInfo->mNewUnreadMailIdList.indexOf(messageId)>=0) {
+                    bool messageUnread(false);
+                    if (getMessageUnreadInfo(folderId, messageId, mailboxId, messageUnread)) {
+                        // Message is no longer unread
+                        if (!messageUnread) {
+                            mailboxInfo->mNewUnreadMailIdList.removeAll(messageId);
+                            updateMailbox = true;
+                        }
                     }
                 }
-
-                // Could lead the count drop to 0 => mailbox will be hidden
-                if (unreadMessages > 0) {
-                    // check the unread status again
-                    activate = updateUnreadCount(mailboxId, *mailboxInfo);
-
-                    // no more unread mails in the inbox
-                    if (mailboxInfo->mUnreadMailIdList.count()==0) {
-                        NM_COMMENT("NmMailAgent:handleMessageChangedEvent - no more unread msgs");
-                        updateNeeded = true;
-                    }
-                }
+            }
+            
+            if (updateMailbox) {
+                updateMailboxState(mailboxId);
+                updateUnreadIndicator();
             }
         }
     }
@@ -651,16 +698,28 @@
     \param folderId Id of the folder that includes the message
     \param messageIds Message ids that are checked
     \param mailboxId Id of the mailbox that includes the message
-    \param updateNeeded Set to <code>true</code> if update needed otherwise not touched
-    \param activate Set to <code>true</code> if activation needed otherwise not touched
  */
 void NmMailAgent::handleMessageDeletedEvent(const NmId &folderId, const QList<NmId> &messageIds,
-    const NmId &mailboxId, bool &updateNeeded, bool &activate)
+    const NmId &mailboxId)
 {
+    NM_FUNCTION;
+    
     NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
 
-    if (folderId == mailboxInfo->mInboxFolderId) {
+    if (mailboxInfo && folderId == mailboxInfo->mInboxFolderId) {
         mailboxInfo->mInboxDeletedMessages++;
+
+        // 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);
+        }
     }
 
     // Deleted mails from the outbox
@@ -672,25 +731,12 @@
             mailboxInfo->mOutboxMails = 0;
         }
 
-        // The last mail was now deleted
+        // The last mail was now deleted from outbox
         if (mailboxInfo->mOutboxMails == 0) {
             NM_COMMENT("NmMailAgent: last mail deleted from outbox");
-            updateNeeded = true;
-
-            // Keep it active if there is unread mails and inbox is still active
-            if (mailboxInfo->mInboxActive &&
-                mailboxInfo->mUnreadMailIdList.count() > 0) {
-                activate = true;
-            }
+            updateSendIndicator();
         }
-        else {
-            // Also update the indicator status if it is already shown
-            if (mailboxInfo->mActive) {
-                activate = true;
-                updateNeeded = true;
-            }
-        }
-        updateSendIndicator();
+        updateMailboxState(mailboxId);
     }
 }
 
@@ -800,6 +846,35 @@
     getMailboxInfo(mailboxId);
 }
 
+
+/*!
+    Handles the view state changed UI event. The event notification is received
+    via NmUiEventsNotifier.
+
+    \param eventType The type of the UI event.
+    \param viewId The ID of the view the event concerns.
+    \param mailboxId The ID of the mailbox related to the UI event.
+*/
+void NmMailAgent::handleViewStateChangedEvent(
+    const NmUiEventsNotifier::NmUiEventType eventType,
+    const NmUiViewId viewId,
+    const NmId mailboxId)
+{
+    if (eventType == NmUiEventsNotifier::NmViewShownEvent &&
+        viewId == NmUiViewMessageList) {
+        // Get the mailbox info.
+        NmMailboxInfo *info = getMailboxInfo(mailboxId);
+
+        if (info) {
+            // The message list view was shown. If the indicator of the mailbox
+            // in question is active, deactivate it.
+            updateMailboxState(info->mId, false, false);  
+            resetMailboxState(info);
+        }
+    }
+}
+
+
 /*!
    Map the type name to mailbox info.
 
@@ -827,6 +902,20 @@
 }
 
 /*!
+    Clear the mailbox state to be 'seen'
+    \param info mailbox that will be reseted
+ */
+void NmMailAgent::resetMailboxState(NmMailboxInfo *info)
+{
+    NM_FUNCTION;
+    
+    info->mActive = false; // indicator is no longer active
+    info->mNewUnreadMailIdList.clear(); // no mails are no longer 'new'
+    storeMailboxActive(info->mId, false);
+    updateUnreadIndicator();
+}
+
+/*!
     Called when indicator is clicked from the indicator menu
     - indicator will be hide from the menu
     - mailbox will be launched
@@ -842,10 +931,7 @@
     // map the indicator type to mailbox
     NmMailboxInfo *info = getMailboxByType(type);
     if (info) {
-        info->mActive = false; // indicator is no longer active
-        info->mInboxActive = false; // also inbox does not activate the indicator
-        storeMailboxActive(info->mId, false);
-        updateUnreadIndicator();
+        resetMailboxState(info);
 
         launchMailbox(info->mId.id());
     }
@@ -886,33 +972,22 @@
     NM_COMMENT(QString("NmMailAgent::handleMessageEvent(): event=%1, id=%2").
         arg(event).arg(mailboxId.id()));
 
-    bool updateNeeded = false;
-    bool activate = false;
-
     switch (event) {
         case NmMessageCreated: {
-            handleMessageCreatedEvent(folderId, messageIds, mailboxId, updateNeeded, activate);
+            handleMessageCreatedEvent(folderId, messageIds, mailboxId);
             break;
         }
         case NmMessageChanged: {
-            handleMessageChangedEvent(folderId, messageIds, mailboxId, updateNeeded, activate);
+            handleMessageChangedEvent(folderId, messageIds, mailboxId);
             break;
         }
         case NmMessageDeleted: {
-            handleMessageDeletedEvent(folderId, messageIds, mailboxId, updateNeeded, activate);
+            handleMessageDeletedEvent(folderId, messageIds, mailboxId);
             break;
         }
         default:
             break;
     }
-
-    if (updateNeeded) {
-        updateUnreadIndicator();
-
-        NmMailboxInfo *mailboxInfo = getMailboxInfo(mailboxId);
-        updateMailboxState(mailboxId,
-            activate, true /* force refresh */);
-    }
 }
 
 /*!
@@ -932,39 +1007,6 @@
     NmMailboxInfo *info = getMailboxInfo(event.mMailboxId);
     if (info) {
         info->mSyncState = state;
-
-        if (state==Synchronizing) {
-            // Reset counters when sync is started
-            info->mInboxCreatedMessages = 0;
-            info->mInboxChangedMessages = 0;
-            info->mInboxDeletedMessages = 0;
-        }
-        else if (state==SyncComplete) {
-            // Check the unread status here again
-            bool updateMailbox = updateUnreadCount(event.mMailboxId, *info);
-            int oldOutboxCount = info->mOutboxMails;
-            info->mOutboxMails = getOutboxCount(event.mMailboxId, info->mOutboxFolderId);
-            int unreadMailCount(info->mUnreadMailIdList.count());
-            if (info->mOutboxMails > oldOutboxCount || unreadMailCount == 0) {
-                // new mails in outbox
-                updateMailbox = true;
-            }
-            bool active = unreadMailCount || info->mOutboxMails;
-
-            // Refresh the indicator if messages created or changed
-            NM_COMMENT(QString("NmMailAgent::handleSyncStateEvent(): "
-                "created=%1, changed=%2, deleted=%3").
-                arg(info->mInboxCreatedMessages).
-                arg(info->mInboxChangedMessages).
-                arg(info->mInboxDeletedMessages));
-            bool refresh = (info->mInboxCreatedMessages > 0) || (info->mInboxChangedMessages > 0);
-
-            updateUnreadIndicator();
-
-            if (updateMailbox) {
-                updateMailboxState(event.mMailboxId, active, refresh);
-            }
-        }
     }
 }
 
@@ -1141,10 +1183,11 @@
     bool played(false);
 
     if (mAlertToneAllowed) {
-        // Play tone only if system tone service is available and
-        // phone is not in silence mode.
-        if (mSystemTone && !mSilenceMode) {
-            mSystemTone->playTone(XQSystemToneService::EmailAlertTone);
+        // Play tone only when phone is not in silence mode.
+        if (!mSilenceMode) {
+            // Must instantiate it again to make sure correct tone is played  
+            XQSystemToneService systemTone;
+            systemTone.playTone(XQSystemToneService::EmailAlertTone);
         }
 
         // Execute the vibra effect.
--- a/emailservices/nmclientapi/bwins/nmailclientapiu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmclientapi/bwins/nmailclientapiu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -1,249 +1,249 @@
 EXPORTS
 	?totalSize@NmApiMessageBody@EmailClientApi@@QBE_KXZ @ 1 NONAME ; unsigned long long EmailClientApi::NmApiMessageBody::totalSize(void) const
 	?isRunning@NmApiEmailService@EmailClientApi@@QBE_NXZ @ 2 NONAME ; bool EmailClientApi::NmApiEmailService::isRunning(void) const
-	??4NmApiMessageBody@EmailClientApi@@QAEAAV01@ABV01@@Z @ 3 NONAME ; class EmailClientApi::NmApiMessageBody & EmailClientApi::NmApiMessageBody::operator=(class EmailClientApi::NmApiMessageBody const &)
-	?qt_metacall@NmApiEventNotifier@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4 NONAME ; int EmailClientApi::NmApiEventNotifier::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setPlainText@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 5 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setPlainText(class QString const &)
-	?id@NmApiMailbox@EmailClientApi@@QBE_KXZ @ 6 NONAME ; unsigned long long EmailClientApi::NmApiMailbox::id(void) const
-	?id@NmApiFolder@EmailClientApi@@QBE_KXZ @ 7 NONAME ; unsigned long long EmailClientApi::NmApiFolder::id(void) const
-	?foldersListed@NmApiFolderListing@EmailClientApi@@IAEXH@Z @ 8 NONAME ; void EmailClientApi::NmApiFolderListing::foldersListed(int)
-	??8NmApiFolder@EmailClientApi@@QAE_NABV01@@Z @ 9 NONAME ; bool EmailClientApi::NmApiFolder::operator==(class EmailClientApi::NmApiFolder const &)
-	??0NmApiFolder@EmailClientApi@@QAE@ABV01@@Z @ 10 NONAME ; EmailClientApi::NmApiFolder::NmApiFolder(class EmailClientApi::NmApiFolder const &)
-	??0NmApiMailboxListing@EmailClientApi@@QAE@PAVQObject@@@Z @ 11 NONAME ; EmailClientApi::NmApiMailboxListing::NmApiMailboxListing(class QObject *)
-	?subject@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 12 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::subject(void) const
-	?setIsRead@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 13 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsRead(bool)
-	?qt_metacall@NmApiEnvelopeListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 14 NONAME ; int EmailClientApi::NmApiEnvelopeListing::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?metaObject@NmApiFolderListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 15 NONAME ; struct QMetaObject const * EmailClientApi::NmApiFolderListing::metaObject(void) const
-	?fetchedSize@NmApiMessageBody@EmailClientApi@@QBE_KXZ @ 16 NONAME ; unsigned long long EmailClientApi::NmApiMessageBody::fetchedSize(void) const
-	?setChildFolderIds@NmApiFolder@EmailClientApi@@QAEXAAV?$QList@_K@@@Z @ 17 NONAME ; void EmailClientApi::NmApiFolder::setChildFolderIds(class QList<unsigned long long> &)
-	??0NmApiMessageEnvelope@EmailClientApi@@QAE@XZ @ 18 NONAME ; EmailClientApi::NmApiMessageEnvelope::NmApiMessageEnvelope(void)
-	??1NmApiMessageEnvelope@EmailClientApi@@UAE@XZ @ 19 NONAME ; EmailClientApi::NmApiMessageEnvelope::~NmApiMessageEnvelope(void)
-	??4NmApiMailbox@EmailClientApi@@QAEAAV01@ABV01@@Z @ 20 NONAME ; class EmailClientApi::NmApiMailbox & EmailClientApi::NmApiMailbox::operator=(class EmailClientApi::NmApiMailbox const &)
-	?setSentTime@NmApiMessageEnvelope@EmailClientApi@@QAEXVQDateTime@@@Z @ 21 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSentTime(class QDateTime)
-	?setFetchedSize@NmApiMessageBody@EmailClientApi@@QAEX_K@Z @ 22 NONAME ; void EmailClientApi::NmApiMessageBody::setFetchedSize(unsigned long long)
-	?name@NmApiFolder@EmailClientApi@@QBE?AVQString@@XZ @ 23 NONAME ; class QString EmailClientApi::NmApiFolder::name(void) const
-	??1NmApiEmailAddress@EmailClientApi@@UAE@XZ @ 24 NONAME ; EmailClientApi::NmApiEmailAddress::~NmApiEmailAddress(void)
-	?setIsForwarded@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 25 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsForwarded(bool)
-	?qt_metacast@NmApiMessageTask@@UAEPAXPBD@Z @ 26 NONAME ; void * NmApiMessageTask::qt_metacast(char const *)
-	?staticMetaObject@NmApiMailboxListing@EmailClientApi@@2UQMetaObject@@B @ 27 NONAME ; struct QMetaObject const EmailClientApi::NmApiMailboxListing::staticMetaObject
-	?address@NmApiMailbox@EmailClientApi@@QBE?AVQString@@XZ @ 28 NONAME ; class QString EmailClientApi::NmApiMailbox::address(void) const
-	??0NmApiMessageBody@EmailClientApi@@QAE@XZ @ 29 NONAME ; EmailClientApi::NmApiMessageBody::NmApiMessageBody(void)
-	?metaObject@NmApiEventNotifier@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 30 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEventNotifier::metaObject(void) const
-	?tr@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 31 NONAME ; class QString EmailClientApi::NmApiFolderListing::tr(char const *, char const *)
-	?metaObject@NmApiEmailService@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEmailService::metaObject(void) const
-	?parentFolder@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 33 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::parentFolder(void) const
-	??_ENmApiMessageBody@EmailClientApi@@UAE@I@Z @ 34 NONAME ; EmailClientApi::NmApiMessageBody::~NmApiMessageBody(unsigned int)
-	?qt_metacall@NmApiMailboxListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 35 NONAME ; int EmailClientApi::NmApiMailboxListing::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_ENmApiMailbox@EmailClientApi@@UAE@I@Z @ 36 NONAME ; EmailClientApi::NmApiMailbox::~NmApiMailbox(unsigned int)
-	?setId@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 37 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setId(unsigned long long)
-	?trUtf8@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString EmailClientApi::NmApiEmailService::trUtf8(char const *, char const *, int)
-	?getStaticMetaObject@NmApiMailboxListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 39 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMailboxListing::getStaticMetaObject(void)
-	?setName@NmApiFolder@EmailClientApi@@QAEXABVQString@@@Z @ 40 NONAME ; void EmailClientApi::NmApiFolder::setName(class QString const &)
-	?isRunning@NmApiMailboxListing@EmailClientApi@@QBE_NXZ @ 41 NONAME ; bool EmailClientApi::NmApiMailboxListing::isRunning(void) const
-	?setName@NmApiMailbox@EmailClientApi@@QAEXABVQString@@@Z @ 42 NONAME ; void EmailClientApi::NmApiMailbox::setName(class QString const &)
-	?tr@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::tr(char const *, char const *, int)
-	?isRunning@NmApiFolderListing@EmailClientApi@@QBE_NXZ @ 44 NONAME ; bool EmailClientApi::NmApiFolderListing::isRunning(void) const
-	?staticMetaObject@NmApiEventNotifier@EmailClientApi@@2UQMetaObject@@B @ 45 NONAME ; struct QMetaObject const EmailClientApi::NmApiEventNotifier::staticMetaObject
-	?tr@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 46 NONAME ; class QString EmailClientApi::NmApiFolderListing::tr(char const *, char const *, int)
-	?trUtf8@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString EmailClientApi::NmApiFolderListing::trUtf8(char const *, char const *, int)
-	?envelopesListed@NmApiEnvelopeListing@EmailClientApi@@IAEXH@Z @ 48 NONAME ; void EmailClientApi::NmApiEnvelopeListing::envelopesListed(int)
-	?fetchedSize@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 49 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::fetchedSize(void) const
-	?tr@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString EmailClientApi::NmApiEventNotifier::tr(char const *, char const *)
-	?sentTime@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQDateTime@@XZ @ 51 NONAME ; class QDateTime EmailClientApi::NmApiMessageEnvelope::sentTime(void) const
-	?setSubject@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 52 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSubject(class QString const &)
-	?folderType@NmApiFolder@EmailClientApi@@QBE?AW4NmApiEmailFolderType@2@XZ @ 53 NONAME ; enum EmailClientApi::NmApiEmailFolderType EmailClientApi::NmApiFolder::folderType(void) const
-	?setToRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXABV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 54 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setToRecipients(class QList<class EmailClientApi::NmApiEmailAddress> const &)
-	??1NmApiEventNotifier@EmailClientApi@@UAE@XZ @ 55 NONAME ; EmailClientApi::NmApiEventNotifier::~NmApiEventNotifier(void)
-	?isRead@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 56 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isRead(void) const
-	?failed@NmApiMessageTask@@IAEXH@Z @ 57 NONAME ; void NmApiMessageTask::failed(int)
-	?qt_metacast@NmApiFolderListing@EmailClientApi@@UAEPAXPBD@Z @ 58 NONAME ; void * EmailClientApi::NmApiFolderListing::qt_metacast(char const *)
-	?messageEvent@NmApiEventNotifier@EmailClientApi@@IAEXW4NmApiMessageEvent@2@_K1V?$QList@_K@@@Z @ 59 NONAME ; void EmailClientApi::NmApiEventNotifier::messageEvent(enum EmailClientApi::NmApiMessageEvent, unsigned long long, unsigned long long, class QList<unsigned long long>)
-	?setTotalSize@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 60 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setTotalSize(unsigned long long)
-	?qt_metacall@NmApiMessageTask@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 61 NONAME ; int NmApiMessageTask::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1NmApiMailbox@EmailClientApi@@UAE@XZ @ 62 NONAME ; EmailClientApi::NmApiMailbox::~NmApiMailbox(void)
-	?tr@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 63 NONAME ; class QString EmailClientApi::NmApiEventNotifier::tr(char const *, char const *, int)
-	??8NmApiMessageBody@EmailClientApi@@QAE_NABV01@@Z @ 64 NONAME ; bool EmailClientApi::NmApiMessageBody::operator==(class EmailClientApi::NmApiMessageBody const &)
-	?start@NmApiMailboxListing@EmailClientApi@@UAE_NXZ @ 65 NONAME ; bool EmailClientApi::NmApiMailboxListing::start(void)
-	??_ENmApiEnvelopeListing@EmailClientApi@@UAE@I@Z @ 66 NONAME ; EmailClientApi::NmApiEnvelopeListing::~NmApiEnvelopeListing(unsigned int)
-	?uninitialise@NmApiEmailService@EmailClientApi@@QAEXXZ @ 67 NONAME ; void EmailClientApi::NmApiEmailService::uninitialise(void)
-	?trUtf8@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 68 NONAME ; class QString EmailClientApi::NmApiEventNotifier::trUtf8(char const *, char const *, int)
-	??0NmApiMessageBody@EmailClientApi@@QAE@ABV01@@Z @ 69 NONAME ; EmailClientApi::NmApiMessageBody::NmApiMessageBody(class EmailClientApi::NmApiMessageBody const &)
-	??1NmApiMessageBody@EmailClientApi@@UAE@XZ @ 70 NONAME ; EmailClientApi::NmApiMessageBody::~NmApiMessageBody(void)
-	?hasAttachments@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 71 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::hasAttachments(void) const
-	?setSender@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 72 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSender(class QString const &)
-	??_ENmApiMailboxListing@EmailClientApi@@UAE@I@Z @ 73 NONAME ; EmailClientApi::NmApiMailboxListing::~NmApiMailboxListing(unsigned int)
-	?trUtf8@NmApiMessageTask@@SA?AVQString@@PBD0@Z @ 74 NONAME ; class QString NmApiMessageTask::trUtf8(char const *, char const *)
-	?staticMetaObject@NmApiMessageTask@@2UQMetaObject@@B @ 75 NONAME ; struct QMetaObject const NmApiMessageTask::staticMetaObject
-	?getChildFolderIds@NmApiFolder@EmailClientApi@@QAEXAAV?$QList@_K@@@Z @ 76 NONAME ; void EmailClientApi::NmApiFolder::getChildFolderIds(class QList<unsigned long long> &)
-	?parentFolderId@NmApiFolder@EmailClientApi@@QBE_KXZ @ 77 NONAME ; unsigned long long EmailClientApi::NmApiFolder::parentFolderId(void) const
-	??_ENmApiEmailAddress@EmailClientApi@@UAE@I@Z @ 78 NONAME ; EmailClientApi::NmApiEmailAddress::~NmApiEmailAddress(unsigned int)
-	??0NmApiFolder@EmailClientApi@@QAE@XZ @ 79 NONAME ; EmailClientApi::NmApiFolder::NmApiFolder(void)
-	?tr@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 80 NONAME ; class QString EmailClientApi::NmApiMailboxListing::tr(char const *, char const *)
-	?tr@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0@Z @ 81 NONAME ; class QString EmailClientApi::NmApiEmailService::tr(char const *, char const *)
-	?getFolders@NmApiFolderListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiFolder@EmailClientApi@@@@@Z @ 82 NONAME ; bool EmailClientApi::NmApiFolderListing::getFolders(class QList<class EmailClientApi::NmApiFolder> &)
-	?plainText@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 83 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::plainText(void) const
-	?getStaticMetaObject@NmApiEmailService@EmailClientApi@@SAABUQMetaObject@@XZ @ 84 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEmailService::getStaticMetaObject(void)
-	?metaObject@NmApiEnvelopeListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 85 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEnvelopeListing::metaObject(void) const
-	?trUtf8@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 86 NONAME ; class QString EmailClientApi::NmApiMailboxListing::trUtf8(char const *, char const *)
-	?tr@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 87 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::tr(char const *, char const *)
-	?canceled@NmApiMessageTask@@IAEXXZ @ 88 NONAME ; void NmApiMessageTask::canceled(void)
-	?setHasAttachments@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 89 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setHasAttachments(bool)
-	??_ENmApiMessageEnvelope@EmailClientApi@@UAE@I@Z @ 90 NONAME ; EmailClientApi::NmApiMessageEnvelope::~NmApiMessageEnvelope(unsigned int)
-	?displayName@NmApiEmailAddress@EmailClientApi@@QBE?AVQString@@XZ @ 91 NONAME ; class QString EmailClientApi::NmApiEmailAddress::displayName(void) const
-	??0NmApiFolderListing@EmailClientApi@@QAE@PAVQObject@@AB_K@Z @ 92 NONAME ; EmailClientApi::NmApiFolderListing::NmApiFolderListing(class QObject *, unsigned long long const &)
-	??_ENmApiFolder@EmailClientApi@@UAE@I@Z @ 93 NONAME ; EmailClientApi::NmApiFolder::~NmApiFolder(unsigned int)
-	?getStaticMetaObject@NmApiFolderListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 94 NONAME ; struct QMetaObject const & EmailClientApi::NmApiFolderListing::getStaticMetaObject(void)
-	?name@NmApiMailbox@EmailClientApi@@QBE?AVQString@@XZ @ 95 NONAME ; class QString EmailClientApi::NmApiMailbox::name(void) const
-	?trUtf8@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString EmailClientApi::NmApiEmailService::trUtf8(char const *, char const *)
-	??1NmApiMailboxListing@EmailClientApi@@UAE@XZ @ 97 NONAME ; EmailClientApi::NmApiMailboxListing::~NmApiMailboxListing(void)
-	??1NmApiFolder@EmailClientApi@@UAE@XZ @ 98 NONAME ; EmailClientApi::NmApiFolder::~NmApiFolder(void)
-	??0NmApiMailbox@EmailClientApi@@QAE@ABV01@@Z @ 99 NONAME ; EmailClientApi::NmApiMailbox::NmApiMailbox(class EmailClientApi::NmApiMailbox const &)
-	?setCcRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXABV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 100 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setCcRecipients(class QList<class EmailClientApi::NmApiEmailAddress> const &)
-	??_ENmApiEventNotifier@EmailClientApi@@UAE@I@Z @ 101 NONAME ; EmailClientApi::NmApiEventNotifier::~NmApiEventNotifier(unsigned int)
-	?staticMetaObject@NmApiEmailService@EmailClientApi@@2UQMetaObject@@B @ 102 NONAME ; struct QMetaObject const EmailClientApi::NmApiEmailService::staticMetaObject
-	??1NmApiFolderListing@EmailClientApi@@UAE@XZ @ 103 NONAME ; EmailClientApi::NmApiFolderListing::~NmApiFolderListing(void)
-	?getPlainTextBody@NmApiMessageEnvelope@EmailClientApi@@QAEXAAVNmApiMessageBody@2@@Z @ 104 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getPlainTextBody(class EmailClientApi::NmApiMessageBody &)
-	?id@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 105 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::id(void) const
-	?setFetchedSize@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 106 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setFetchedSize(unsigned long long)
-	??0NmApiEnvelopeListing@EmailClientApi@@QAE@PAVQObject@@_K1@Z @ 107 NONAME ; EmailClientApi::NmApiEnvelopeListing::NmApiEnvelopeListing(class QObject *, unsigned long long, unsigned long long)
-	??0NmApiEmailAddress@EmailClientApi@@QAE@ABV01@@Z @ 108 NONAME ; EmailClientApi::NmApiEmailAddress::NmApiEmailAddress(class EmailClientApi::NmApiEmailAddress const &)
-	?getToRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXAAV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 109 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getToRecipients(class QList<class EmailClientApi::NmApiEmailAddress> &)
-	?setParentFolder@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 110 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setParentFolder(unsigned long long)
-	??4NmApiFolder@EmailClientApi@@QAEAAV01@ABV01@@Z @ 111 NONAME ; class EmailClientApi::NmApiFolder & EmailClientApi::NmApiFolder::operator=(class EmailClientApi::NmApiFolder const &)
-	?qt_metacast@NmApiEnvelopeListing@EmailClientApi@@UAEPAXPBD@Z @ 112 NONAME ; void * EmailClientApi::NmApiEnvelopeListing::qt_metacast(char const *)
-	?tr@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString EmailClientApi::NmApiEmailService::tr(char const *, char const *, int)
-	??4NmApiEmailAddress@EmailClientApi@@QAEAAV01@ABV01@@Z @ 114 NONAME ; class EmailClientApi::NmApiEmailAddress & EmailClientApi::NmApiEmailAddress::operator=(class EmailClientApi::NmApiEmailAddress const &)
-	?getStaticMetaObject@NmApiEnvelopeListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 115 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEnvelopeListing::getStaticMetaObject(void)
-	?staticMetaObject@NmApiEnvelopeListing@EmailClientApi@@2UQMetaObject@@B @ 116 NONAME ; struct QMetaObject const EmailClientApi::NmApiEnvelopeListing::staticMetaObject
-	?sender@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 117 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::sender(void) const
-	?setFolderType@NmApiFolder@EmailClientApi@@QAEXW4NmApiEmailFolderType@2@@Z @ 118 NONAME ; void EmailClientApi::NmApiFolder::setFolderType(enum EmailClientApi::NmApiEmailFolderType)
-	?getEnvelope@NmApiEmailService@EmailClientApi@@QAE_N_K00AAVNmApiMessageEnvelope@2@@Z @ 119 NONAME ; bool EmailClientApi::NmApiEmailService::getEnvelope(unsigned long long, unsigned long long, unsigned long long, class EmailClientApi::NmApiMessageEnvelope &)
-	?start@NmApiEventNotifier@EmailClientApi@@UAE_NXZ @ 120 NONAME ; bool EmailClientApi::NmApiEventNotifier::start(void)
-	?start@NmApiEnvelopeListing@EmailClientApi@@UAE_NXZ @ 121 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::start(void)
-	?getEnvelopes@NmApiEnvelopeListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiMessageEnvelope@EmailClientApi@@@@@Z @ 122 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::getEnvelopes(class QList<class EmailClientApi::NmApiMessageEnvelope> &)
-	??1NmApiEnvelopeListing@EmailClientApi@@UAE@XZ @ 123 NONAME ; EmailClientApi::NmApiEnvelopeListing::~NmApiEnvelopeListing(void)
-	?setDisplayName@NmApiEmailAddress@EmailClientApi@@QAEXABVQString@@@Z @ 124 NONAME ; void EmailClientApi::NmApiEmailAddress::setDisplayName(class QString const &)
-	?tr@NmApiMessageTask@@SA?AVQString@@PBD0H@Z @ 125 NONAME ; class QString NmApiMessageTask::tr(char const *, char const *, int)
-	??4NmApiMessageEnvelope@EmailClientApi@@QAEAAV01@ABV01@@Z @ 126 NONAME ; class EmailClientApi::NmApiMessageEnvelope & EmailClientApi::NmApiMessageEnvelope::operator=(class EmailClientApi::NmApiMessageEnvelope const &)
-	?initialise@NmApiEmailService@EmailClientApi@@QAEXXZ @ 127 NONAME ; void EmailClientApi::NmApiEmailService::initialise(void)
-	?metaObject@NmApiMailboxListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 128 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMailboxListing::metaObject(void) const
-	?tr@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 129 NONAME ; class QString EmailClientApi::NmApiMailboxListing::tr(char const *, char const *, int)
-	?isReplied@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 130 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isReplied(void) const
-	?setContent@NmApiMessageBody@EmailClientApi@@QAEXABVQString@@@Z @ 131 NONAME ; void EmailClientApi::NmApiMessageBody::setContent(class QString const &)
-	?cancel@NmApiEnvelopeListing@EmailClientApi@@UAEXXZ @ 132 NONAME ; void EmailClientApi::NmApiEnvelopeListing::cancel(void)
-	?getStaticMetaObject@NmApiEventNotifier@EmailClientApi@@SAABUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEventNotifier::getStaticMetaObject(void)
-	??0NmApiMessageEnvelope@EmailClientApi@@QAE@ABV01@@Z @ 134 NONAME ; EmailClientApi::NmApiMessageEnvelope::NmApiMessageEnvelope(class EmailClientApi::NmApiMessageEnvelope const &)
-	?trUtf8@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::trUtf8(char const *, char const *, int)
-	?initialized@NmApiEmailService@EmailClientApi@@IAEX_N@Z @ 136 NONAME ; void EmailClientApi::NmApiEmailService::initialized(bool)
-	?setContentType@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 137 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setContentType(class QString const &)
-	?qt_metacast@NmApiEventNotifier@EmailClientApi@@UAEPAXPBD@Z @ 138 NONAME ; void * EmailClientApi::NmApiEventNotifier::qt_metacast(char const *)
-	?cancel@NmApiEventNotifier@EmailClientApi@@UAEXXZ @ 139 NONAME ; void EmailClientApi::NmApiEventNotifier::cancel(void)
-	?qt_metacall@NmApiEmailService@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 140 NONAME ; int EmailClientApi::NmApiEmailService::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?totalSize@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 141 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::totalSize(void) const
-	?metaObject@NmApiMessageTask@@UBEPBUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const * NmApiMessageTask::metaObject(void) const
-	?qt_metacast@NmApiEmailService@EmailClientApi@@UAEPAXPBD@Z @ 143 NONAME ; void * EmailClientApi::NmApiEmailService::qt_metacast(char const *)
-	?content@NmApiMessageBody@EmailClientApi@@QBE?AVQString@@XZ @ 144 NONAME ; class QString EmailClientApi::NmApiMessageBody::content(void) const
-	?trUtf8@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 145 NONAME ; class QString EmailClientApi::NmApiFolderListing::trUtf8(char const *, char const *)
-	??0NmApiMessageTask@@IAE@PAVQObject@@@Z @ 146 NONAME ; NmApiMessageTask::NmApiMessageTask(class QObject *)
-	?qt_metacall@NmApiFolderListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 147 NONAME ; int EmailClientApi::NmApiFolderListing::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setAddress@NmApiMailbox@EmailClientApi@@QAEXABVQString@@@Z @ 148 NONAME ; void EmailClientApi::NmApiMailbox::setAddress(class QString const &)
-	?trUtf8@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 149 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::trUtf8(char const *, char const *)
-	?tr@NmApiMessageTask@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString NmApiMessageTask::tr(char const *, char const *)
-	?getStaticMetaObject@NmApiMessageTask@@SAABUQMetaObject@@XZ @ 151 NONAME ; struct QMetaObject const & NmApiMessageTask::getStaticMetaObject(void)
-	?address@NmApiEmailAddress@EmailClientApi@@QBE?AVQString@@XZ @ 152 NONAME ; class QString EmailClientApi::NmApiEmailAddress::address(void) const
-	?setAddress@NmApiEmailAddress@EmailClientApi@@QAEXABVQString@@@Z @ 153 NONAME ; void EmailClientApi::NmApiEmailAddress::setAddress(class QString const &)
-	?isForwarded@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 154 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isForwarded(void) const
-	??8NmApiMailbox@EmailClientApi@@QAE_NABV01@@Z @ 155 NONAME ; bool EmailClientApi::NmApiMailbox::operator==(class EmailClientApi::NmApiMailbox const &)
-	?qt_metacast@NmApiMailboxListing@EmailClientApi@@UAEPAXPBD@Z @ 156 NONAME ; void * EmailClientApi::NmApiMailboxListing::qt_metacast(char const *)
-	?mailboxesListed@NmApiMailboxListing@EmailClientApi@@IAEXH@Z @ 157 NONAME ; void EmailClientApi::NmApiMailboxListing::mailboxesListed(int)
-	?setId@NmApiFolder@EmailClientApi@@QAEX_K@Z @ 158 NONAME ; void EmailClientApi::NmApiFolder::setId(unsigned long long)
-	??0NmApiEmailService@EmailClientApi@@QAE@PAVQObject@@@Z @ 159 NONAME ; EmailClientApi::NmApiEmailService::NmApiEmailService(class QObject *)
-	?staticMetaObject@NmApiFolderListing@EmailClientApi@@2UQMetaObject@@B @ 160 NONAME ; struct QMetaObject const EmailClientApi::NmApiFolderListing::staticMetaObject
-	??1NmApiEmailService@EmailClientApi@@UAE@XZ @ 161 NONAME ; EmailClientApi::NmApiEmailService::~NmApiEmailService(void)
-	?trUtf8@NmApiMessageTask@@SA?AVQString@@PBD0H@Z @ 162 NONAME ; class QString NmApiMessageTask::trUtf8(char const *, char const *, int)
-	??_ENmApiEmailService@EmailClientApi@@UAE@I@Z @ 163 NONAME ; EmailClientApi::NmApiEmailService::~NmApiEmailService(unsigned int)
-	?getMailbox@NmApiEmailService@EmailClientApi@@QAE_N_KAAVNmApiMailbox@2@@Z @ 164 NONAME ; bool EmailClientApi::NmApiEmailService::getMailbox(unsigned long long, class EmailClientApi::NmApiMailbox &)
-	?setTotalSize@NmApiMessageBody@EmailClientApi@@QAEX_K@Z @ 165 NONAME ; void EmailClientApi::NmApiMessageBody::setTotalSize(unsigned long long)
-	??0NmApiEmailAddress@EmailClientApi@@QAE@XZ @ 166 NONAME ; EmailClientApi::NmApiEmailAddress::NmApiEmailAddress(void)
-	??8NmApiEmailAddress@EmailClientApi@@QAE_NABV01@@Z @ 167 NONAME ; bool EmailClientApi::NmApiEmailAddress::operator==(class EmailClientApi::NmApiEmailAddress const &)
-	??1NmApiMessageTask@@UAE@XZ @ 168 NONAME ; NmApiMessageTask::~NmApiMessageTask(void)
-	?getCcRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXAAV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 169 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getCcRecipients(class QList<class EmailClientApi::NmApiEmailAddress> &)
-	??8NmApiMessageEnvelope@EmailClientApi@@QAE_NABV01@@Z @ 170 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::operator==(class EmailClientApi::NmApiMessageEnvelope const &)
-	?mailboxEvent@NmApiEventNotifier@EmailClientApi@@IAEXW4NmApiMailboxEvent@2@V?$QList@_K@@@Z @ 171 NONAME ; void EmailClientApi::NmApiEventNotifier::mailboxEvent(enum EmailClientApi::NmApiMailboxEvent, class QList<unsigned long long>)
-	??0NmApiMailbox@EmailClientApi@@QAE@XZ @ 172 NONAME ; EmailClientApi::NmApiMailbox::NmApiMailbox(void)
-	??0NmApiEventNotifier@EmailClientApi@@QAE@PAVQObject@@@Z @ 173 NONAME ; EmailClientApi::NmApiEventNotifier::NmApiEventNotifier(class QObject *)
-	?setId@NmApiMailbox@EmailClientApi@@QAEX_K@Z @ 174 NONAME ; void EmailClientApi::NmApiMailbox::setId(unsigned long long)
-	?cancel@NmApiMailboxListing@EmailClientApi@@UAEXXZ @ 175 NONAME ; void EmailClientApi::NmApiMailboxListing::cancel(void)
-	?getMailboxes@NmApiMailboxListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiMailbox@EmailClientApi@@@@@Z @ 176 NONAME ; bool EmailClientApi::NmApiMailboxListing::getMailboxes(class QList<class EmailClientApi::NmApiMailbox> &)
-	?trUtf8@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0@Z @ 177 NONAME ; class QString EmailClientApi::NmApiEventNotifier::trUtf8(char const *, char const *)
-	??_ENmApiFolderListing@EmailClientApi@@UAE@I@Z @ 178 NONAME ; EmailClientApi::NmApiFolderListing::~NmApiFolderListing(unsigned int)
-	??_ENmApiMessageTask@@UAE@I@Z @ 179 NONAME ; NmApiMessageTask::~NmApiMessageTask(unsigned int)
-	?isRunning@NmApiEnvelopeListing@EmailClientApi@@QBE_NXZ @ 180 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::isRunning(void) const
-	?isRunning@NmApiEventNotifier@EmailClientApi@@QBE_NXZ @ 181 NONAME ; bool EmailClientApi::NmApiEventNotifier::isRunning(void) const
-	?setIsReplied@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 182 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsReplied(bool)
-	?contentType@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 183 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::contentType(void) const
-	?sendEventsFromBuffer@NmApiEventNotifier@EmailClientApi@@QAEXXZ @ 184 NONAME ; void EmailClientApi::NmApiEventNotifier::sendEventsFromBuffer(void)
-	?trUtf8@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 185 NONAME ; class QString EmailClientApi::NmApiMailboxListing::trUtf8(char const *, char const *, int)
-	?setParentFolderId@NmApiFolder@EmailClientApi@@QAEX_K@Z @ 186 NONAME ; void EmailClientApi::NmApiFolder::setParentFolderId(unsigned long long)
-	?start@NmApiFolderListing@EmailClientApi@@UAE_NXZ @ 187 NONAME ; bool EmailClientApi::NmApiFolderListing::start(void)
-	?cancel@NmApiFolderListing@EmailClientApi@@UAEXXZ @ 188 NONAME ; void EmailClientApi::NmApiFolderListing::cancel(void)
-	?metaObject@NmApiMessageManager@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 189 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMessageManager::metaObject(void) const
-	?tr@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 190 NONAME ; class QString EmailClientApi::NmApiMessageManager::tr(char const *, char const *, int)
-	?createReplyMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@_N@Z @ 191 NONAME ; bool EmailClientApi::NmApiMessageManager::createReplyMessage(class QVariant const *, bool)
-	?saveMessage@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 192 NONAME ; bool EmailClientApi::NmApiMessageManager::saveMessage(struct NmApiMessage const &)
-	?messagesCopied@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 193 NONAME ; void EmailClientApi::NmApiMessageManager::messagesCopied(int)
-	??_ENmApiMessageManager@EmailClientApi@@UAE@I@Z @ 194 NONAME ; EmailClientApi::NmApiMessageManager::~NmApiMessageManager(unsigned int)
-	?tr@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 195 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::tr(char const *, char const *, int)
-	?loadSettings@NmApiMailboxSettings@EmailClientApi@@QAE_N_KAAVNmApiMailboxSettingsData@2@@Z @ 196 NONAME ; bool EmailClientApi::NmApiMailboxSettings::loadSettings(unsigned long long, class EmailClientApi::NmApiMailboxSettingsData &)
-	?removeAttachment@NmApiMessageManager@EmailClientApi@@QAE_NAAVNmApiEmailMessage@@_K@Z @ 197 NONAME ; bool EmailClientApi::NmApiMessageManager::removeAttachment(class NmApiEmailMessage &, unsigned long long)
-	?copyMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@_K1@Z @ 198 NONAME ; bool EmailClientApi::NmApiMessageManager::copyMessages(class QList<unsigned long long>, unsigned long long, unsigned long long)
-	??1NmApiMessageManager@EmailClientApi@@UAE@XZ @ 199 NONAME ; EmailClientApi::NmApiMessageManager::~NmApiMessageManager(void)
-	?tr@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0@Z @ 200 NONAME ; class QString EmailClientApi::NmApiMessageManager::tr(char const *, char const *)
-	?listSettings@NmApiMailboxSettingsData@EmailClientApi@@QBE?AV?$QList@H@@XZ @ 201 NONAME ; class QList<int> EmailClientApi::NmApiMailboxSettingsData::listSettings(void) const
-	?trUtf8@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0@Z @ 202 NONAME ; class QString EmailClientApi::NmApiMessageManager::trUtf8(char const *, char const *)
-	?mailboxDeleted@NmApiMailboxSettings@EmailClientApi@@IAEXH@Z @ 203 NONAME ; void EmailClientApi::NmApiMailboxSettings::mailboxDeleted(int)
-	?staticMetaObject@NmApiMailboxSettings@EmailClientApi@@2UQMetaObject@@B @ 204 NONAME ; struct QMetaObject const EmailClientApi::NmApiMailboxSettings::staticMetaObject
-	?messagesDeleted@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 205 NONAME ; void EmailClientApi::NmApiMessageManager::messagesDeleted(int)
-	??0NmApiMailboxSettingsData@EmailClientApi@@QAE@XZ @ 206 NONAME ; EmailClientApi::NmApiMailboxSettingsData::NmApiMailboxSettingsData(void)
-	?trUtf8@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 207 NONAME ; class QString EmailClientApi::NmApiMessageManager::trUtf8(char const *, char const *, int)
-	?metaObject@NmApiMailboxSettings@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 208 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMailboxSettings::metaObject(void) const
-	?messagesMoved@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 209 NONAME ; void EmailClientApi::NmApiMessageManager::messagesMoved(int)
-	?saveSettings@NmApiMailboxSettings@EmailClientApi@@QAE_NABVNmApiMailboxSettingsData@2@@Z @ 210 NONAME ; bool EmailClientApi::NmApiMailboxSettings::saveSettings(class EmailClientApi::NmApiMailboxSettingsData const &)
-	?fetch@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 211 NONAME ; bool EmailClientApi::NmApiMessageManager::fetch(struct NmApiMessage const &)
-	?createMailbox@NmApiMailboxSettings@EmailClientApi@@QAE_NABVQString@@AAVNmApiMailboxSettingsData@2@@Z @ 212 NONAME ; bool EmailClientApi::NmApiMailboxSettings::createMailbox(class QString const &, class EmailClientApi::NmApiMailboxSettingsData &)
-	?qt_metacast@NmApiMessageManager@EmailClientApi@@UAEPAXPBD@Z @ 213 NONAME ; void * EmailClientApi::NmApiMessageManager::qt_metacast(char const *)
-	??0NmApiMessageManager@EmailClientApi@@QAE@_KPAVQObject@@@Z @ 214 NONAME ; EmailClientApi::NmApiMessageManager::NmApiMessageManager(unsigned long long, class QObject *)
-	?getValue@NmApiMailboxSettingsData@EmailClientApi@@QBE_NHAAVQVariant@@@Z @ 215 NONAME ; bool EmailClientApi::NmApiMailboxSettingsData::getValue(int, class QVariant &) const
-	?tr@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0@Z @ 216 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::tr(char const *, char const *)
-	?moveMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@_K1@Z @ 217 NONAME ; bool EmailClientApi::NmApiMessageManager::moveMessages(class QList<unsigned long long>, unsigned long long, unsigned long long)
-	??1NmApiMailboxSettingsData@EmailClientApi@@QAE@XZ @ 218 NONAME ; EmailClientApi::NmApiMailboxSettingsData::~NmApiMailboxSettingsData(void)
-	?validateData@NmApiMailboxSettingsData@EmailClientApi@@QBE_NXZ @ 219 NONAME ; bool EmailClientApi::NmApiMailboxSettingsData::validateData(void) const
-	?trUtf8@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 220 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::trUtf8(char const *, char const *, int)
-	?createForwardMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@@Z @ 221 NONAME ; bool EmailClientApi::NmApiMessageManager::createForwardMessage(class QVariant const *)
-	?listMailboxIds@NmApiMailboxSettings@EmailClientApi@@QAE_NAAV?$QList@_K@@@Z @ 222 NONAME ; bool EmailClientApi::NmApiMailboxSettings::listMailboxIds(class QList<unsigned long long> &)
-	??_ENmApiMailboxSettings@EmailClientApi@@UAE@I@Z @ 223 NONAME ; EmailClientApi::NmApiMailboxSettings::~NmApiMailboxSettings(unsigned int)
-	?getStaticMetaObject@NmApiMailboxSettings@EmailClientApi@@SAABUQMetaObject@@XZ @ 224 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMailboxSettings::getStaticMetaObject(void)
-	?deleteMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@@Z @ 225 NONAME ; bool EmailClientApi::NmApiMessageManager::deleteMessages(class QList<unsigned long long>)
-	?createDraftMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@@Z @ 226 NONAME ; bool EmailClientApi::NmApiMessageManager::createDraftMessage(class QVariant const *)
-	??0NmApiMailboxSettings@EmailClientApi@@QAE@PAVQObject@@@Z @ 227 NONAME ; EmailClientApi::NmApiMailboxSettings::NmApiMailboxSettings(class QObject *)
-	?qt_metacast@NmApiMailboxSettings@EmailClientApi@@UAEPAXPBD@Z @ 228 NONAME ; void * EmailClientApi::NmApiMailboxSettings::qt_metacast(char const *)
-	?qt_metacall@NmApiMessageManager@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 229 NONAME ; int EmailClientApi::NmApiMessageManager::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1NmApiMailboxSettings@EmailClientApi@@UAE@XZ @ 230 NONAME ; EmailClientApi::NmApiMailboxSettings::~NmApiMailboxSettings(void)
-	?deleteMailbox@NmApiMailboxSettings@EmailClientApi@@QAE_N_K@Z @ 231 NONAME ; bool EmailClientApi::NmApiMailboxSettings::deleteMailbox(unsigned long long)
-	?send@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 232 NONAME ; bool EmailClientApi::NmApiMessageManager::send(struct NmApiMessage const &)
-	?trUtf8@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0@Z @ 233 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::trUtf8(char const *, char const *)
-	?createAttachment@NmApiMessageManager@EmailClientApi@@QAE_NAAVNmApiEmailMessage@@ABVQVariant@@@Z @ 234 NONAME ; bool EmailClientApi::NmApiMessageManager::createAttachment(class NmApiEmailMessage &, class QVariant const &)
-	?messagesCreated@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 235 NONAME ; void EmailClientApi::NmApiMessageManager::messagesCreated(int)
-	?setMailboxId@NmApiMailboxSettingsData@EmailClientApi@@QAEX_K@Z @ 236 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::setMailboxId(unsigned long long)
-	?populateDefaultSettings@NmApiMailboxSettings@EmailClientApi@@QAE_NABVQString@@AAVNmApiMailboxSettingsData@2@@Z @ 237 NONAME ; bool EmailClientApi::NmApiMailboxSettings::populateDefaultSettings(class QString const &, class EmailClientApi::NmApiMailboxSettingsData &)
-	?clearSettings@NmApiMailboxSettingsData@EmailClientApi@@QAEXXZ @ 238 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::clearSettings(void)
-	?setValue@NmApiMailboxSettingsData@EmailClientApi@@QAEXHABVQVariant@@@Z @ 239 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::setValue(int, class QVariant const &)
-	?mailboxId@NmApiMailboxSettingsData@EmailClientApi@@QBE_KXZ @ 240 NONAME ; unsigned long long EmailClientApi::NmApiMailboxSettingsData::mailboxId(void) const
-	?getStaticMetaObject@NmApiMessageManager@EmailClientApi@@SAABUQMetaObject@@XZ @ 241 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMessageManager::getStaticMetaObject(void)
-	?staticMetaObject@NmApiMessageManager@EmailClientApi@@2UQMetaObject@@B @ 242 NONAME ; struct QMetaObject const EmailClientApi::NmApiMessageManager::staticMetaObject
-	?qt_metacall@NmApiMailboxSettings@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 243 NONAME ; int EmailClientApi::NmApiMailboxSettings::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0NmApiSettingsManager@EmailClientApi@@QAE@_K@Z @ 244 NONAME ; EmailClientApi::NmApiSettingsManager::NmApiSettingsManager(unsigned long long)
-	?save@NmApiSettingsManager@EmailClientApi@@QAE_NABVNmApiMailboxSettingsData@2@@Z @ 245 NONAME ; bool EmailClientApi::NmApiSettingsManager::save(class EmailClientApi::NmApiMailboxSettingsData const &)
-	?load@NmApiSettingsManager@EmailClientApi@@QAE_N_KAAVNmApiMailboxSettingsData@2@@Z @ 246 NONAME ; bool EmailClientApi::NmApiSettingsManager::load(unsigned long long, class EmailClientApi::NmApiMailboxSettingsData &)
-	??1NmApiSettingsManager@EmailClientApi@@QAE@XZ @ 247 NONAME ; EmailClientApi::NmApiSettingsManager::~NmApiSettingsManager(void)
+	?metaObject@NmApiMessageManager@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMessageManager::metaObject(void) const
+	??4NmApiMessageBody@EmailClientApi@@QAEAAV01@ABV01@@Z @ 4 NONAME ; class EmailClientApi::NmApiMessageBody & EmailClientApi::NmApiMessageBody::operator=(class EmailClientApi::NmApiMessageBody const &)
+	?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)
+	?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 &)
+	?messagesCopied@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 12 NONAME ; void EmailClientApi::NmApiMessageManager::messagesCopied(int)
+	?id@NmApiFolder@EmailClientApi@@QBE_KXZ @ 13 NONAME ; unsigned long long EmailClientApi::NmApiFolder::id(void) const
+	?foldersListed@NmApiFolderListing@EmailClientApi@@IAEXH@Z @ 14 NONAME ; void EmailClientApi::NmApiFolderListing::foldersListed(int)
+	??8NmApiFolder@EmailClientApi@@QAE_NABV01@@Z @ 15 NONAME ; bool EmailClientApi::NmApiFolder::operator==(class EmailClientApi::NmApiFolder const &)
+	??_ENmApiMessageManager@EmailClientApi@@UAE@I@Z @ 16 NONAME ; EmailClientApi::NmApiMessageManager::~NmApiMessageManager(unsigned int)
+	??0NmApiFolder@EmailClientApi@@QAE@ABV01@@Z @ 17 NONAME ; EmailClientApi::NmApiFolder::NmApiFolder(class EmailClientApi::NmApiFolder const &)
+	??0NmApiMailboxListing@EmailClientApi@@QAE@PAVQObject@@@Z @ 18 NONAME ; EmailClientApi::NmApiMailboxListing::NmApiMailboxListing(class QObject *)
+	?subject@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 19 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::subject(void) const
+	?tr@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 20 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::tr(char const *, char const *, int)
+	?setIsRead@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 21 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsRead(bool)
+	?qt_metacall@NmApiEnvelopeListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 22 NONAME ; int EmailClientApi::NmApiEnvelopeListing::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?metaObject@NmApiFolderListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 23 NONAME ; struct QMetaObject const * EmailClientApi::NmApiFolderListing::metaObject(void) const
+	?loadSettings@NmApiMailboxSettings@EmailClientApi@@QAE_N_KAAVNmApiMailboxSettingsData@2@@Z @ 24 NONAME ; bool EmailClientApi::NmApiMailboxSettings::loadSettings(unsigned long long, class EmailClientApi::NmApiMailboxSettingsData &)
+	?fetchedSize@NmApiMessageBody@EmailClientApi@@QBE_KXZ @ 25 NONAME ; unsigned long long EmailClientApi::NmApiMessageBody::fetchedSize(void) const
+	?setChildFolderIds@NmApiFolder@EmailClientApi@@QAEXAAV?$QList@_K@@@Z @ 26 NONAME ; void EmailClientApi::NmApiFolder::setChildFolderIds(class QList<unsigned long long> &)
+	??0NmApiMessageEnvelope@EmailClientApi@@QAE@XZ @ 27 NONAME ; EmailClientApi::NmApiMessageEnvelope::NmApiMessageEnvelope(void)
+	?removeAttachment@NmApiMessageManager@EmailClientApi@@QAE_NAAVNmApiEmailMessage@@_K@Z @ 28 NONAME ; bool EmailClientApi::NmApiMessageManager::removeAttachment(class NmApiEmailMessage &, unsigned long long)
+	??1NmApiMessageEnvelope@EmailClientApi@@UAE@XZ @ 29 NONAME ; EmailClientApi::NmApiMessageEnvelope::~NmApiMessageEnvelope(void)
+	?copyMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@_K1@Z @ 30 NONAME ; bool EmailClientApi::NmApiMessageManager::copyMessages(class QList<unsigned long long>, unsigned long long, unsigned long long)
+	??4NmApiMailbox@EmailClientApi@@QAEAAV01@ABV01@@Z @ 31 NONAME ; class EmailClientApi::NmApiMailbox & EmailClientApi::NmApiMailbox::operator=(class EmailClientApi::NmApiMailbox const &)
+	??1NmApiMessageManager@EmailClientApi@@UAE@XZ @ 32 NONAME ; EmailClientApi::NmApiMessageManager::~NmApiMessageManager(void)
+	?setSentTime@NmApiMessageEnvelope@EmailClientApi@@QAEXVQDateTime@@@Z @ 33 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSentTime(class QDateTime)
+	?setFetchedSize@NmApiMessageBody@EmailClientApi@@QAEX_K@Z @ 34 NONAME ; void EmailClientApi::NmApiMessageBody::setFetchedSize(unsigned long long)
+	?name@NmApiFolder@EmailClientApi@@QBE?AVQString@@XZ @ 35 NONAME ; class QString EmailClientApi::NmApiFolder::name(void) const
+	?load@NmApiSettingsManager@EmailClientApi@@QAE_N_KAAVNmApiMailboxSettingsData@2@@Z @ 36 NONAME ; bool EmailClientApi::NmApiSettingsManager::load(unsigned long long, class EmailClientApi::NmApiMailboxSettingsData &)
+	??1NmApiEmailAddress@EmailClientApi@@UAE@XZ @ 37 NONAME ; EmailClientApi::NmApiEmailAddress::~NmApiEmailAddress(void)
+	?setIsForwarded@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 38 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsForwarded(bool)
+	?qt_metacast@NmApiMessageTask@@UAEPAXPBD@Z @ 39 NONAME ; void * NmApiMessageTask::qt_metacast(char const *)
+	?staticMetaObject@NmApiMailboxListing@EmailClientApi@@2UQMetaObject@@B @ 40 NONAME ; struct QMetaObject const EmailClientApi::NmApiMailboxListing::staticMetaObject
+	?address@NmApiMailbox@EmailClientApi@@QBE?AVQString@@XZ @ 41 NONAME ; class QString EmailClientApi::NmApiMailbox::address(void) const
+	??0NmApiMessageBody@EmailClientApi@@QAE@XZ @ 42 NONAME ; EmailClientApi::NmApiMessageBody::NmApiMessageBody(void)
+	?metaObject@NmApiEventNotifier@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 43 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEventNotifier::metaObject(void) const
+	?tr@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 44 NONAME ; class QString EmailClientApi::NmApiFolderListing::tr(char const *, char const *)
+	?tr@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0@Z @ 45 NONAME ; class QString EmailClientApi::NmApiMessageManager::tr(char const *, char const *)
+	?metaObject@NmApiEmailService@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 46 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEmailService::metaObject(void) const
+	?listSettings@NmApiMailboxSettingsData@EmailClientApi@@QBE?AV?$QList@H@@XZ @ 47 NONAME ; class QList<int> EmailClientApi::NmApiMailboxSettingsData::listSettings(void) const
+	?parentFolder@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 48 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::parentFolder(void) const
+	?trUtf8@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString EmailClientApi::NmApiMessageManager::trUtf8(char const *, char const *)
+	?mailboxDeleted@NmApiMailboxSettings@EmailClientApi@@IAEXH@Z @ 50 NONAME ; void EmailClientApi::NmApiMailboxSettings::mailboxDeleted(int)
+	??_ENmApiMessageBody@EmailClientApi@@UAE@I@Z @ 51 NONAME ; EmailClientApi::NmApiMessageBody::~NmApiMessageBody(unsigned int)
+	?staticMetaObject@NmApiMailboxSettings@EmailClientApi@@2UQMetaObject@@B @ 52 NONAME ; struct QMetaObject const EmailClientApi::NmApiMailboxSettings::staticMetaObject
+	?messagesDeleted@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 53 NONAME ; void EmailClientApi::NmApiMessageManager::messagesDeleted(int)
+	?qt_metacall@NmApiMailboxListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 54 NONAME ; int EmailClientApi::NmApiMailboxListing::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_ENmApiMailbox@EmailClientApi@@UAE@I@Z @ 55 NONAME ; EmailClientApi::NmApiMailbox::~NmApiMailbox(unsigned int)
+	?setId@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 56 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setId(unsigned long long)
+	?trUtf8@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 57 NONAME ; class QString EmailClientApi::NmApiEmailService::trUtf8(char const *, char const *, int)
+	?getStaticMetaObject@NmApiMailboxListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMailboxListing::getStaticMetaObject(void)
+	?setName@NmApiFolder@EmailClientApi@@QAEXABVQString@@@Z @ 59 NONAME ; void EmailClientApi::NmApiFolder::setName(class QString const &)
+	?isRunning@NmApiMailboxListing@EmailClientApi@@QBE_NXZ @ 60 NONAME ; bool EmailClientApi::NmApiMailboxListing::isRunning(void) const
+	??0NmApiMailboxSettingsData@EmailClientApi@@QAE@XZ @ 61 NONAME ; EmailClientApi::NmApiMailboxSettingsData::NmApiMailboxSettingsData(void)
+	?setName@NmApiMailbox@EmailClientApi@@QAEXABVQString@@@Z @ 62 NONAME ; void EmailClientApi::NmApiMailbox::setName(class QString const &)
+	?tr@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 63 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::tr(char const *, char const *, int)
+	?trUtf8@NmApiMessageManager@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString EmailClientApi::NmApiMessageManager::trUtf8(char const *, char const *, int)
+	?isRunning@NmApiFolderListing@EmailClientApi@@QBE_NXZ @ 65 NONAME ; bool EmailClientApi::NmApiFolderListing::isRunning(void) const
+	?metaObject@NmApiMailboxSettings@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 66 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMailboxSettings::metaObject(void) const
+	?messagesMoved@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 67 NONAME ; void EmailClientApi::NmApiMessageManager::messagesMoved(int)
+	?staticMetaObject@NmApiEventNotifier@EmailClientApi@@2UQMetaObject@@B @ 68 NONAME ; struct QMetaObject const EmailClientApi::NmApiEventNotifier::staticMetaObject
+	?tr@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 69 NONAME ; class QString EmailClientApi::NmApiFolderListing::tr(char const *, char const *, int)
+	?trUtf8@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 70 NONAME ; class QString EmailClientApi::NmApiFolderListing::trUtf8(char const *, char const *, int)
+	?envelopesListed@NmApiEnvelopeListing@EmailClientApi@@IAEXH@Z @ 71 NONAME ; void EmailClientApi::NmApiEnvelopeListing::envelopesListed(int)
+	?fetchedSize@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 72 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::fetchedSize(void) const
+	?tr@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString EmailClientApi::NmApiEventNotifier::tr(char const *, char const *)
+	?sentTime@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQDateTime@@XZ @ 74 NONAME ; class QDateTime EmailClientApi::NmApiMessageEnvelope::sentTime(void) const
+	?saveSettings@NmApiMailboxSettings@EmailClientApi@@QAE_NABVNmApiMailboxSettingsData@2@@Z @ 75 NONAME ; bool EmailClientApi::NmApiMailboxSettings::saveSettings(class EmailClientApi::NmApiMailboxSettingsData const &)
+	?fetch@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 76 NONAME ; bool EmailClientApi::NmApiMessageManager::fetch(struct NmApiMessage const &)
+	?setSubject@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 77 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSubject(class QString const &)
+	?folderType@NmApiFolder@EmailClientApi@@QBE?AW4NmApiEmailFolderType@2@XZ @ 78 NONAME ; enum EmailClientApi::NmApiEmailFolderType EmailClientApi::NmApiFolder::folderType(void) const
+	?setToRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXABV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 79 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setToRecipients(class QList<class EmailClientApi::NmApiEmailAddress> const &)
+	?createMailbox@NmApiMailboxSettings@EmailClientApi@@QAE_NABVQString@@AAVNmApiMailboxSettingsData@2@@Z @ 80 NONAME ; bool EmailClientApi::NmApiMailboxSettings::createMailbox(class QString const &, class EmailClientApi::NmApiMailboxSettingsData &)
+	?qt_metacast@NmApiMessageManager@EmailClientApi@@UAEPAXPBD@Z @ 81 NONAME ; void * EmailClientApi::NmApiMessageManager::qt_metacast(char const *)
+	??1NmApiEventNotifier@EmailClientApi@@UAE@XZ @ 82 NONAME ; EmailClientApi::NmApiEventNotifier::~NmApiEventNotifier(void)
+	?isRead@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 83 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isRead(void) const
+	?failed@NmApiMessageTask@@IAEXH@Z @ 84 NONAME ; void NmApiMessageTask::failed(int)
+	?qt_metacast@NmApiFolderListing@EmailClientApi@@UAEPAXPBD@Z @ 85 NONAME ; void * EmailClientApi::NmApiFolderListing::qt_metacast(char const *)
+	?messageEvent@NmApiEventNotifier@EmailClientApi@@IAEXW4NmApiMessageEvent@2@_K1V?$QList@_K@@@Z @ 86 NONAME ; void EmailClientApi::NmApiEventNotifier::messageEvent(enum EmailClientApi::NmApiMessageEvent, unsigned long long, unsigned long long, class QList<unsigned long long>)
+	?setTotalSize@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 87 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setTotalSize(unsigned long long)
+	??0NmApiMessageManager@EmailClientApi@@QAE@_KPAVQObject@@@Z @ 88 NONAME ; EmailClientApi::NmApiMessageManager::NmApiMessageManager(unsigned long long, class QObject *)
+	?qt_metacall@NmApiMessageTask@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 89 NONAME ; int NmApiMessageTask::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1NmApiMailbox@EmailClientApi@@UAE@XZ @ 90 NONAME ; EmailClientApi::NmApiMailbox::~NmApiMailbox(void)
+	?getValue@NmApiMailboxSettingsData@EmailClientApi@@QBE_NHAAVQVariant@@@Z @ 91 NONAME ; bool EmailClientApi::NmApiMailboxSettingsData::getValue(int, class QVariant &) const
+	?tr@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString EmailClientApi::NmApiEventNotifier::tr(char const *, char const *, int)
+	??8NmApiMessageBody@EmailClientApi@@QAE_NABV01@@Z @ 93 NONAME ; bool EmailClientApi::NmApiMessageBody::operator==(class EmailClientApi::NmApiMessageBody const &)
+	?start@NmApiMailboxListing@EmailClientApi@@UAE_NXZ @ 94 NONAME ; bool EmailClientApi::NmApiMailboxListing::start(void)
+	??_ENmApiEnvelopeListing@EmailClientApi@@UAE@I@Z @ 95 NONAME ; EmailClientApi::NmApiEnvelopeListing::~NmApiEnvelopeListing(unsigned int)
+	?uninitialise@NmApiEmailService@EmailClientApi@@QAEXXZ @ 96 NONAME ; void EmailClientApi::NmApiEmailService::uninitialise(void)
+	?trUtf8@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 97 NONAME ; class QString EmailClientApi::NmApiEventNotifier::trUtf8(char const *, char const *, int)
+	??0NmApiMessageBody@EmailClientApi@@QAE@ABV01@@Z @ 98 NONAME ; EmailClientApi::NmApiMessageBody::NmApiMessageBody(class EmailClientApi::NmApiMessageBody const &)
+	?tr@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0@Z @ 99 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::tr(char const *, char const *)
+	??1NmApiMessageBody@EmailClientApi@@UAE@XZ @ 100 NONAME ; EmailClientApi::NmApiMessageBody::~NmApiMessageBody(void)
+	?hasAttachments@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 101 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::hasAttachments(void) const
+	?setSender@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 102 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setSender(class QString const &)
+	??_ENmApiMailboxListing@EmailClientApi@@UAE@I@Z @ 103 NONAME ; EmailClientApi::NmApiMailboxListing::~NmApiMailboxListing(unsigned int)
+	?moveMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@_K1@Z @ 104 NONAME ; bool EmailClientApi::NmApiMessageManager::moveMessages(class QList<unsigned long long>, unsigned long long, unsigned long long)
+	?trUtf8@NmApiMessageTask@@SA?AVQString@@PBD0@Z @ 105 NONAME ; class QString NmApiMessageTask::trUtf8(char const *, char const *)
+	?staticMetaObject@NmApiMessageTask@@2UQMetaObject@@B @ 106 NONAME ; struct QMetaObject const NmApiMessageTask::staticMetaObject
+	??1NmApiMailboxSettingsData@EmailClientApi@@QAE@XZ @ 107 NONAME ; EmailClientApi::NmApiMailboxSettingsData::~NmApiMailboxSettingsData(void)
+	?validateData@NmApiMailboxSettingsData@EmailClientApi@@QBE_NXZ @ 108 NONAME ; bool EmailClientApi::NmApiMailboxSettingsData::validateData(void) const
+	?getChildFolderIds@NmApiFolder@EmailClientApi@@QAEXAAV?$QList@_K@@@Z @ 109 NONAME ; void EmailClientApi::NmApiFolder::getChildFolderIds(class QList<unsigned long long> &)
+	?parentFolderId@NmApiFolder@EmailClientApi@@QBE_KXZ @ 110 NONAME ; unsigned long long EmailClientApi::NmApiFolder::parentFolderId(void) const
+	??_ENmApiEmailAddress@EmailClientApi@@UAE@I@Z @ 111 NONAME ; EmailClientApi::NmApiEmailAddress::~NmApiEmailAddress(unsigned int)
+	??0NmApiFolder@EmailClientApi@@QAE@XZ @ 112 NONAME ; EmailClientApi::NmApiFolder::NmApiFolder(void)
+	?tr@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 113 NONAME ; class QString EmailClientApi::NmApiMailboxListing::tr(char const *, char const *)
+	?tr@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString EmailClientApi::NmApiEmailService::tr(char const *, char const *)
+	?plainText@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 115 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::plainText(void) const
+	?getFolders@NmApiFolderListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiFolder@EmailClientApi@@@@@Z @ 116 NONAME ; bool EmailClientApi::NmApiFolderListing::getFolders(class QList<class EmailClientApi::NmApiFolder> &)
+	?getStaticMetaObject@NmApiEmailService@EmailClientApi@@SAABUQMetaObject@@XZ @ 117 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEmailService::getStaticMetaObject(void)
+	?metaObject@NmApiEnvelopeListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 118 NONAME ; struct QMetaObject const * EmailClientApi::NmApiEnvelopeListing::metaObject(void) const
+	?trUtf8@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 119 NONAME ; class QString EmailClientApi::NmApiMailboxListing::trUtf8(char const *, char const *)
+	?tr@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 120 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::tr(char const *, char const *)
+	?canceled@NmApiMessageTask@@IAEXXZ @ 121 NONAME ; void NmApiMessageTask::canceled(void)
+	?trUtf8@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 122 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::trUtf8(char const *, char const *, int)
+	?setHasAttachments@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 123 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setHasAttachments(bool)
+	??_ENmApiMessageEnvelope@EmailClientApi@@UAE@I@Z @ 124 NONAME ; EmailClientApi::NmApiMessageEnvelope::~NmApiMessageEnvelope(unsigned int)
+	?createForwardMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@@Z @ 125 NONAME ; bool EmailClientApi::NmApiMessageManager::createForwardMessage(class QVariant const *)
+	?displayName@NmApiEmailAddress@EmailClientApi@@QBE?AVQString@@XZ @ 126 NONAME ; class QString EmailClientApi::NmApiEmailAddress::displayName(void) const
+	?listMailboxIds@NmApiMailboxSettings@EmailClientApi@@QAE_NAAV?$QList@_K@@@Z @ 127 NONAME ; bool EmailClientApi::NmApiMailboxSettings::listMailboxIds(class QList<unsigned long long> &)
+	??_ENmApiMailboxSettings@EmailClientApi@@UAE@I@Z @ 128 NONAME ; EmailClientApi::NmApiMailboxSettings::~NmApiMailboxSettings(unsigned int)
+	?getStaticMetaObject@NmApiMailboxSettings@EmailClientApi@@SAABUQMetaObject@@XZ @ 129 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMailboxSettings::getStaticMetaObject(void)
+	??0NmApiFolderListing@EmailClientApi@@QAE@PAVQObject@@AB_K@Z @ 130 NONAME ; EmailClientApi::NmApiFolderListing::NmApiFolderListing(class QObject *, unsigned long long const &)
+	??_ENmApiFolder@EmailClientApi@@UAE@I@Z @ 131 NONAME ; EmailClientApi::NmApiFolder::~NmApiFolder(unsigned int)
+	?name@NmApiMailbox@EmailClientApi@@QBE?AVQString@@XZ @ 132 NONAME ; class QString EmailClientApi::NmApiMailbox::name(void) const
+	?getStaticMetaObject@NmApiFolderListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const & EmailClientApi::NmApiFolderListing::getStaticMetaObject(void)
+	?deleteMessages@NmApiMessageManager@EmailClientApi@@QAE_NV?$QList@_K@@@Z @ 134 NONAME ; bool EmailClientApi::NmApiMessageManager::deleteMessages(class QList<unsigned long long>)
+	?trUtf8@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0@Z @ 135 NONAME ; class QString EmailClientApi::NmApiEmailService::trUtf8(char const *, char const *)
+	?createDraftMessage@NmApiMessageManager@EmailClientApi@@QAE_NPBVQVariant@@@Z @ 136 NONAME ; bool EmailClientApi::NmApiMessageManager::createDraftMessage(class QVariant const *)
+	??1NmApiMailboxListing@EmailClientApi@@UAE@XZ @ 137 NONAME ; EmailClientApi::NmApiMailboxListing::~NmApiMailboxListing(void)
+	??0NmApiMailboxSettings@EmailClientApi@@QAE@PAVQObject@@@Z @ 138 NONAME ; EmailClientApi::NmApiMailboxSettings::NmApiMailboxSettings(class QObject *)
+	??1NmApiFolder@EmailClientApi@@UAE@XZ @ 139 NONAME ; EmailClientApi::NmApiFolder::~NmApiFolder(void)
+	??0NmApiMailbox@EmailClientApi@@QAE@ABV01@@Z @ 140 NONAME ; EmailClientApi::NmApiMailbox::NmApiMailbox(class EmailClientApi::NmApiMailbox const &)
+	?setCcRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXABV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 141 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setCcRecipients(class QList<class EmailClientApi::NmApiEmailAddress> const &)
+	??_ENmApiEventNotifier@EmailClientApi@@UAE@I@Z @ 142 NONAME ; EmailClientApi::NmApiEventNotifier::~NmApiEventNotifier(unsigned int)
+	?staticMetaObject@NmApiEmailService@EmailClientApi@@2UQMetaObject@@B @ 143 NONAME ; struct QMetaObject const EmailClientApi::NmApiEmailService::staticMetaObject
+	?qt_metacast@NmApiMailboxSettings@EmailClientApi@@UAEPAXPBD@Z @ 144 NONAME ; void * EmailClientApi::NmApiMailboxSettings::qt_metacast(char const *)
+	??1NmApiFolderListing@EmailClientApi@@UAE@XZ @ 145 NONAME ; EmailClientApi::NmApiFolderListing::~NmApiFolderListing(void)
+	?getPlainTextBody@NmApiMessageEnvelope@EmailClientApi@@QAEXAAVNmApiMessageBody@2@@Z @ 146 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getPlainTextBody(class EmailClientApi::NmApiMessageBody &)
+	?setFetchedSize@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 147 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setFetchedSize(unsigned long long)
+	?id@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 148 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::id(void) const
+	??0NmApiEnvelopeListing@EmailClientApi@@QAE@PAVQObject@@_K1@Z @ 149 NONAME ; EmailClientApi::NmApiEnvelopeListing::NmApiEnvelopeListing(class QObject *, unsigned long long, unsigned long long)
+	??0NmApiEmailAddress@EmailClientApi@@QAE@ABV01@@Z @ 150 NONAME ; EmailClientApi::NmApiEmailAddress::NmApiEmailAddress(class EmailClientApi::NmApiEmailAddress const &)
+	?getToRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXAAV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 151 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getToRecipients(class QList<class EmailClientApi::NmApiEmailAddress> &)
+	?setParentFolder@NmApiMessageEnvelope@EmailClientApi@@QAEX_K@Z @ 152 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setParentFolder(unsigned long long)
+	?qt_metacast@NmApiEnvelopeListing@EmailClientApi@@UAEPAXPBD@Z @ 153 NONAME ; void * EmailClientApi::NmApiEnvelopeListing::qt_metacast(char const *)
+	??4NmApiFolder@EmailClientApi@@QAEAAV01@ABV01@@Z @ 154 NONAME ; class EmailClientApi::NmApiFolder & EmailClientApi::NmApiFolder::operator=(class EmailClientApi::NmApiFolder const &)
+	?tr@NmApiEmailService@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 155 NONAME ; class QString EmailClientApi::NmApiEmailService::tr(char const *, char const *, int)
+	??4NmApiEmailAddress@EmailClientApi@@QAEAAV01@ABV01@@Z @ 156 NONAME ; class EmailClientApi::NmApiEmailAddress & EmailClientApi::NmApiEmailAddress::operator=(class EmailClientApi::NmApiEmailAddress const &)
+	?getStaticMetaObject@NmApiEnvelopeListing@EmailClientApi@@SAABUQMetaObject@@XZ @ 157 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEnvelopeListing::getStaticMetaObject(void)
+	?staticMetaObject@NmApiEnvelopeListing@EmailClientApi@@2UQMetaObject@@B @ 158 NONAME ; struct QMetaObject const EmailClientApi::NmApiEnvelopeListing::staticMetaObject
+	?setFolderType@NmApiFolder@EmailClientApi@@QAEXW4NmApiEmailFolderType@2@@Z @ 159 NONAME ; void EmailClientApi::NmApiFolder::setFolderType(enum EmailClientApi::NmApiEmailFolderType)
+	?sender@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 160 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::sender(void) const
+	?getEnvelope@NmApiEmailService@EmailClientApi@@QAE_N_K00AAVNmApiMessageEnvelope@2@@Z @ 161 NONAME ; bool EmailClientApi::NmApiEmailService::getEnvelope(unsigned long long, unsigned long long, unsigned long long, class EmailClientApi::NmApiMessageEnvelope &)
+	?start@NmApiEventNotifier@EmailClientApi@@UAE_NXZ @ 162 NONAME ; bool EmailClientApi::NmApiEventNotifier::start(void)
+	?start@NmApiEnvelopeListing@EmailClientApi@@UAE_NXZ @ 163 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::start(void)
+	?qt_metacall@NmApiMessageManager@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 164 NONAME ; int EmailClientApi::NmApiMessageManager::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?getEnvelopes@NmApiEnvelopeListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiMessageEnvelope@EmailClientApi@@@@@Z @ 165 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::getEnvelopes(class QList<class EmailClientApi::NmApiMessageEnvelope> &)
+	??1NmApiEnvelopeListing@EmailClientApi@@UAE@XZ @ 166 NONAME ; EmailClientApi::NmApiEnvelopeListing::~NmApiEnvelopeListing(void)
+	?setDisplayName@NmApiEmailAddress@EmailClientApi@@QAEXABVQString@@@Z @ 167 NONAME ; void EmailClientApi::NmApiEmailAddress::setDisplayName(class QString const &)
+	??1NmApiMailboxSettings@EmailClientApi@@UAE@XZ @ 168 NONAME ; EmailClientApi::NmApiMailboxSettings::~NmApiMailboxSettings(void)
+	?deleteMailbox@NmApiMailboxSettings@EmailClientApi@@QAE_N_K@Z @ 169 NONAME ; bool EmailClientApi::NmApiMailboxSettings::deleteMailbox(unsigned long long)
+	?tr@NmApiMessageTask@@SA?AVQString@@PBD0H@Z @ 170 NONAME ; class QString NmApiMessageTask::tr(char const *, char const *, int)
+	?metaObject@NmApiMailboxListing@EmailClientApi@@UBEPBUQMetaObject@@XZ @ 171 NONAME ; struct QMetaObject const * EmailClientApi::NmApiMailboxListing::metaObject(void) const
+	??4NmApiMessageEnvelope@EmailClientApi@@QAEAAV01@ABV01@@Z @ 172 NONAME ; class EmailClientApi::NmApiMessageEnvelope & EmailClientApi::NmApiMessageEnvelope::operator=(class EmailClientApi::NmApiMessageEnvelope const &)
+	?initialise@NmApiEmailService@EmailClientApi@@QAEXXZ @ 173 NONAME ; void EmailClientApi::NmApiEmailService::initialise(void)
+	?tr@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 174 NONAME ; class QString EmailClientApi::NmApiMailboxListing::tr(char const *, char const *, int)
+	?send@NmApiMessageManager@EmailClientApi@@QAE_NABUNmApiMessage@@@Z @ 175 NONAME ; bool EmailClientApi::NmApiMessageManager::send(struct NmApiMessage const &)
+	?trUtf8@NmApiMailboxSettings@EmailClientApi@@SA?AVQString@@PBD0@Z @ 176 NONAME ; class QString EmailClientApi::NmApiMailboxSettings::trUtf8(char const *, char const *)
+	?setContent@NmApiMessageBody@EmailClientApi@@QAEXABVQString@@@Z @ 177 NONAME ; void EmailClientApi::NmApiMessageBody::setContent(class QString const &)
+	?createAttachment@NmApiMessageManager@EmailClientApi@@QAE_NAAVNmApiEmailMessage@@ABVQVariant@@@Z @ 178 NONAME ; bool EmailClientApi::NmApiMessageManager::createAttachment(class NmApiEmailMessage &, class QVariant const &)
+	?isReplied@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 179 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isReplied(void) const
+	?cancel@NmApiEnvelopeListing@EmailClientApi@@UAEXXZ @ 180 NONAME ; void EmailClientApi::NmApiEnvelopeListing::cancel(void)
+	?getStaticMetaObject@NmApiEventNotifier@EmailClientApi@@SAABUQMetaObject@@XZ @ 181 NONAME ; struct QMetaObject const & EmailClientApi::NmApiEventNotifier::getStaticMetaObject(void)
+	??0NmApiMessageEnvelope@EmailClientApi@@QAE@ABV01@@Z @ 182 NONAME ; EmailClientApi::NmApiMessageEnvelope::NmApiMessageEnvelope(class EmailClientApi::NmApiMessageEnvelope const &)
+	?trUtf8@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 183 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::trUtf8(char const *, char const *, int)
+	?messagesCreated@NmApiMessageManager@EmailClientApi@@IAEXH@Z @ 184 NONAME ; void EmailClientApi::NmApiMessageManager::messagesCreated(int)
+	?setContentType@NmApiMessageEnvelope@EmailClientApi@@QAEXABVQString@@@Z @ 185 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setContentType(class QString const &)
+	?initialized@NmApiEmailService@EmailClientApi@@IAEX_N@Z @ 186 NONAME ; void EmailClientApi::NmApiEmailService::initialized(bool)
+	?qt_metacast@NmApiEventNotifier@EmailClientApi@@UAEPAXPBD@Z @ 187 NONAME ; void * EmailClientApi::NmApiEventNotifier::qt_metacast(char const *)
+	?qt_metacall@NmApiEmailService@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 188 NONAME ; int EmailClientApi::NmApiEmailService::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?cancel@NmApiEventNotifier@EmailClientApi@@UAEXXZ @ 189 NONAME ; void EmailClientApi::NmApiEventNotifier::cancel(void)
+	?totalSize@NmApiMessageEnvelope@EmailClientApi@@QBE_KXZ @ 190 NONAME ; unsigned long long EmailClientApi::NmApiMessageEnvelope::totalSize(void) const
+	?metaObject@NmApiMessageTask@@UBEPBUQMetaObject@@XZ @ 191 NONAME ; struct QMetaObject const * NmApiMessageTask::metaObject(void) const
+	?setMailboxId@NmApiMailboxSettingsData@EmailClientApi@@QAEX_K@Z @ 192 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::setMailboxId(unsigned long long)
+	?qt_metacast@NmApiEmailService@EmailClientApi@@UAEPAXPBD@Z @ 193 NONAME ; void * EmailClientApi::NmApiEmailService::qt_metacast(char const *)
+	?content@NmApiMessageBody@EmailClientApi@@QBE?AVQString@@XZ @ 194 NONAME ; class QString EmailClientApi::NmApiMessageBody::content(void) const
+	?trUtf8@NmApiFolderListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 195 NONAME ; class QString EmailClientApi::NmApiFolderListing::trUtf8(char const *, char const *)
+	?qt_metacall@NmApiFolderListing@EmailClientApi@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 196 NONAME ; int EmailClientApi::NmApiFolderListing::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0NmApiMessageTask@@IAE@PAVQObject@@@Z @ 197 NONAME ; NmApiMessageTask::NmApiMessageTask(class QObject *)
+	?setAddress@NmApiMailbox@EmailClientApi@@QAEXABVQString@@@Z @ 198 NONAME ; void EmailClientApi::NmApiMailbox::setAddress(class QString const &)
+	?trUtf8@NmApiEnvelopeListing@EmailClientApi@@SA?AVQString@@PBD0@Z @ 199 NONAME ; class QString EmailClientApi::NmApiEnvelopeListing::trUtf8(char const *, char const *)
+	?tr@NmApiMessageTask@@SA?AVQString@@PBD0@Z @ 200 NONAME ; class QString NmApiMessageTask::tr(char const *, char const *)
+	?getStaticMetaObject@NmApiMessageTask@@SAABUQMetaObject@@XZ @ 201 NONAME ; struct QMetaObject const & NmApiMessageTask::getStaticMetaObject(void)
+	?setAddress@NmApiEmailAddress@EmailClientApi@@QAEXABVQString@@@Z @ 202 NONAME ; void EmailClientApi::NmApiEmailAddress::setAddress(class QString const &)
+	?address@NmApiEmailAddress@EmailClientApi@@QBE?AVQString@@XZ @ 203 NONAME ; class QString EmailClientApi::NmApiEmailAddress::address(void) const
+	?isForwarded@NmApiMessageEnvelope@EmailClientApi@@QBE_NXZ @ 204 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::isForwarded(void) const
+	?qt_metacast@NmApiMailboxListing@EmailClientApi@@UAEPAXPBD@Z @ 205 NONAME ; void * EmailClientApi::NmApiMailboxListing::qt_metacast(char const *)
+	??8NmApiMailbox@EmailClientApi@@QAE_NABV01@@Z @ 206 NONAME ; bool EmailClientApi::NmApiMailbox::operator==(class EmailClientApi::NmApiMailbox const &)
+	?mailboxesListed@NmApiMailboxListing@EmailClientApi@@IAEXH@Z @ 207 NONAME ; void EmailClientApi::NmApiMailboxListing::mailboxesListed(int)
+	?setId@NmApiFolder@EmailClientApi@@QAEX_K@Z @ 208 NONAME ; void EmailClientApi::NmApiFolder::setId(unsigned long long)
+	??0NmApiEmailService@EmailClientApi@@QAE@PAVQObject@@@Z @ 209 NONAME ; EmailClientApi::NmApiEmailService::NmApiEmailService(class QObject *)
+	??0NmApiSettingsManager@EmailClientApi@@QAE@_K@Z @ 210 NONAME ; EmailClientApi::NmApiSettingsManager::NmApiSettingsManager(unsigned long long)
+	?staticMetaObject@NmApiFolderListing@EmailClientApi@@2UQMetaObject@@B @ 211 NONAME ; struct QMetaObject const EmailClientApi::NmApiFolderListing::staticMetaObject
+	?populateDefaultSettings@NmApiMailboxSettings@EmailClientApi@@QAE_NABVQString@@AAVNmApiMailboxSettingsData@2@@Z @ 212 NONAME ; bool EmailClientApi::NmApiMailboxSettings::populateDefaultSettings(class QString const &, class EmailClientApi::NmApiMailboxSettingsData &)
+	??1NmApiEmailService@EmailClientApi@@UAE@XZ @ 213 NONAME ; EmailClientApi::NmApiEmailService::~NmApiEmailService(void)
+	?trUtf8@NmApiMessageTask@@SA?AVQString@@PBD0H@Z @ 214 NONAME ; class QString NmApiMessageTask::trUtf8(char const *, char const *, int)
+	?clearSettings@NmApiMailboxSettingsData@EmailClientApi@@QAEXXZ @ 215 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::clearSettings(void)
+	??_ENmApiEmailService@EmailClientApi@@UAE@I@Z @ 216 NONAME ; EmailClientApi::NmApiEmailService::~NmApiEmailService(unsigned int)
+	?getMailbox@NmApiEmailService@EmailClientApi@@QAE_N_KAAVNmApiMailbox@2@@Z @ 217 NONAME ; bool EmailClientApi::NmApiEmailService::getMailbox(unsigned long long, class EmailClientApi::NmApiMailbox &)
+	?setValue@NmApiMailboxSettingsData@EmailClientApi@@QAEXHABVQVariant@@@Z @ 218 NONAME ; void EmailClientApi::NmApiMailboxSettingsData::setValue(int, class QVariant const &)
+	?setTotalSize@NmApiMessageBody@EmailClientApi@@QAEX_K@Z @ 219 NONAME ; void EmailClientApi::NmApiMessageBody::setTotalSize(unsigned long long)
+	??8NmApiEmailAddress@EmailClientApi@@QAE_NABV01@@Z @ 220 NONAME ; bool EmailClientApi::NmApiEmailAddress::operator==(class EmailClientApi::NmApiEmailAddress const &)
+	??0NmApiEmailAddress@EmailClientApi@@QAE@XZ @ 221 NONAME ; EmailClientApi::NmApiEmailAddress::NmApiEmailAddress(void)
+	??1NmApiMessageTask@@UAE@XZ @ 222 NONAME ; NmApiMessageTask::~NmApiMessageTask(void)
+	?mailboxId@NmApiMailboxSettingsData@EmailClientApi@@QBE_KXZ @ 223 NONAME ; unsigned long long EmailClientApi::NmApiMailboxSettingsData::mailboxId(void) const
+	?getCcRecipients@NmApiMessageEnvelope@EmailClientApi@@QAEXAAV?$QList@VNmApiEmailAddress@EmailClientApi@@@@@Z @ 224 NONAME ; void EmailClientApi::NmApiMessageEnvelope::getCcRecipients(class QList<class EmailClientApi::NmApiEmailAddress> &)
+	??8NmApiMessageEnvelope@EmailClientApi@@QAE_NABV01@@Z @ 225 NONAME ; bool EmailClientApi::NmApiMessageEnvelope::operator==(class EmailClientApi::NmApiMessageEnvelope const &)
+	?mailboxEvent@NmApiEventNotifier@EmailClientApi@@IAEXW4NmApiMailboxEvent@2@V?$QList@_K@@@Z @ 226 NONAME ; void EmailClientApi::NmApiEventNotifier::mailboxEvent(enum EmailClientApi::NmApiMailboxEvent, class QList<unsigned long long>)
+	??0NmApiMailbox@EmailClientApi@@QAE@XZ @ 227 NONAME ; EmailClientApi::NmApiMailbox::NmApiMailbox(void)
+	??0NmApiEventNotifier@EmailClientApi@@QAE@PAVQObject@@@Z @ 228 NONAME ; EmailClientApi::NmApiEventNotifier::NmApiEventNotifier(class QObject *)
+	?setId@NmApiMailbox@EmailClientApi@@QAEX_K@Z @ 229 NONAME ; void EmailClientApi::NmApiMailbox::setId(unsigned long long)
+	?save@NmApiSettingsManager@EmailClientApi@@QAE_NABVNmApiMailboxSettingsData@2@@Z @ 230 NONAME ; bool EmailClientApi::NmApiSettingsManager::save(class EmailClientApi::NmApiMailboxSettingsData const &)
+	?cancel@NmApiMailboxListing@EmailClientApi@@UAEXXZ @ 231 NONAME ; void EmailClientApi::NmApiMailboxListing::cancel(void)
+	?getMailboxes@NmApiMailboxListing@EmailClientApi@@QAE_NAAV?$QList@VNmApiMailbox@EmailClientApi@@@@@Z @ 232 NONAME ; bool EmailClientApi::NmApiMailboxListing::getMailboxes(class QList<class EmailClientApi::NmApiMailbox> &)
+	?trUtf8@NmApiEventNotifier@EmailClientApi@@SA?AVQString@@PBD0@Z @ 233 NONAME ; class QString EmailClientApi::NmApiEventNotifier::trUtf8(char const *, char const *)
+	??_ENmApiFolderListing@EmailClientApi@@UAE@I@Z @ 234 NONAME ; EmailClientApi::NmApiFolderListing::~NmApiFolderListing(unsigned int)
+	??_ENmApiMessageTask@@UAE@I@Z @ 235 NONAME ; NmApiMessageTask::~NmApiMessageTask(unsigned int)
+	?getStaticMetaObject@NmApiMessageManager@EmailClientApi@@SAABUQMetaObject@@XZ @ 236 NONAME ; struct QMetaObject const & EmailClientApi::NmApiMessageManager::getStaticMetaObject(void)
+	?isRunning@NmApiEnvelopeListing@EmailClientApi@@QBE_NXZ @ 237 NONAME ; bool EmailClientApi::NmApiEnvelopeListing::isRunning(void) const
+	?staticMetaObject@NmApiMessageManager@EmailClientApi@@2UQMetaObject@@B @ 238 NONAME ; struct QMetaObject const EmailClientApi::NmApiMessageManager::staticMetaObject
+	?isRunning@NmApiEventNotifier@EmailClientApi@@QBE_NXZ @ 239 NONAME ; bool EmailClientApi::NmApiEventNotifier::isRunning(void) const
+	?setIsReplied@NmApiMessageEnvelope@EmailClientApi@@QAEX_N@Z @ 240 NONAME ; void EmailClientApi::NmApiMessageEnvelope::setIsReplied(bool)
+	?sendEventsFromBuffer@NmApiEventNotifier@EmailClientApi@@QAEXXZ @ 241 NONAME ; void EmailClientApi::NmApiEventNotifier::sendEventsFromBuffer(void)
+	?contentType@NmApiMessageEnvelope@EmailClientApi@@QBE?AVQString@@XZ @ 242 NONAME ; class QString EmailClientApi::NmApiMessageEnvelope::contentType(void) const
+	?trUtf8@NmApiMailboxListing@EmailClientApi@@SA?AVQString@@PBD0H@Z @ 243 NONAME ; class QString EmailClientApi::NmApiMailboxListing::trUtf8(char const *, char const *, int)
+	?setParentFolderId@NmApiFolder@EmailClientApi@@QAEX_K@Z @ 244 NONAME ; void EmailClientApi::NmApiFolder::setParentFolderId(unsigned long long)
+	?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)
 
--- a/emailservices/nmclientapi/inc/nmapiheaders.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapiheaders.h	Mon Aug 23 23:32:31 2010 +0300
@@ -40,7 +40,7 @@
 #include <cemailaccounts.h>
 
 
-#include <SMTPSET.H>
+#include <smtpset.h>
 
 #include <xqconversions.h>
 
--- a/emailservices/nmclientapi/inc/nmapimessagemanager_p.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapimessagemanager_p.h	Mon Aug 23 23:32:31 2010 +0300
@@ -21,7 +21,7 @@
 #include <QObject>
 #include <nmapimessagemanager.h>
 #include <nmapifolder.h>
-#include <NmApiDataPluginFactory.h>
+#include <nmapidatapluginfactory.h>
 #include <nmcommon.h>
 #include <nmapifolder.h>
 #include <nmapiprivateclasses.h>
--- a/emailservices/nmregister/src/nmmailboxregisterinterface.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmregister/src/nmmailboxregisterinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -28,6 +28,7 @@
 
 //mandatory keys 
 const QString hsItemName("item:name");
+const QString hsItemLocName("item:locname");
 const QString hsitemLaunchUri("item:launchuri");
 const QString hsitemPublisherId("item:publisherId");
 //not mandatory 
@@ -195,11 +196,11 @@
 
     QMap<QString, QVariant> map;
     //------------------------------
-    map[hsItemName] = accountName;
+    map[hsItemLocName] = "loc://" + KNmRegisterLocFileName + "/txt_mailwdgt_dblist_mail";
     map[hsitemLaunchUri] = formLaunchUri(accountId);
     map[hsitemPublisherId] = NmPublisherName;
     map[hsItemWidgetUri] = NmHsWidget;
-    map[hsItemLocDescription] = "loc://" + KNmRegisterLocFileName + "/txt_mail_widget_dblist_preview_of_recent_mail";
+    map[hsItemDescription] = accountName;
     map[hsIconFileName] = accountIconName;
     // to add widget params that are mapped to widgets properties
     map[NmHsWidgetParamAccountId] = QString::number(accountId);
@@ -247,7 +248,7 @@
     //Normally there should be only one instance, but just in case
     while (!list.isEmpty()) {
         //update the account name
-        list.first()[hsItemName] = newName;
+        list.first()[hsItemDescription] = newName;
         //commit changes
         ret = QMetaObject::invokeMethod( mService,"add",
             Qt::DirectConnection,
--- a/emailservices/nmregister/translations/nmregister.ts	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmregister/translations/nmregister.ts	Mon Aug 23 23:32:31 2010 +0300
@@ -2,24 +2,14 @@
 <!DOCTYPE TS>
 <TS version="3.0" sourcelanguage="en_GB">
 <context>
-<message numerus="no" id="txt_mail_widget_l_dblist_preview_of_recent_mail">
-    <comment>Descriptive text of mail widget in application library, landscape</comment>        
-    <source>Preview of recent mail</source>
+<message numerus="no" id="txt_mailwdgt_dblist_mail">
+    <comment>Descriptive primary text for mail widget item in Applications Library. Both orientations.</comment>        
+    <source>Mail</source>
     <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_list_sec2_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>Mail Widget_L07</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>Ma</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_mail_widget_dblist_preview_of_recent_mail">
-    <comment>Descriptive text of mail widget in application library, portrait</comment>        
-    <source>Preview of recent mail</source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>Mail Widget_P07</extra-loc-viewid>
-    <extra-loc-positionid>dblist_1_val</extra-loc-positionid>
-    <extra-loc-feature>Ma</extra-loc-feature>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>Mailwdgt_006</extra-loc-viewid>
+    <extra-loc-positionid>dblist_1</extra-loc-positionid>
+    <extra-loc-feature>Mailwdgt</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 </context>
--- a/emailservices/nmutilities/bwins/nmutilitiesu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmutilities/bwins/nmutilitiesu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -1,6 +1,23 @@
 EXPORTS
-	?mailboxName@EmailMailboxInfo@@QBE?AVQString@@ABVQVariant@@@Z @ 1 NONAME ; class QString EmailMailboxInfo::mailboxName(class QVariant const &) const
-	?mailboxIcon@EmailMailboxInfo@@QBE?AVQString@@ABVQVariant@@@Z @ 2 NONAME ; class QString EmailMailboxInfo::mailboxIcon(class QVariant const &) const
-	??0EmailMailboxInfo@@QAE@XZ @ 3 NONAME ; EmailMailboxInfo::EmailMailboxInfo(void)
-	??1EmailMailboxInfo@@QAE@XZ @ 4 NONAME ; EmailMailboxInfo::~EmailMailboxInfo(void)
+	?valueChanged@NmUiEventsNotifier@@AAEXABVXQSettingsKey@@ABVQVariant@@@Z @ 1 NONAME ; void NmUiEventsNotifier::valueChanged(class XQSettingsKey const &, class QVariant const &)
+	?tr@NmUiEventsNotifier@@SA?AVQString@@PBD0H@Z @ 2 NONAME ; class QString NmUiEventsNotifier::tr(char const *, char const *, int)
+	?viewStateChanged@NmUiEventsNotifier@@IAEXW4NmUiEventType@1@W4NmUiViewId@@VNmId@@@Z @ 3 NONAME ; void NmUiEventsNotifier::viewStateChanged(enum NmUiEventsNotifier::NmUiEventType, enum NmUiViewId, class NmId)
+	?getStaticMetaObject@NmUiEventsNotifier@@SAABUQMetaObject@@XZ @ 4 NONAME ; struct QMetaObject const & NmUiEventsNotifier::getStaticMetaObject(void)
+	??0NmUiEventsNotifier@@QAE@PAVQObject@@@Z @ 5 NONAME ; NmUiEventsNotifier::NmUiEventsNotifier(class QObject *)
+	?qt_metacast@NmUiEventsNotifier@@UAEPAXPBD@Z @ 6 NONAME ; void * NmUiEventsNotifier::qt_metacast(char const *)
+	??_ENmUiEventsNotifier@@UAE@I@Z @ 7 NONAME ; NmUiEventsNotifier::~NmUiEventsNotifier(unsigned int)
+	??1NmUiEventsNotifier@@UAE@XZ @ 8 NONAME ; NmUiEventsNotifier::~NmUiEventsNotifier(void)
+	?trUtf8@NmUiEventsNotifier@@SA?AVQString@@PBD0@Z @ 9 NONAME ; class QString NmUiEventsNotifier::trUtf8(char const *, char const *)
+	?mailboxIcon@EmailMailboxInfo@@QBE?AVQString@@ABVQVariant@@@Z @ 10 NONAME ; class QString EmailMailboxInfo::mailboxIcon(class QVariant const &) const
+	?trUtf8@NmUiEventsNotifier@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString NmUiEventsNotifier::trUtf8(char const *, char const *, int)
+	??1EmailMailboxInfo@@QAE@XZ @ 12 NONAME ; EmailMailboxInfo::~EmailMailboxInfo(void)
+	?mailboxName@EmailMailboxInfo@@QBE?AVQString@@ABVQVariant@@@Z @ 13 NONAME ; class QString EmailMailboxInfo::mailboxName(class QVariant const &) const
+	??0EmailMailboxInfo@@QAE@XZ @ 14 NONAME ; EmailMailboxInfo::EmailMailboxInfo(void)
+	?notifyViewStateChanged@NmUiEventsNotifier@@SA_NW4NmUiEventType@1@W4NmUiViewId@@ABVNmId@@@Z @ 15 NONAME ; bool NmUiEventsNotifier::notifyViewStateChanged(enum NmUiEventsNotifier::NmUiEventType, enum NmUiViewId, class NmId const &)
+	?qt_metacall@NmUiEventsNotifier@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 16 NONAME ; int NmUiEventsNotifier::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?staticMetaObject@NmUiEventsNotifier@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const NmUiEventsNotifier::staticMetaObject
+	?tr@NmUiEventsNotifier@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString NmUiEventsNotifier::tr(char const *, char const *)
+	?metaObject@NmUiEventsNotifier@@UBEPBUQMetaObject@@XZ @ 19 NONAME ; struct QMetaObject const * NmUiEventsNotifier::metaObject(void) const
+	?parseKeyValue@NmUiEventsNotifier@@ABE_NABVQByteArray@@AAW4NmUiEventType@1@AAW4NmUiViewId@@AAVNmId@@@Z @ 20 NONAME ; bool NmUiEventsNotifier::parseKeyValue(class QByteArray const &, enum NmUiEventsNotifier::NmUiEventType &, enum NmUiViewId &, class NmId &) const
+	?keysEqual@NmUiEventsNotifier@@ABE_NABVXQSettingsKey@@ABVXQPublishAndSubscribeSettingsKey@@@Z @ 21 NONAME ; bool NmUiEventsNotifier::keysEqual(class XQSettingsKey const &, class XQPublishAndSubscribeSettingsKey const &) const
 
--- a/emailservices/nmutilities/eabi/nmutilitiesu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmutilities/eabi/nmutilitiesu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -3,6 +3,23 @@
 	_ZN16EmailMailboxInfoC2Ev @ 2 NONAME
 	_ZN16EmailMailboxInfoD1Ev @ 3 NONAME
 	_ZN16EmailMailboxInfoD2Ev @ 4 NONAME
-	_ZNK16EmailMailboxInfo11mailboxIconERK8QVariant @ 5 NONAME
-	_ZNK16EmailMailboxInfo11mailboxNameERK8QVariant @ 6 NONAME
+	_ZN18NmUiEventsNotifier11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
+	_ZN18NmUiEventsNotifier11qt_metacastEPKc @ 6 NONAME
+	_ZN18NmUiEventsNotifier12valueChangedERK13XQSettingsKeyRK8QVariant @ 7 NONAME
+	_ZN18NmUiEventsNotifier16staticMetaObjectE @ 8 NONAME DATA 16
+	_ZN18NmUiEventsNotifier16viewStateChangedENS_13NmUiEventTypeE10NmUiViewId4NmId @ 9 NONAME
+	_ZN18NmUiEventsNotifier19getStaticMetaObjectEv @ 10 NONAME
+	_ZN18NmUiEventsNotifier22notifyViewStateChangedENS_13NmUiEventTypeE10NmUiViewIdRK4NmId @ 11 NONAME
+	_ZN18NmUiEventsNotifierC1EP7QObject @ 12 NONAME
+	_ZN18NmUiEventsNotifierC2EP7QObject @ 13 NONAME
+	_ZN18NmUiEventsNotifierD0Ev @ 14 NONAME
+	_ZN18NmUiEventsNotifierD1Ev @ 15 NONAME
+	_ZN18NmUiEventsNotifierD2Ev @ 16 NONAME
+	_ZNK16EmailMailboxInfo11mailboxIconERK8QVariant @ 17 NONAME
+	_ZNK16EmailMailboxInfo11mailboxNameERK8QVariant @ 18 NONAME
+	_ZNK18NmUiEventsNotifier10metaObjectEv @ 19 NONAME
+	_ZNK18NmUiEventsNotifier13parseKeyValueERK10QByteArrayRNS_13NmUiEventTypeER10NmUiViewIdR4NmId @ 20 NONAME
+	_ZNK18NmUiEventsNotifier9keysEqualERK13XQSettingsKeyRK32XQPublishAndSubscribeSettingsKey @ 21 NONAME
+	_ZTI18NmUiEventsNotifier @ 22 NONAME
+	_ZTV18NmUiEventsNotifier @ 23 NONAME
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailservices/nmutilities/inc/nmuieventsnotifier.h	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef NMUIEVENTSNOTIFIER_H
+#define NMUIEVENTSNOTIFIER_H
+
+#include <QObject>
+#include <XQSettingsKey>
+#include <XQSettingsManager>
+#include <QVariant>
+#include <nmcommon.h> // For NmId.
+#include <nmuiviewids.h>
+
+#include "emailutilitiesdef.h"
+
+
+
+class EMAIL_UTILITIES_EXPORT NmUiEventsNotifier : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(NmUiEventType)
+
+public: // Data types
+
+    enum NmUiEventType {
+        NmInvalidUiEvent = 0,
+        NmViewShownEvent,
+        NmViewHiddenEvent
+    };
+
+
+public:
+
+    NmUiEventsNotifier(QObject *parent = NULL);
+
+    ~NmUiEventsNotifier();
+
+
+public:
+
+    static bool notifyViewStateChanged(const NmUiEventType eventType,
+                                       const NmUiViewId viewId,
+                                       const NmId &mailboxId);
+
+
+private:
+
+    bool keysEqual(const XQSettingsKey& settingsKey,
+                   const XQPublishAndSubscribeSettingsKey& psSettingsKey) const;
+
+    bool parseKeyValue(const QByteArray &array,
+                       NmUiEventType &eventType,
+                       NmUiViewId &viewId,
+                       NmId &mailboxId) const;
+
+
+private slots:
+
+    void valueChanged(const XQSettingsKey &key, const QVariant &value);
+
+
+Q_SIGNALS:
+
+    void viewStateChanged(NmUiEventsNotifier::NmUiEventType eventType,
+                          NmUiViewId viewId,
+                          NmId mailboxId);
+
+
+private: // Data
+
+    XQSettingsManager mSettingsManager;
+};
+
+
+#endif /* NMUIEVENTSNOTIFIER_H */
+
+// End of file.
--- a/emailservices/nmutilities/nmutilities.pro	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailservices/nmutilities/nmutilities.pro	Mon Aug 23 23:32:31 2010 +0300
@@ -37,13 +37,15 @@
 MOC_DIR = tmp
 
 HEADERS   += nmcenrepkeys.h \
-			 emailutilitiesdef.h \
-			 emailmailboxinfo_p.h \
-			 emailmailboxinfo.h \
-			 nmutilitiescommonheaders.h
+             emailutilitiesdef.h \
+             emailmailboxinfo_p.h \
+             emailmailboxinfo.h \
+             nmuieventsnotifier.h \
+             nmutilitiescommonheaders.h
              
 SOURCES   += emailmailboxinfo_p.cpp \
-			 emailmailboxinfo.cpp
+             emailmailboxinfo.cpp \
+             nmuieventsnotifier.cpp
 
 symbian*: { 
     TARGET.EPOCALLOWDLLDATA = 1
@@ -58,15 +60,15 @@
     defBlock = \      
       "$${LITERAL_HASH}if defined(MARM)" \
       "DEFFILE  eabi/nmutilities.def" \
-	  "$${LITERAL_HASH}else" \
+      "$${LITERAL_HASH}else" \
       "DEFFILE  bwins/nmutilities.def" \
       "$${LITERAL_HASH}endif"
     
     MMP_RULES += defBlock
     
-	LIBS +=	-lcentralrepository 
-	LIBS +=	-ltimezonelocalization 
-	LIBS +=	-lxqsettingsmanager 
+    LIBS += -lcentralrepository 
+    LIBS += -ltimezonelocalization 
+    LIBS += -lxqsettingsmanager 
 }
 
 win32 {
@@ -99,11 +101,10 @@
                              "data/2001E277.txt                     /epoc32/release/winscw/udeb/z/private/10202be9/2001E277.txt" \
                              "data/2001E277.txt                     /epoc32/release/winscw/urel/z/private/10202be9/2001E277.txt" \
                              "data/2001E277.txt                     /epoc32/data/z/private/10202be9/2001E277.txt" \
-                             "data/nmutilities.confml            	APP_LAYER_CONFML(nmutilities.confml)" \
-                             "data/nmutilities_200255BA.crml      	APP_LAYER_CRML(nmutilities_200255BA.crml)" \
-                             "inc/emailmailboxinfo.h				APP_LAYER_PLATFORM_EXPORT_PATH(emailmailboxinfo.h)" \
-                             "inc/nmutilitiescommonheaders.h      	APP_LAYER_PLATFORM_EXPORT_PATH(nmutilitiescommonheaders.h)" \
+                             "data/nmutilities.confml               APP_LAYER_CONFML(nmutilities.confml)" \
+                             "data/nmutilities_200255BA.crml        APP_LAYER_CRML(nmutilities_200255BA.crml)" \
+                             "inc/emailmailboxinfo.h                APP_LAYER_PLATFORM_EXPORT_PATH(emailmailboxinfo.h)" \
+                             "inc/nmutilitiescommonheaders.h        APP_LAYER_PLATFORM_EXPORT_PATH(nmutilitiescommonheaders.h)" \
                              "inc/emailutilitiesdef.h               APP_LAYER_PLATFORM_EXPORT_PATH(emailutilitiesdef.h)" \
-                             "inc/nmcenrepkeys.h                    APP_LAYER_PLATFORM_EXPORT_PATH(nmcenrepkeys.h)" 
-                             
-
+                             "inc/nmcenrepkeys.h                    APP_LAYER_PLATFORM_EXPORT_PATH(nmcenrepkeys.h)" \ 
+                             "inc/nmuieventsnotifier.h              APP_LAYER_PLATFORM_EXPORT_PATH(nmuieventsnotifier.h)"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailservices/nmutilities/src/nmuieventsnotifier.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,182 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "nmuieventsnotifier.h"
+#include <QDataStream>
+#include <XQPublishAndSubscribeUtils>
+
+const long int NmSettingsKeyCategoryId(0x2002C326); // NMailAgent UID3
+const unsigned long int NmSettingsKeyUiEvents(0x00000100);
+const XQPublishAndSubscribeSettingsKey NmUiEventsKey(NmSettingsKeyCategoryId,
+                                                     NmSettingsKeyUiEvents);
+
+#define NmUiEventTypeArrayType qint16
+#define NmUiViewIdArrayType qint16
+#define NmMailboxIdArrayType quint64
+
+const size_t NmUiEventByteArraySize(sizeof(NmUiEventTypeArrayType) +
+                                    sizeof(NmUiViewIdArrayType) +
+                                    sizeof(NmMailboxIdArrayType));
+
+
+/*!
+    \class NmUiEventsNotifier
+    \brief API class for notifying other processes about email UI events.
+*/
+
+
+/*!
+    Class constructor.
+*/
+NmUiEventsNotifier::NmUiEventsNotifier(QObject *parent /* = NULL */)
+: QObject(parent)
+{
+    XQPublishAndSubscribeUtils psUtils(mSettingsManager);
+
+    // The following will only work if this instance is constructed inside the
+    // nmailagent process since the category ID of the key is the UID3 of the
+    // process. Other processes do not have the permission to define the
+    // property.
+    psUtils.defineProperty(NmUiEventsKey, XQSettingsManager::TypeByteArray);
+
+    mSettingsManager.startMonitoring(NmUiEventsKey);
+
+    connect(&mSettingsManager, SIGNAL(valueChanged(const XQSettingsKey &, const QVariant &)),
+            this, SLOT(valueChanged(const XQSettingsKey &, const QVariant &)),
+            Qt::UniqueConnection);
+}
+
+
+/*!
+    Class destructor.
+*/
+NmUiEventsNotifier::~NmUiEventsNotifier()
+{
+    XQPublishAndSubscribeUtils psUtils(mSettingsManager);
+    psUtils.deleteProperty(NmUiEventsKey);
+}
+
+
+/*!
+    Notifies observers about view state changed event.
+
+    \param eventType The type of state change.
+    \param viewId The ID of the view which was shown.
+    \param mailboxId The ID of the mailbox related to the view.
+
+    \return True if success, false otherwise.
+*/
+bool NmUiEventsNotifier::notifyViewStateChanged(const NmUiEventType eventType,
+                                                const NmUiViewId viewId,
+                                                const NmId &mailboxId)
+{
+    QByteArray array;
+    array.resize((int)NmUiEventByteArraySize);
+    
+    // Use a data stream to write the values into the array.
+    QDataStream stream(&array, QIODevice::WriteOnly);
+    stream << (NmUiEventTypeArrayType)eventType <<
+              (NmUiViewIdArrayType)viewId <<
+              (NmMailboxIdArrayType)mailboxId.id();
+
+    XQSettingsManager settingsManager;
+    return settingsManager.writeItemValue(NmUiEventsKey, array);
+}
+
+
+/*!
+    Compares the two given keys.
+
+    \param settingsKey XQSettingsKey
+    \param psSettingsKey XQPublishAndSubscribeSettingsKey
+
+    \return <code>true</code> if the target, uid and key values match, otherwise
+            returns <code>false</code>
+*/
+bool NmUiEventsNotifier::keysEqual(
+    const XQSettingsKey& settingsKey,
+    const XQPublishAndSubscribeSettingsKey& psSettingsKey) const
+{
+    return ((settingsKey.target() == psSettingsKey.target()) &&
+            (settingsKey.uid() == psSettingsKey.uid()) &&
+            (settingsKey.key() == psSettingsKey.key()));
+}
+
+
+/*!
+    Parses the value from the given byte array.
+
+    \param array The array to parse.
+    \param eventType Where the event type is stored to.
+    \param viewId Where the view ID is stored to.
+    \param mailboxId Where the mailbox ID is stored to.
+
+    \return True if success, false otherwise.
+*/
+bool NmUiEventsNotifier::parseKeyValue(const QByteArray &array,
+                                       NmUiEventType &eventType,
+                                       NmUiViewId &viewId,
+                                       NmId &mailboxId) const
+{
+    bool success(false);
+
+    if (array.size() >= (int)NmUiEventByteArraySize) {
+        NmUiEventTypeArrayType type(0);
+        NmUiViewIdArrayType vId(0);
+        NmMailboxIdArrayType mbId(0);
+        
+        // Use a data stream to read the values from the array.
+        QDataStream stream(array);
+        stream >> type >> vId >> mbId;
+        
+        // Convert the values into proper types.
+        eventType = (NmUiEventType)type;
+        viewId = (NmUiViewId)vId;
+        mailboxId.setId(mbId);
+
+        success = true;
+    }
+
+    return success;
+}
+
+
+/*!
+    Handles the occured UI events. Processes the value changed events of
+    settings keys.
+
+    \param key The settings key of which value was changed.
+    \param value The new value of the key. 
+*/
+void NmUiEventsNotifier::valueChanged(const XQSettingsKey &key,
+                                      const QVariant &value)
+{
+    if (keysEqual(key, NmUiEventsKey)) {
+        QByteArray array = value.toByteArray();
+        
+        NmUiEventType eventType(NmInvalidUiEvent);
+        NmUiViewId viewId(NmUiViewNone);
+        NmId mailboxId(0);
+        
+        if (parseKeyValue(array, eventType, viewId, mailboxId)) {
+            emit viewStateChanged(eventType, viewId, mailboxId);
+        }
+    }
+}
+
+
+// End of file.
--- a/emailuis/nmailui/inc/nmapplication.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmapplication.h	Mon Aug 23 23:32:31 2010 +0300
@@ -53,6 +53,7 @@
     QSize screenSize();
     bool eventFilter(QObject *obj, QEvent *event);
     bool updateVisibilityState();
+    bool isForeground() const;
 
 public slots:
     void prepareForPopView();
@@ -100,6 +101,7 @@
     HbMessageBox *mQueryDialog;             // Owned
     bool mBackButtonPressed;
     NmId mCurrentMailboxId;
+    bool mApplicationHidden;
 };
 
 #endif // NMAPPLICATION_H
--- a/emailuis/nmailui/inc/nmattachmentpicker.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmattachmentpicker.h	Mon Aug 23 23:32:31 2010 +0300
@@ -43,6 +43,7 @@
     void fetchCameraStill();
     void fetchCameraVideo();
     void selectFetcher(HbListWidgetItem *listItem);
+    void setTitle(const QString &title);
         
     
 signals:
@@ -55,7 +56,8 @@
     void fetchFromCamera(int mode);
     
 private:
-    XQAiwRequest *mRequest;    
+    XQAiwRequest *mRequest;
+    QString mTitle;
 };
 
 #endif // NMATTACHMENTPICKER_H_
--- a/emailuis/nmailui/inc/nmeditorcontent.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorcontent.h	Mon Aug 23 23:32:31 2010 +0300
@@ -44,8 +44,9 @@
 
     virtual ~NmEditorContent();
 
-    void setMessageData(const NmMessage &originalMessage,
-                        NmUiEditorStartMode &editorStartMode);
+    void setBodyContent(NmUiEditorStartMode editorStartMode,
+                        const NmMessage *originalMessage,
+                        const QString *signature);
 
     NmEditorTextEdit* editor() const;
 
@@ -64,13 +65,10 @@
     void setEditorContentHeight();
     void setEditorContentWidth();
     void ensureCursorVisibility();
-
-private:
-    enum MessageBodyType { NmPlainText, NmHTMLText };
+    void repositHeader(const QPointF &scrollPosition);
 
 private:
     NmEditorHeader *mHeader; // Not owned
-    MessageBodyType mMessageBodyType;
     NmEditorTextEdit *mEditorWidget; // Not owned
     NmBaseViewScrollArea *mScrollArea; // Not owned
     HbWidget *mScrollAreaContents; // Not owned
--- a/emailuis/nmailui/inc/nmeditorheader.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorheader.h	Mon Aug 23 23:32:31 2010 +0300
@@ -56,6 +56,7 @@
         int result);
     void setFieldVisibility(bool isVisible);
     void adjustHeaderWidth();
+    void repositHeader(const QTransform &transform);
 
 private:
     void loadWidgets();
@@ -73,7 +74,6 @@
     void editorContentChanged();
     void attachmentActivated(int arrayIndex);
     void attachmentLongPressed(int arrayIndex, QPointF point);
-    void repositHeader(const QPointF &scrollPosition);
 
 private:
     NmApplication &mApplication;
--- a/emailuis/nmailui/inc/nmeditorview.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmeditorview.h	Mon Aug 23 23:32:31 2010 +0300
@@ -81,6 +81,7 @@
     void invalidAddressQuery(HbAction* action);
     void okToExitQuery(HbAction* action);
     void sendProgressDialogCancelled();
+    void safeToDraft();
     
 protected:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
@@ -146,9 +147,8 @@
     NmAttachmentPicker* mAttachmentPicker; // Owned    
     bool mCcBccFieldVisible;
     QPointer<HbProgressDialog> mServiceSendingDialog; // Owned.
-    bool mIsNotFetchedBefore;
-	HbListWidget *mTBExtnContentWidget;		// Owned
-	QString mHiddenPriorityName;
+    HbListWidget *mTBExtnContentWidget;		// Owned
+    QString mHiddenPriorityName;
 };
 
 
--- a/emailuis/nmailui/inc/nmuiheaders.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/inc/nmuiheaders.h	Mon Aug 23 23:32:31 2010 +0300
@@ -94,6 +94,7 @@
 #include <hbshrinkingvkbhost.h>
 #include <hbactivitymanager.h>
 #include <hbframebackground.h>
+#include <hbparameterlengthlimiter.h>
 
 #include <cntservicescontact.h>
 #include <xqservicerequest.h>
@@ -110,6 +111,9 @@
 
 #include <nmcommon.h>
 
+// emailservices/nmutilities
+#include <nmuieventsnotifier.h>
+
 // nmailuiengine
 #include <nmuiengine.h>
 #include <nmmailboxmetadata.h>
--- a/emailuis/nmailui/nmailui.pro	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/nmailui.pro	Mon Aug 23 23:32:31 2010 +0300
@@ -11,6 +11,7 @@
 CONFIG += debug
 CONFIG += hb
 CONFIG += service
+CONFIG += no_icon
 
 SERVICE.FILE = service_conf.xml
 
--- a/emailuis/nmailui/src/nmapplication.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmapplication.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -48,7 +48,8 @@
   mSettingsViewLauncher(NULL),
   mViewReady(false),
   mQueryDialog(NULL),
-  mBackButtonPressed(false)
+  mBackButtonPressed(false),
+  mApplicationHidden(false)
 {
     TRAP_IGNORE(mUiEngine = NmUiEngine::instance());
     
@@ -197,16 +198,7 @@
     
     mMbListModel = &mUiEngine->mailboxListModel();
     
-    // ----------------------------------------------------------------------
-    // TODO: Remove or comment out the following code block when the mail
-    //       wizard starts to work with Mfe.
-    // ----------------------------------------------------------------------
-    // Start application to mailbox view. If started as service, there is no
-    // need to create views.
-    if (!service) {
-        NmUiStartParam *startParam = new NmUiStartParam(NmUiViewMailboxList);
-        enterNmUiView(startParam);
-    }
+
     // ----------------------------------------------------------------------
     
     if (mMainWindow) {
@@ -264,13 +256,16 @@
     }
     else if (event && event->type() == QEvent::ApplicationActivate) {
         NM_COMMENT("NmApplication::eventFilter ApplicationActivate");
+        mApplicationHidden = false;
 		// Update task switcher name & screenshot, we could have activated into some other mailbox
         updateActivity();
     }
     else if (event && event->type() == QEvent::ApplicationDeactivate) {
         NM_COMMENT("NmApplication::eventFilter ApplicationDeactivate");
         // Update the screenshot in the taskswitcher to represent current state
-        updateActivity();
+        if (!mApplicationHidden) {
+            updateActivity();
+        }
         // hide the sync indicator when app goes to background
         mUiEngine->enableSyncIndicator(false);
     }
@@ -284,18 +279,24 @@
 
 
 /*!
-    Push view to view stack.
+    Pushes the given view into the view stack. The new view is also activated
+    and shown. If the view stack contains other views, the one on the top is
+    hidden.
+
+    \param newView The view to push into the stack.
 */
 void NmApplication::pushView(NmBaseView *newView)
 {
     if (newView && mViewStack) {
-        NM_COMMENT("NmApplication::pushView() : view exists.");
+        NM_COMMENT("NmApplication::pushView(): The given view is valid.");
         newView->setNavigationAction(mBackAction);
         
-        // Store view to be hidden.
-        NmBaseView *hideView(NULL);
+        // Store the view to be hidden.
+        NmBaseView *viewToHide(NULL);
+
         if (!mViewStack->isEmpty()) {
-            hideView = mViewStack->top();
+            // The stack contains at least one other view.
+            viewToHide = mViewStack->top();
         }
 		else {
 			// viewReady should be informed immediately.
@@ -304,23 +305,26 @@
 			}
 		}
         
-        // Activate new view.
-    	NM_COMMENT("NmApplication::pushView() : add view.");
+        // Activate the new view.
+    	NM_COMMENT("NmApplication::pushView(): Adding the view into the stack.");
+
         mMainWindow->addView(newView);
         mViewStack->push(newView);
         mMainWindow->setCurrentView(newView);
-        mActiveViewId=newView->nmailViewId();
+        mActiveViewId = newView->nmailViewId();
         
-        // Set toolbars orientation.
+        // Set the orientation of the toolbar.
         HbToolBar *tb = newView->toolBar();
+
         if (tb) {
             tb->setOrientation(Qt::Horizontal);
         }
         
-        // Hide old view.
-        NM_COMMENT("NmApplication::pushView() : remove view.");
-        if (hideView) {
-            mMainWindow->removeView(hideView);
+        // Hide the old view.
+        NM_COMMENT("NmApplication::pushView(): Removing the previous view.");
+
+        if (viewToHide) {
+            mMainWindow->removeView(viewToHide);
         }
     }
 }
@@ -360,6 +364,8 @@
 */
 void NmApplication::hideApplication()
 {
+    mApplicationHidden = true;
+    
     // Hide the application
     XQServiceUtil::toBackground(true);
 
@@ -495,7 +501,7 @@
         
         if (startParam->service() && mMainWindow) {
 			// When the message list is started as a service previous views
-            // are removed from the stack. Open editors are not closed. Also
+            // are removed from the stack. Open editors are closed. Also
             // if the view is same than the new one, keep it open (reload the
             // content).
             
@@ -538,27 +544,37 @@
                 break;
                 case NmUiViewMessageList:
                 {
-                    // Check the topmost view. If it is an editor, do not open
-                    // a new mail list view.
-                    if (startParam->service() && !mViewStack->isEmpty() &&
+                    // Check the topmost view. If it is an editor, save to draft and close it.
+                    if (startParam->service() && !mViewStack->isEmpty() && 
                         mViewStack->top()->nmailViewId()==NmUiViewMessageEditor) {
-                        break;
+                        QMetaObject::invokeMethod(mViewStack->top(),
+                            "safeToDraft", Qt::DirectConnection);
+                        popView();
                     }
-                    NmMessageListModel *messageListModel = &mUiEngine->messageListModel(
-                                                startParam->mailboxId(), startParam->folderId());
-                    NmMessageListView *msgList =new NmMessageListView(
-                    		*this, startParam, *mUiEngine, *mMbListModel, messageListModel,
-                    		new HbDocumentLoader(mMainWindow));
+
+                    NmMessageListModel *messageListModel =
+                        &mUiEngine->messageListModel(startParam->mailboxId(),
+                                                     startParam->folderId());
+                    NmMessageListView *msgList =
+                        new NmMessageListView(*this, startParam, *mUiEngine,
+                                              *mMbListModel, messageListModel,
+                                              new HbDocumentLoader(mMainWindow));
                     pushView(msgList);
+                    
+                    // Inform other processes about this event.
+                    NmUiEventsNotifier::notifyViewStateChanged(NmUiEventsNotifier::NmViewShownEvent,
+                                                               NmUiViewMessageList,
+                                                               startParam->mailboxId());
                 }
                 break;
                 case NmUiViewMessageSearchList:
                 {
-                    // Check the topmost view. If it is an editor, do not open
-                    // a new mail search list view.
-                    if (startParam->service() && !mViewStack->isEmpty() &&
-                        mViewStack->top()->nmailViewId() == NmUiViewMessageEditor) {
-                        break;
+                    // Check the topmost view. If it is an editor, save to draft and close it.
+                    if (startParam->service() && !mViewStack->isEmpty() && 
+                        mViewStack->top()->nmailViewId()==NmUiViewMessageEditor) {
+                        QMetaObject::invokeMethod(mViewStack->top(),
+                            "safeToDraft", Qt::DirectConnection);
+                        popView();
                     }
                     
                     NmMessageListModel &model =
@@ -576,6 +592,13 @@
                             mMainWindow, *mAttaManager));
                     break;
                 case NmUiViewMessageEditor:
+                    // Check the topmost view. If it is an editor, save to draft and close it.
+                    if (startParam->service() && !mViewStack->isEmpty() && 
+                        mViewStack->top()->nmailViewId()==NmUiViewMessageEditor) {
+                        QMetaObject::invokeMethod(mViewStack->top(),
+                            "safeToDraft", Qt::DirectConnection);
+                        popView();
+                    }
                     pushView(new NmEditorView(*this, startParam, *mUiEngine, *mAttaManager));
                     break;
                 default:
@@ -746,14 +769,23 @@
 
 
 /*!
+   Check the foreground status of the application 
+   \return true if the application is in the foreground
+*/
+bool NmApplication::isForeground() const
+{
+    // At the moment there is no good way to check the foreground state.
+    QWindowSurface *surface = mMainWindow->windowSurface();
+    return (surface != 0);
+}
+
+/*!
 	Stores the visibility state, e.g. when the service was launched.
 	\return true if the app was visible.
 */
 bool NmApplication::updateVisibilityState()
 {
-    // At the moment there is no good way to check the foreground state.
-    QWindowSurface *surface = mMainWindow->windowSurface();
-	mForegroundService = (surface != 0);
+	mForegroundService = isForeground();
 	NM_COMMENT(QString("NmApplication::updateVisibilityState() : mForegroundService == %1").arg(mForegroundService));
 	return mForegroundService;
 }
@@ -768,25 +800,29 @@
     HbApplication* hbApp = dynamic_cast<HbApplication*>(parent());
 
     if (hbApp) {
-        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);
+                hbApp->activityManager()->removeActivity(NmActivityName);
+                hbApp->activityManager()->addActivity(NmActivityName, QVariant(), metadata);
+            }
+            else {
+                hbApp->activityManager()->removeActivity(NmActivityName);
+                TsTaskSettings tasksettings;
+                tasksettings.setVisibility(true);
+            }
         }
     }
 }
 
-
 /*!
 	Switch to activated mailbox
 */
--- a/emailuis/nmailui/src/nmattachmentpicker.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmattachmentpicker.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -71,6 +71,7 @@
 void NmAttachmentPicker::fetchVideo()
 {
     NM_FUNCTION;
+
     fetch(XQI_VIDEO_FETCH, XQOP_VIDEO_FETCH);
 }
 
@@ -94,6 +95,7 @@
 void NmAttachmentPicker::fetchCameraStill()
 {
     NM_FUNCTION;
+
     fetchFromCamera(NmAttachmentPickerStillMode);
 }
 
@@ -103,6 +105,7 @@
 void NmAttachmentPicker::fetchCameraVideo()
 {
     NM_FUNCTION;
+
     fetchFromCamera(NmAttachmentPickerVideoMode);
 }
 
@@ -153,6 +156,13 @@
         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);
+
         connect(mRequest, SIGNAL(requestOk(const QVariant&)),
                 this, SIGNAL(attachmentsFetchOk(const QVariant&)));
 
@@ -168,7 +178,9 @@
 */
 void NmAttachmentPicker::selectFetcher(HbListWidgetItem *listItem)
 {
-	QString itemText = listItem->text();
+    NM_FUNCTION;
+
+    QString itemText = listItem->text();
     if (itemText == hbTrId("txt_mail_list_photo")) {
         fetchImage();
     }
@@ -184,4 +196,17 @@
     else if (itemText == hbTrId("txt_mail_list_new_photo")) {
         fetchCameraStill();
 	}
+    else if (itemText == hbTrId("txt_mail_list_new_video")) {
+        fetchCameraVideo();
+    }
 }
+
+/*!
+    Sets the title used in the picker views
+*/
+void NmAttachmentPicker::setTitle(const QString &title)
+{
+    NM_FUNCTION;
+    
+    mTitle = title;
+}
--- a/emailuis/nmailui/src/nmeditorcontent.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorcontent.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -35,7 +35,6 @@
                                  NmApplication &application) :
     QObject(parent),
     mHeader(NULL),
-    mMessageBodyType(NmPlainText),
     mEditorWidget(NULL),
     mScrollArea(NULL),
     mScrollAreaContents(NULL),
@@ -89,55 +88,61 @@
 }
 
 /*!
-    Fill message data into header and body fileds. If reply envelopw is
-    present, reply header is generated and set to editor. Reply
-    envelope ownership is not transferred here.
+    Sets the body content. If reply envelopw is present, reply header is generated and set to 
+    editor. Reply envelope ownership is not transferred here.
  */
-void NmEditorContent::setMessageData(const NmMessage &originalMessage, 
-                                     NmUiEditorStartMode &editorStartMode)
+void NmEditorContent::setBodyContent(NmUiEditorStartMode editorStartMode,
+                                     const NmMessage *originalMessage, 
+                                     const QString *signature)
 {
     NM_FUNCTION;
     
     QString bodyContent;
+    
+    // first insert the signature
+    if (signature) {
+        bodyContent.append("<html><body><br><br>");
+        bodyContent.append(*signature);
+        bodyContent.append("<br></body></html>");
+    }
+    
 	QTextCursor cursor(mEditorWidget->document());
     
     // Create the "reply" header (also for forward message)
-    if (editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll || 
-        editorStartMode==NmUiEditorForward) {
+	// sets the font color of the reply header and the original body text to black
+    if ((editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll || 
+        editorStartMode==NmUiEditorForward) && originalMessage) {
 		bodyContent.append(QString("<style type=\"text/css\">* { color: black; }</style>"));
-        bodyContent.append(NmUtilities::createReplyHeader(originalMessage.envelope()));
+        bodyContent.append(NmUtilities::createReplyHeader(originalMessage->envelope()));
     }
     
     // Check which part is present. Html or plain text part. We use the original message parts.
-    const NmMessagePart *htmlPart = originalMessage.htmlBodyPart();
-    const NmMessagePart *plainPart = originalMessage.plainTextBodyPart();
+    const NmMessagePart *htmlPart = NULL;
+    const NmMessagePart *plainPart = NULL;
+    if (originalMessage) {
+        htmlPart = originalMessage->htmlBodyPart();
+        plainPart = originalMessage->plainTextBodyPart();
+    }
  
     if (htmlPart) {
         bodyContent.append(htmlPart->textContent());
         if(editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll ) {
             removeEmbeddedImages(bodyContent);
         }
-        cursor.insertHtml(bodyContent);
-        mMessageBodyType = NmHTMLText;
     }
     else if (plainPart) {
-        // Plain text part was present, set it to HbTextEdit
+        // Plain text part was present, set it to HbTextEdit as HTML
+        bodyContent.append(QString("<html><body><p>"));
         bodyContent.append(plainPart->textContent());
-        cursor.insertText(bodyContent);
-        mMessageBodyType = NmPlainText;
-        
-		// Next we set text color for black for all current content
-        QTextCharFormat blackForeground;
-    	blackForeground = cursor.charFormat();
-    	blackForeground.setForeground(Qt::black);
-    	cursor.select(QTextCursor::Document);
-    	cursor.mergeCharFormat(blackForeground);
+        bodyContent.append(QString("</p></body></html>"));
     }
+    cursor.insertHtml(bodyContent);
+
     // Update of the body width is done when next contentChanged signal comes from the body.
     mNeedForWidthAdjustment = true;
 	cursor.clearSelection();
 	cursor.setPosition(0);
-	cursor.insertHtml(QString("<html><body><br><br></body></html>"));
+	cursor.insertHtml(QString("<html><body></body></html>"));
 }  
 
 /*!
@@ -181,8 +186,8 @@
 
     // Listen scroll posion change signals for header reposition.
     connect(mScrollArea, SIGNAL(scrollPositionChanged(QPointF)),
-    		mHeader, SLOT(repositHeader(QPointF)));
-
+       		this, SLOT(repositHeader(QPointF)));
+    
     // Listen content change signal for body widget width adjustment.
     connect(mEditorWidget->document(), SIGNAL(contentsChanged()), this, 
         SLOT(setEditorContentWidth()), Qt::QueuedConnection);
@@ -313,3 +318,40 @@
     QRegExp regExp(NMUI_EDITOR_REMOVE_EMBD_IMAGES_REG, Qt::CaseInsensitive);
     bodyContent.remove(regExp);
 }
+
+/*!
+    This slot is called when scroll position has been changed.
+    Function create translation object which is used to set new position for
+    header so that header stays visible when body is scrolled horizontally.
+ */
+void NmEditorContent::repositHeader(const QPointF &scrollPosition)
+{
+    NM_FUNCTION;
+    
+    // Get the layout's left margin
+    qreal margin = 0;
+    HbStyle().parameter("hb-param-margin-gene-left", margin);
+    
+    // Calculate header width. (Screen width minus left and right margins.
+    qreal headerWidth = mApplication.screenSize().width() - margin - margin;
+
+    // Create translation object for header position adjustment.
+    QRectF editorBodyRect = mEditorWidget->geometry();
+    QTransform tr;
+    qreal leftMovementThreshold(editorBodyRect.width() - headerWidth);
+    if (scrollPosition.x() < 0) {
+        // Left side positioning. Allow left side baunch effect.
+        tr.translate(editorBodyRect.topLeft().x() - margin ,0);
+    }
+    else if (scrollPosition.x() >= 0 && scrollPosition.x() < leftMovementThreshold) {
+        // Middle area positioning
+        tr.translate(scrollPosition.x() ,0);
+    }
+    else {
+        // Right side positioning. Allow right side baunch effect.
+        tr.translate(editorBodyRect.topLeft().x() + leftMovementThreshold - margin ,0);
+    }
+    // Call header to perform the translation which moves hader to new position.
+    mHeader->repositHeader(tr);
+}
+
--- a/emailuis/nmailui/src/nmeditorheader.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorheader.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -490,20 +490,18 @@
 }
 
 /*!
-    This slot is called when scroll position has been changed.
-    Function set new positions for header fields so that header stays visible
-    when body is scrolled horizontally.
+    This function is called when scroll position has been changed.
+    Function performs the pre calculated translation to set new positions for header fields
+    so that header stays visible when body is scrolled horizontally.
  */
-void NmEditorHeader::repositHeader(const QPointF &scrollPosition)
+void NmEditorHeader::repositHeader(const QTransform &transform)
 {
     NM_FUNCTION;
     
-    QTransform tr;
-    tr.translate(scrollPosition.x(),0);
-    mToWidget->setTransform(tr);
-    mCcWidget->setTransform(tr);
-    mBccWidget->setTransform(tr);
-    mSubjectWidget->setTransform(tr);
-    mAttachmentListWidget->setTransform(tr);
+    mToWidget->setTransform(transform);
+    mCcWidget->setTransform(transform);
+    mBccWidget->setTransform(transform);
+    mSubjectWidget->setTransform(transform);
+    mAttachmentListWidget->setTransform(transform);
 }
 
--- a/emailuis/nmailui/src/nmeditorview.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmeditorview.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -58,7 +58,6 @@
       mAttachmentPicker(NULL),
       mCcBccFieldVisible(false),
       mServiceSendingDialog(NULL),
-      mIsNotFetchedBefore(true),
       mHiddenPriorityName(NmPriorityNormal)
 {
     NM_FUNCTION;
@@ -66,8 +65,6 @@
     mDocumentLoader	= new HbDocumentLoader();
     // Set object name
     setObjectName("NmEditorView");
-    // Set mailbox name to title pane
-    setMailboxName();
     // call the createToolBar on load view layout
     createToolBar();
     // Load view layout
@@ -301,23 +298,7 @@
     HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
     // The first action in dialogs action list is for the "Yes"-button.
     if (action == dlg->actions().at(0)) {
-        
-        // Update draft message with content.
-        updateMessageWithEditorContents();
-
-        // Save message to drafts
-        QList<NmOperation *> preliminaryOperations;
-        if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
-            preliminaryOperations.append(mAddAttachmentOperation);
-        }
-        if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
-            preliminaryOperations.append(mRemoveAttachmentOperation);
-        }
-        // ownership of mMessage is transferred
-        // NmOperations are automatically deleted after completion
-        mUiEngine.saveDraftMessage(mMessage, preliminaryOperations);
-        mMessage = NULL;
-        preliminaryOperations.clear();
+        safeToDraft();
     }    
     
     // Close the view
@@ -327,6 +308,29 @@
 }
 
 /*!
+    Public slot to handle draft saving.
+*/
+void NmEditorView::safeToDraft()
+{
+    // Update draft message with content.
+    updateMessageWithEditorContents();
+
+    // Save message to drafts
+    QList<NmOperation *> preliminaryOperations;
+    if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
+        preliminaryOperations.append(mAddAttachmentOperation);
+    }
+    if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
+        preliminaryOperations.append(mRemoveAttachmentOperation);
+    }
+    // ownership of mMessage is transferred
+    // NmOperations are automatically deleted after completion
+    mUiEngine.saveDraftMessage(mMessage, preliminaryOperations);
+    mMessage = NULL;
+    preliminaryOperations.clear();
+}
+
+/*!
     About to exit view. Application calls this function when user has
     pressed back key and editor needs to delete the draft message. This is
     called when "auto-exiting" after a successful mail sending.
@@ -356,6 +360,9 @@
 void NmEditorView::viewReady()
 {
     NM_FUNCTION;
+
+    // Set mailbox name to title pane
+    setMailboxName();
     
     // Connect options menu about to show to create options menu function
     // Menu needs to be create "just-in-time"
@@ -389,6 +396,9 @@
     else { // execution cannot proceed without start param 
         QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
     }
+    
+    // Adjust the header width according to the current screen width.
+    mHeaderWidget->adjustHeaderWidth(); 
 }
 
 /*!
@@ -400,24 +410,20 @@
 {
     NM_FUNCTION;
     
-    if (mIsNotFetchedBefore == true) {
-        if (startParam.editorStartMode() == NmUiEditorForward
-            || startParam.editorStartMode()== NmUiEditorReply
-            || startParam.editorStartMode() == NmUiEditorReplyAll) {
-        
-            fetchProgressDialogShow();
-            mAttaManager.clearObserver();
-            mAttaManager.setObserver(this);
-            mAttaManager.fetchAllMessageParts(
-                startParam.mailboxId(),
-                startParam.folderId(),
-                startParam.messageId());
-        }
-        else {
-            startMessageCreation(startParam);
-        }
-        
-        mIsNotFetchedBefore = false;
+    if (startParam.editorStartMode() == NmUiEditorForward
+        || startParam.editorStartMode()== NmUiEditorReply
+        || startParam.editorStartMode() == NmUiEditorReplyAll) {
+    
+        fetchProgressDialogShow();
+        mAttaManager.clearObserver();
+        mAttaManager.setObserver(this);
+        mAttaManager.fetchAllMessageParts(
+            startParam.mailboxId(),
+            startParam.folderId(),
+            startParam.messageId());
+    }
+    else {
+        startMessageCreation(startParam);
     }
 }
 
@@ -443,34 +449,30 @@
         startMessageCreation(*mStartParam);
     }
     else {
-        // Show the fetching failed note only when
-        // the error is not Device/System errors, 
+        // Close "Loading mail content" dialog
+        mWaitDialog->close();
+        
+        // Show a fetching failed note when the failure is not caused by a Device/System failure.
         if (result != NmNoError && 
             result != NmNotFoundError &&
             result != NmGeneralError &&
             result != NmCancelError &&
             result != NmAuthenticationError &&
             result != NmServerConnectionError &&
-            result != NmConnectionError) {
-            
-            HbNotificationDialog *note = new HbNotificationDialog(); 
-            
+            result != NmConnectionError) {         
+            HbNotificationDialog *note = new HbNotificationDialog();            
             bool enalbeAttribute(true);
-            note->setAttribute(Qt::WA_DeleteOnClose, enalbeAttribute);
-            
-            note->setIcon(HbIcon(QLatin1String("note_warning")));
-            
+            note->setAttribute(Qt::WA_DeleteOnClose, enalbeAttribute);           
+            note->setIcon(HbIcon(QLatin1String("note_warning")));        
             note->setTitle(hbTrId("txt_mail_dpopinfo_loading_failed"));
-            note->setTitleTextWrapping(Hb::TextWordWrap);
-            
+            note->setTitleTextWrapping(Hb::TextWordWrap);      
             note->setDismissPolicy(HbNotificationDialog::TapAnywhere);
-            note->setTimeout(HbNotificationDialog::StandardTimeout);
-            
+            note->setTimeout(HbNotificationDialog::StandardTimeout);       
             note->setSequentialShow(true);
             note->show();
         }
         
-        mWaitDialog->close();         
+        // Go back to Viewer view
         QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
     }
 }
@@ -498,11 +500,15 @@
 {
     NM_FUNCTION;
     
-    if (mAttaManager.isFetching()) {
+    if (mAttaManager.isFetching()) { 
         mAttaManager.cancelFetch();
         mAttaManager.clearObserver();
     }
-    QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+    else {   
+        // For those email has no attachment or attachment has fetched.
+        // Go back to Viewer view.
+        QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+    }
 }
 
 void NmEditorView::startMessageCreation(NmUiStartParam &startParam)
@@ -566,10 +572,12 @@
     
     if (invalidAddresses.count() > 0) {
         
-        // invalid addresses found, verify send from user
-        QString noteText = hbTrId("txt_mail_dialog_invalid_mail_address_send");
-        // set the first failing address to the note
-        noteText = noteText.arg(invalidAddresses.at(0).address());
+        // Invalid addresses found, verify send from user.
+        // Set the first failing address to the note.
+        QString noteText = 
+            HbParameterLengthLimiter(
+                "txt_mail_dialog_invalid_mail_address_send"
+                ).arg(invalidAddresses.at(0).address());
         
         if (mQueryDialog) {
             delete mQueryDialog;
@@ -790,7 +798,8 @@
     if (ccAddressesString.length() || bccAddressesString.length()) {
         // Since cc or/and bcc recipients exist, expand the group box to display
         // the addresses by expanding the group box.
-        mContent->header()->setFieldVisibility(true);
+        mCcBccFieldVisible = true;
+        mHeaderWidget->setFieldVisibility(mCcBccFieldVisible);
     }
 
     // Set subject.
@@ -814,6 +823,8 @@
     }
     mHeaderWidget->setPriority(messageEnvelope.priority());
     
+    NmMessage *originalMessage = NULL;
+    
     // Set the message body.
     if (editorStartMode==NmUiEditorReply||
         editorStartMode==NmUiEditorReplyAll||
@@ -821,9 +832,9 @@
         editorStartMode==NmUiEditorFromDrafts){
 
         // Use the body from the original message.
-        NmMessage *originalMessage = mUiEngine.message(mStartParam->mailboxId(), 
-                                                       mStartParam->folderId(), 
-                                                       mStartParam->messageId());
+        originalMessage = mUiEngine.message(mStartParam->mailboxId(), 
+                                            mStartParam->folderId(), 
+                                            mStartParam->messageId());
 
         if (originalMessage) {
             NmMessagePart *plainPart = originalMessage->plainTextBodyPart();
@@ -844,13 +855,22 @@
                                                *htmlPart);
             }
 
-		mContent->setMessageData(*originalMessage, editorStartMode);
         }
 
-        delete originalMessage;
-        originalMessage = NULL;
     }
     
+    QString *signature = NULL;
+    // return value is not relevant here
+    mUiEngine.getSignature(mStartParam->mailboxId(), signature);
+    
+    mContent->setBodyContent(editorStartMode, originalMessage, signature);
+
+    delete signature;
+    signature = NULL;
+
+    delete originalMessage;
+    originalMessage = NULL;
+
     // Get list of attachments from the message and set those into UI attachment list
     QList<NmMessagePart*> attachments;
     mMessage->attachmentList(attachments);
@@ -901,8 +921,11 @@
                 
                 if (extension && mAttachmentPicker) {
                     connect(mAttachmentPicker, SIGNAL(attachmentsFetchOk(const QVariant &)),
-                        this, SLOT(onAttachmentReqCompleted(const QVariant &)));            
+                        this, SLOT(onAttachmentReqCompleted(const QVariant &)));
                     
+                    connect(this, SIGNAL(titleChanged(QString)), mAttachmentPicker,
+                        SLOT(setTitle(QString)));
+
                     list[i]->setToolBarExtension(extension);
                     
                     //content widget to get the items to a list
@@ -1545,6 +1568,11 @@
             NmAction *action = static_cast<NmAction *>(toolbarList[i]);
             if (action->availabilityCondition() == NmAction::NmAttachable) {
                 action->setEnabled(enable);
+                if (enable) {
+                    // For some reason 'Add attachment' toolbar button stays dimmed sometimes,
+                    // showItems will fix the situation.
+                    showItems(Hb::ToolBarItem);
+                }
             }
         }
     }
--- a/emailuis/nmailui/src/nmmailboxserviceinterface.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmmailboxserviceinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -69,14 +69,13 @@
     // Make sure that app stays background if user presses back in message list view
     bool visible = mApplication->updateVisibilityState();
 
-    // Verify that the ID matches one of the existing mailboxes.
     if (mailboxExistsById(mailboxNmId)) {
-
-        // Get standard folder inbox id.
-        const NmId inboxId = mUiEngine.standardFolderId(mailboxNmId, NmFolderInbox);
-
+        // Fetch inbox id
+        NmId inboxId = mUiEngine.standardFolderId(mailboxNmId, NmFolderInbox);
         // Bring the application to the foreground.
-        XQServiceUtil::toBackground(false);
+        if (!XQServiceUtil::isEmbedded()) {
+            XQServiceUtil::toBackground(false);
+        }
         if (mApplication) {
             HbMainWindow *mainWindow = mApplication->mainWindow();
             mainWindow->show();
@@ -93,11 +92,11 @@
                                    true); // start as service
             mApplication->enterNmUiView(startParam);
         }
-       
+
         completeRequest(mAsyncReqId, 0);
     }
     else {
-        // No mailbox found with the given ID.
+        // No mailbox found with the given ID or Inbox ID is not known
 
         // if started as embedded, do not hide the app
 		if (!XQServiceUtil::isEmbedded() && !visible) {
@@ -138,7 +137,7 @@
         mailbox = mailboxListModel.data(modelIndex);
         mailboxMetaData = mailbox.value<NmMailboxMetaData*>();
         if (mailboxMetaData) {
-            currentId = mailboxMetaData->id();        
+            currentId = mailboxMetaData->id();
         }
 
         if (currentId.id() == mailboxId.id()) {
--- a/emailuis/nmailui/src/nmmessagelistview.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagelistview.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -116,7 +116,8 @@
             mMessageListWidget->setScrollDirections(Qt::Vertical);
             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 &
@@ -231,7 +232,7 @@
     // Check start parameter validity, message view cannot
     // be updated if given parameter is zero.
     if (startParam&&startParam->viewId()==NmUiViewMessageList &&
-        startParam->folderId()!=0) {
+        startParam->mailboxId() != 0 ) {
         // Delete existing start parameter data
         delete mStartParam;
         mStartParam = NULL;
@@ -253,13 +254,20 @@
         setMailboxName();
         
         // Store active folder type
-        mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+        mCurrentFolderType=NmFolderInbox;
+        if (startParam->folderId()!=0){
+            mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());        
+        }
 
         // Update folder name
         setFolderName();
         
         // Set sync icon if needed
         updateSyncIcon();
+        
+        // Reconstruct the tool bar. This needed because, for example, the
+        // search button needs the new mailbox ID.
+        createToolBar();
     }
     else {
         NM_ERROR(1,"nmailui: invalid message list start parameter");
@@ -279,23 +287,30 @@
     return NmUiViewMessageList;
 }
 
+
 /*!
-    Refresh list
+    Refresh the message list.
 */
 void NmMessageListView::refreshList()
 {
     NM_FUNCTION;
 
     if (mMessageListModel) {
-        NmId mailboxId = mMessageListModel->currentMailboxId();
-        // In each refresh, e.g. in folder change the UI signals
-        // lower layer about the folder that has been opened.
+        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){
             mUiEngine.updateActiveFolder(mailboxId, mStartParam->folderId());
 
-            NmFolderType folderType = mUiEngine.folderTypeById(mStartParam->mailboxId(),
-                                              mStartParam->folderId());
-            if (folderType == NmFolderInbox) { // If the new folder is an inbox, first automatic sync should be shown
+            NmFolderType folderType(NmFolderInbox);
+            if (mStartParam->folderId()!= 0){
+                folderType = mUiEngine.folderTypeById(mStartParam->mailboxId(),
+                             mStartParam->folderId());
+            }
+
+            // If the new folder is an inbox, first automatic sync should be shown
+            if (folderType == NmFolderInbox) {
                 mIsFirstSyncInMessageList = true;
             }
         }
@@ -303,24 +318,32 @@
         // 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);
+                this, SLOT(itemsAdded(const QModelIndex&,int,int)),Qt::UniqueConnection);
             QObject::connect(mMessageListModel, SIGNAL(rowsRemoved(const QModelIndex&,int,int)),
-                    this, SLOT(itemsRemoved()),Qt::UniqueConnection);
+                this, SLOT(itemsRemoved()),Qt::UniqueConnection);
             QObject::connect(mMessageListModel, SIGNAL(setNewParam(NmUiStartParam*)),
-                    this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
+                this, SLOT(reloadViewContents(NmUiStartParam*)),Qt::UniqueConnection);
 
             mPreviousModelCount=mMessageListModel->rowCount();
-            if (mPreviousModelCount==0){
+
+            if (mPreviousModelCount == 0) {
                 showNoMessagesText();
             }
-            else{
+            else {
                 hideNoMessagesText();
             }
         }
+
+        // Notify the mail agent. 
+        NmUiEventsNotifier::notifyViewStateChanged(NmUiEventsNotifier::NmViewShownEvent,
+                                                   NmUiViewMessageList,
+                                                   mStartParam->mailboxId());
     }
 }
 
+
 /*!
     Sync state event handling
 */
@@ -340,7 +363,10 @@
             // Show sync icon only for the first automatic sync after opening message list.
             // Sync icon for manual sync is shown in NmUiEngine::refreshMailbox, not here.
             if (mIsFirstSyncInMessageList) {
-				mUiEngine.enableSyncIndicator(true);
+                // Show the indicator only if the application is in the foreground
+                if (mApplication.isForeground()) {
+                    mUiEngine.enableSyncIndicator(true);
+                }
                 mIsFirstSyncInMessageList = false;
             }
         }
@@ -363,7 +389,10 @@
                                                         mSelectedMailboxId,
                                                         mSelectedFolderId);
         // Store active folder type
-        mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());
+        mCurrentFolderType=NmFolderInbox;
+        if (startParam->folderId()!=0){
+            mCurrentFolderType = mUiEngine.folderTypeById(startParam->mailboxId(),startParam->folderId());        
+        }
         // Reload view, ownership of the startparams is passed and old startparams
         // are deleted within reloadViewContents function
         reloadViewContents(startParam);
--- a/emailuis/nmailui/src/nmmessagelistviewitem.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagelistviewitem.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -134,8 +134,11 @@
 }
 
 /*!
-    Set item text label contents, icons, etc.
-    Function does not take ownership of model or model item.
+    Sets the item text label contents, icons, etc. The method does not take
+    ownership of model or model item.
+
+    \param envelope The message envelope.
+    \param dividersActive 
 */
 void NmMessageListViewItem::setContentsToMessageItem(const NmMessageEnvelope &envelope, 
                                                      bool dividersActive)
@@ -143,11 +146,13 @@
     // Member variables are created in previous function.
     // Sender.
     mSender->setText(senderFieldText(envelope));
+
     // Time.
     HbExtendedLocale locale = HbExtendedLocale::system();
     QDateTime localTime = envelope.sentTime().addSecs(locale.universalTimeOffset());
     QDate sentLocalDate = localTime.date();
     QDate currentdate = QDate::currentDate();
+
     if (dividersActive || sentLocalDate == currentdate) {
         QString shortTimeSpec = r_qtn_time_usual;
         QTime time = localTime.time();
@@ -156,46 +161,66 @@
         QString shortDateSpec = r_qtn_date_without_year;
         mTime->setText(locale.format(sentLocalDate, shortDateSpec));
     }
+
     // Subject.
     QString subjectText = envelope.subject();
+
     if (subjectText.length()) {
         mSubject->setText(subjectText);
     } else {
         mSubject->setText(hbTrId("txt_mail_dblist_val_no_subject"));
     }
+
     // Priority.
     bool priorityIs(false);
+
+    mIcon1->setIcon(HbIcon());
+    mIcon1->setObjectName(QString());
     mIcon1->hide();
+    mIcon2->setIcon(HbIcon());
+    mIcon2->setObjectName(QString());
     mIcon2->hide();
+
     switch (envelope.priority()) {
-        case NmMessagePriorityLow:
+        case NmMessagePriorityLow: {
             priorityIs = true;
             mIcon1->setObjectName("ListViewItemMessageIconPriorityLow");
             mIcon1->setIcon(NmIcons::getIcon(NmIcons::NmIconPriorityLow));
             mIcon1->show();
             break;
-        case NmMessagePriorityHigh:
+        }
+        case NmMessagePriorityHigh: {
             priorityIs = true;
             mIcon1->setObjectName("ListViewItemMessageIconPriorityHigh");
             mIcon1->setIcon(NmIcons::getIcon(NmIcons::NmIconPriorityHigh));
             mIcon1->show();
             break;
-        case NmMessagePriorityNormal:
+        }
+        case NmMessagePriorityNormal: {
+            break;
+        }
         default:
             break;
     }
     // Attachments.
     HbIconItem *attaIcon = (priorityIs ? mIcon2 : mIcon1);
+
     if (envelope.hasAttachments()) {
         HbIcon &icon = NmIcons::getIcon(NmIcons::NmIconAttachment);
         attaIcon->setIcon(icon);
         attaIcon->setObjectName("ListViewItemMessageIconAttachment");
         attaIcon->show();
     }
+    else {
+        attaIcon->setIcon(HbIcon());
+        attaIcon->setObjectName(QString());
+    }
+
     // Message read status.
     bool msgReadStatus(envelope.isRead());
     HbFrameDrawer *drawer(NULL);
     HbStyle::setItemName(mNewMsgIcon, "msgicon");
+
     if (!msgReadStatus) {
         setFontsUnread();
         mNewMsgIcon->setObjectName("ListViewItemMessageIconUnread");
--- a/emailuis/nmailui/src/nmmessagesearchlistview.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmmessagesearchlistview.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -238,7 +238,8 @@
             mMessageListWidget->setScrollDirections(Qt::Vertical);
             mMessageListWidget->setClampingStyle(HbScrollArea::BounceBackClamping);
             mMessageListWidget->setFrictionEnabled(true);
-
+            mMessageListWidget->setItemPixmapCacheEnabled(true);
+            
             // We want the search results to appear one by one.
             mMessageListWidget->setEnabledAnimations(HbAbstractItemView::Appear &
                                                      HbAbstractItemView::Expand);
@@ -349,7 +350,7 @@
     if (resultCount) {
         if (mInfoLabel) {
             // Display the result count on the info label.
-            QString resultsString(hbTrId("txt_mail_list_search_results").arg(resultCount));
+            QString resultsString(hbTrId("txt_mail_list_search_results",resultCount));
             mInfoLabel->setHeading(resultsString);
 
             if (!mInfoLabel->isVisible()) {
--- a/emailuis/nmailui/src/nmsendserviceinterface.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmsendserviceinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -375,6 +375,10 @@
                     new NmMailboxSelectionDialog(mUiEngine.mailboxListModel());
             }
 
+            if (!XQServiceUtil::isEmbedded()) {
+                XQServiceUtil::toBackground(false);
+            }
+            
             connect(mSelectionDialog, SIGNAL(selectionDialogClosed(NmId&)),
                     this, SLOT(selectionDialogClosed(NmId&)));
             mSelectionDialog->open();
@@ -400,6 +404,11 @@
     }
 
     if (mStartParam) {
+        // Make sure the NMail application is in the foreground
+        if (!XQServiceUtil::isEmbedded()) {
+            XQServiceUtil::toBackground(false);    
+        }
+        
         mStartParam->setMailboxId(mailboxId);
         mApplication->enterNmUiView(mStartParam);
         mStartParam = NULL; // ownership passed
--- a/emailuis/nmailui/src/nmuriserviceinterface.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmuriserviceinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -254,8 +254,6 @@
         cancelService();
     }
     else { // count > 0
-        // Make sure the NMail application is in the foreground.
-        XQServiceUtil::toBackground(false);
         if (mainWindow) {
             mainWindow->show();        
         }
@@ -287,6 +285,11 @@
                 mSelectionDialog =
                     new NmMailboxSelectionDialog(mUiEngine.mailboxListModel());
             }
+            
+            if (!XQServiceUtil::isEmbedded()) {
+                XQServiceUtil::toBackground(false);
+            }
+            
             connect(mSelectionDialog,SIGNAL(selectionDialogClosed(NmId&)),
                 this,SLOT(selectionDialogClosed(NmId&)));
             mSelectionDialog->open();
@@ -314,6 +317,11 @@
     }
 
     if (mStartParam) {
+        // Make sure the NMail application is in the foreground
+        if (!XQServiceUtil::isEmbedded()) {
+            XQServiceUtil::toBackground(false);    
+        }
+        
         mStartParam->setMailboxId(mailboxId);
         mApplication->enterNmUiView(mStartParam);
         mStartParam = NULL; // ownership passed
--- a/emailuis/nmailui/src/nmutilities.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmutilities.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -294,6 +294,8 @@
     NM_FUNCTION;
 
     QString ret = "<html><body>";
+    // Two empty lines before reply header.
+    ret+="<br><br>";
     // Append "----- Original message ----" text
     ret+=hbTrId("txt_mail_editor_reply_original_msg");
     // Append sender
--- a/emailuis/nmailui/src/nmviewerserviceinterface.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerserviceinterface.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -70,7 +70,9 @@
     NmMessage *message = mUiEngine.message( mailboxNmId, folderNmId, messageNmId );
     if (message) {
         // bring application to foreground
-        XQServiceUtil::toBackground(false);
+        if (!XQServiceUtil::isEmbedded()) {
+            XQServiceUtil::toBackground(false);
+        }
         HbMainWindow *mainWindow = mApplication->mainWindow();
         mainWindow->show();
 
--- a/emailuis/nmailui/src/nmviewerview.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerview.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -710,6 +710,8 @@
         QSizeF contentSize = page->mainFrame()->contentsSize();
         mWebView->setPreferredSize(contentSize);
     }
+    // Workaround for scrolling problem
+    scene()->setProperty("overridingGesture",QVariant());
 }
 
 /*!
Binary file emailuis/nmailui/translations/mail.qm has changed
--- a/emailuis/nmailui/translations/mail.ts	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailui/translations/mail.ts	Mon Aug 23 23:32:31 2010 +0300
@@ -152,16 +152,6 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_button_send">
-    <comment>Toolbar button for sending the mail</comment>        
-    <source>Send</source>
-    <translation variants="yes" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_004</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_dialog_cannot_download_attachment_1">
     <comment>Error note. If the user tries to open / save an attachment but downloading it for server fails for some reason. %[]1 is replaced with the name of the attachment.</comment>        
     <source>Cannot download attachment: %[]1 </source>
@@ -232,16 +222,6 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_opt_settings">
-    <comment>Options menu item for opening settings.</comment>        
-    <source>Settings</source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_001_a</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_button_new_mail">
     <comment>Toolbar button for creating a new mail.</comment>        
     <source>New</source>
@@ -312,16 +292,6 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_delete">
-    <comment>Item specific option for deleting the highlighted mail</comment>        
-    <source>Delete</source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_001_c</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_editor_reply_subject">
     <comment>Original message header data in the editor. Followed by the subject of the message.</comment>        
     <source>Subject:</source>
@@ -492,6 +462,16 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_list_search">
+    <comment>Toolbar button for opening the search view</comment>        
+    <source>Search</source>
+    <translation variants="yes" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>    
+    <extra-loc-viewid>mail_001</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>mail</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_status_menu_unset">
     <comment>Primary text for status menu item: indicates that there are unsent messages in outbox. %[]1 is account name. The number of unsent mails is not going to be shown here.</comment>        
     <source>%[]1: Unsent</source>
@@ -544,7 +524,7 @@
 </message>
 <message numerus="no" id="txt_mail_list_new_video">
     <comment>Attach toolbar extension item in the editor, opens camera for taking a new video</comment>        
-    <source>New video</source>
+    <source>Camcorder</source>
     <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>    
     <extra-loc-viewid>mail_004_b</extra-loc-viewid>
@@ -565,23 +545,13 @@
 <message numerus="no" id="txt_mail_dialog_select_file">
     <comment>Title text in file picker view. File picker view is opened when the user selects &quot;Other&quot; option from attachment list. For attaching files to mail messages. Underneath a list of selectable files is displayed.</comment>        
     <source>Select file</source>
-    <translation variants="no" type="unfinished"></translation>
+    <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
     <extra-loc-viewid>mail_007</extra-loc-viewid>
     <extra-loc-positionid>dpophead</extra-loc-positionid>
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_open">
-    <comment>Item specific option for opening the highlighted mail. </comment>        
-    <source>Open</source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_001_c</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_title_control_panel">
     <comment>Name of the Mail application in control panel under applications. Opens mail settings. </comment>        
     <source>Mail</source>
@@ -685,7 +655,7 @@
 <message numerus="no" id="txt_mail_dialog_send_via">
     <comment>Title for send via dialog. This dialog lists all mailboxes the user has. Underneath the title, a list of mailboxes is displayed. </comment>        
     <source>Send via</source>
-    <translation variants="no" type="unfinished"></translation>
+    <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
     <extra-loc-viewid>mail</extra-loc-viewid>
     <extra-loc-positionid>dialog</extra-loc-positionid>
@@ -722,16 +692,6 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_mail_dpophead_1_deleted">
-    <comment>Confirmation note shown after the mailbox is deleted succesfully.</comment>        
-    <source>Mailbox deleted. </source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_006</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_editor_reply_original_msg">
     <comment>Original message header data in the editor. Separates the original mail message from the edit area of the new message the user is typing.</comment>        
     <source>---- Original message ----</source>
@@ -742,16 +702,6 @@
     <extra-loc-feature>mail</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_common_menu_remove">
-    <comment>Item specific menu item for removing the focused attachment in mail editor</comment>        
-    <source>Remove</source>
-    <translation variants="no" type="unfinished"></translation>
-    <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>    
-    <extra-loc-viewid>mail_004</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>mail</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_mail_dialog_delete_mail">
     <comment>Confirmation query after selecting delete in mail viewer</comment>        
     <source>Delete mail?</source>
@@ -765,7 +715,7 @@
 <message numerus="no" id="txt_mail_select_contacts">
     <comment>Title text shown in status pane when contacts are fetched from Phonebook.</comment>        
     <source>Select contacts</source>
-    <translation variants="no" type="unfinished"></translation>
+    <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>    
     <extra-loc-viewid>mail</extra-loc-viewid>
     <extra-loc-positionid>dpophead</extra-loc-positionid>
@@ -895,7 +845,7 @@
 <message numerus="no" id="txt_mail_button_download_rest">
     <comment>Button that is shown if all the message content is not downloaded while message is opened.</comment>        
     <source>Download rest</source>
-    <translation variants="no" type="unfinished"></translation>
+    <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_dataform_button_sec</extra-loc-layout_id>    
     <extra-loc-viewid>mail_002_b</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
@@ -1064,7 +1014,7 @@
 </message>
 <message numerus="no" id="txt_mail_list_new_photo">
     <comment>Attach toolbar extension item in the editor, opens camera for taking a new photo</comment>        
-    <source>New photo</source>
+    <source>Camera</source>
     <translation variants="yes" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>    
     <extra-loc-viewid>mail_004_b</extra-loc-viewid>
--- a/emailuis/nmailuiengine/bwins/nmailuiengineu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/bwins/nmailuiengineu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -69,168 +69,168 @@
 	?sendMail@NmBaseClientPlugin@@QAEXXZ @ 68 NONAME ; void NmBaseClientPlugin::sendMail(void)
 	?insertNewMessageIntoModel@NmMessageListModel@@AAEXABVNmId@@00@Z @ 69 NONAME ; void NmMessageListModel::insertNewMessageIntoModel(class NmId const &, class NmId const &, class NmId const &)
 	?getStaticMetaObject@NmUiEngine@@SAABUQMetaObject@@XZ @ 70 NONAME ; struct QMetaObject const & NmUiEngine::getStaticMetaObject(void)
-	?getPluginIdByMailboxId@NmUiEngine@@QAE?AVNmId@@I@Z @ 71 NONAME ; class NmId NmUiEngine::getPluginIdByMailboxId(unsigned int)
-	?applicationStateInterfaceInstance@NmDataPluginFactory@@AAEPAVNmApplicationStateInterface@@PAVQObject@@@Z @ 72 NONAME ; class NmApplicationStateInterface * NmDataPluginFactory::applicationStateInterfaceInstance(class QObject *)
-	?metaObject@NmMessageListModel@@UBEPBUQMetaObject@@XZ @ 73 NONAME ; struct QMetaObject const * NmMessageListModel::metaObject(void) const
-	?messageBeingSent@NmUiEngine@@QBEPBVNmMessage@@XZ @ 74 NONAME ; class NmMessage const * NmUiEngine::messageBeingSent(void) const
-	?handleMailboxEvent@NmUiEngine@@AAEXW4NmMailboxEvent@@ABV?$QList@VNmId@@@@@Z @ 75 NONAME ; void NmUiEngine::handleMailboxEvent(enum NmMailboxEvent, class QList<class NmId> const &)
-	?interfaceInstance@NmDataPluginFactory@@QAEPAVNmDataPluginInterface@@VNmId@@@Z @ 76 NONAME ; class NmDataPluginInterface * NmDataPluginFactory::interfaceInstance(class NmId)
-	?goOffline@NmBaseClientPlugin@@AAEXABVNmId@@@Z @ 77 NONAME ; void NmBaseClientPlugin::goOffline(class NmId const &)
-	?sendMessage@NmUiEngine@@QAEXPAVNmMessage@@ABV?$QList@PAVNmOperation@@@@@Z @ 78 NONAME ; void NmUiEngine::sendMessage(class NmMessage *, class QList<class NmOperation *> const &)
-	?tr@NmDataManager@@SA?AVQString@@PBD0H@Z @ 79 NONAME ; class QString NmDataManager::tr(char const *, char const *, int)
-	??0NmMailboxListModel@@QAE@AAVNmDataManager@@PAVQObject@@@Z @ 80 NONAME ; NmMailboxListModel::NmMailboxListModel(class NmDataManager &, class QObject *)
-	?handleMessageEvent@NmMessageListModel@@QAEXW4NmMessageEvent@@ABVNmId@@ABV?$QList@VNmId@@@@1@Z @ 81 NONAME ; void NmMessageListModel::handleMessageEvent(enum NmMessageEvent, class NmId const &, class QList<class NmId> const &, class NmId const &)
-	?setPriorityNormal@NmBaseClientPlugin@@QAEXXZ @ 82 NONAME ; void NmBaseClientPlugin::setPriorityNormal(void)
-	??_ENmMessageSendingOperation@@UAE@I@Z @ 83 NONAME ; NmMessageSendingOperation::~NmMessageSendingOperation(unsigned int)
-	?changed@NmMessageListModel@@AAE_NABVNmMessageEnvelope@@0@Z @ 84 NONAME ; bool NmMessageListModel::changed(class NmMessageEnvelope const &, class NmMessageEnvelope const &)
-	?openAttachment@NmBaseClientPlugin@@QAEXXZ @ 85 NONAME ; void NmBaseClientPlugin::openAttachment(void)
-	?staticMetaObject@NmMessageCreationOperation@@2UQMetaObject@@B @ 86 NONAME ; struct QMetaObject const NmMessageCreationOperation::staticMetaObject
-	?handleMailboxEvent@NmMailboxListModel@@QAEXW4NmMailboxEvent@@ABV?$QList@VNmId@@@@@Z @ 87 NONAME ; void NmMailboxListModel::handleMailboxEvent(enum NmMailboxEvent, class QList<class NmId> const &)
-	?metaObject@NmStoreEnvelopesOperation@@UBEPBUQMetaObject@@XZ @ 88 NONAME ; struct QMetaObject const * NmStoreEnvelopesOperation::metaObject(void) const
-	?trUtf8@NmMailboxListModel@@SA?AVQString@@PBD0H@Z @ 89 NONAME ; class QString NmMailboxListModel::trUtf8(char const *, char const *, int)
-	?mPluginArray@NmDataPluginFactory@@0PAV?$QList@PAVQObject@@@@A @ 90 NONAME ; class QList<class QObject *> * NmDataPluginFactory::mPluginArray
-	?instance@NmDataPluginFactory@@SAPAV1@XZ @ 91 NONAME ; class NmDataPluginFactory * NmDataPluginFactory::instance(void)
-	?getStaticMetaObject@NmMessageListModel@@SAABUQMetaObject@@XZ @ 92 NONAME ; struct QMetaObject const & NmMessageListModel::getStaticMetaObject(void)
-	?deleteMessageFromViewerView@NmBaseClientPlugin@@QAEXXZ @ 93 NONAME ; void NmBaseClientPlugin::deleteMessageFromViewerView(void)
-	?tr@NmUiEngine@@SA?AVQString@@PBD0H@Z @ 94 NONAME ; class QString NmUiEngine::tr(char const *, char const *, int)
-	?refresh@NmMessageListModel@@QAEXVNmId@@0ABV?$QList@PAVNmMessageEnvelope@@@@@Z @ 95 NONAME ; void NmMessageListModel::refresh(class NmId, class NmId, class QList<class NmMessageEnvelope *> const &)
-	?mailboxById@NmUiEngine@@QAEPAVNmMailboxMetaData@@ABVNmId@@@Z @ 96 NONAME ; class NmMailboxMetaData * NmUiEngine::mailboxById(class NmId const &)
-	?createNewMessage@NmUiEngine@@QAE?AV?$QPointer@VNmMessageCreationOperation@@@@ABVNmId@@@Z @ 97 NONAME ; class QPointer<class NmMessageCreationOperation> NmUiEngine::createNewMessage(class NmId const &)
-	??_ENmMessageListModelItem@@UAE@I@Z @ 98 NONAME ; NmMessageListModelItem::~NmMessageListModelItem(unsigned int)
-	?replyAllMail@NmBaseClientPlugin@@QAEXXZ @ 99 NONAME ; void NmBaseClientPlugin::replyAllMail(void)
-	?handleMatchFound@NmUiEngine@@AAEXABVNmId@@0@Z @ 100 NONAME ; void NmUiEngine::handleMatchFound(class NmId const &, class NmId const &)
-	?syncStateEvent@NmUiEngine@@IAEXW4NmSyncState@@ABVNmId@@@Z @ 101 NONAME ; void NmUiEngine::syncStateEvent(enum NmSyncState, class NmId const &)
-	?refreshModelItem@NmMailboxListModel@@QAEXABVNmId@@@Z @ 102 NONAME ; void NmMailboxListModel::refreshModelItem(class NmId const &)
-	?trUtf8@NmDataManager@@SA?AVQString@@PBD0@Z @ 103 NONAME ; class QString NmDataManager::trUtf8(char const *, char const *)
-	?setEnvelopeProperties@NmMessageListModel@@QAEXW4NmEnvelopeProperties@@ABV?$QList@VNmId@@@@@Z @ 104 NONAME ; void NmMessageListModel::setEnvelopeProperties(enum NmEnvelopeProperties, class QList<class NmId> const &)
-	??1NmStoreEnvelopesOperation@@MAE@XZ @ 105 NONAME ; NmStoreEnvelopesOperation::~NmStoreEnvelopesOperation(void)
-	?tr@NmUiEngine@@SA?AVQString@@PBD0@Z @ 106 NONAME ; class QString NmUiEngine::tr(char const *, char const *)
-	?mPluginLoaderArray@NmDataPluginFactory@@0V?$QList@PAVQPluginLoader@@@@A @ 107 NONAME ; class QList<class QPluginLoader *> NmDataPluginFactory::mPluginLoaderArray
-	?trUtf8@NmBaseClientPlugin@@SA?AVQString@@PBD0@Z @ 108 NONAME ; class QString NmBaseClientPlugin::trUtf8(char const *, char const *)
-	?deleteOperation@NmOperation@@AAEXXZ @ 109 NONAME ; void NmOperation::deleteOperation(void)
-	?trUtf8@NmBaseClientPlugin@@SA?AVQString@@PBD0H@Z @ 110 NONAME ; class QString NmBaseClientPlugin::trUtf8(char const *, char const *, int)
-	?createViewerViewCommands@NmBaseClientPlugin@@AAEXABVNmActionRequest@@AAV?$QList@PAVNmAction@@@@@Z @ 111 NONAME ; void NmBaseClientPlugin::createViewerViewCommands(class NmActionRequest const &, class QList<class NmAction *> &)
-	?fetchMessagePart@NmUiEngine@@QAE?AV?$QPointer@VNmOperation@@@@ABVNmId@@000@Z @ 112 NONAME ; class QPointer<class NmOperation> NmUiEngine::fetchMessagePart(class NmId const &, class NmId const &, class NmId const &, class NmId const &)
-	?tr@NmMailboxListModel@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString NmMailboxListModel::tr(char const *, char const *, int)
-	?handleConnectEvent@NmUiEngine@@QAEXW4NmConnectState@@ABVNmId@@H@Z @ 114 NONAME ; void NmUiEngine::handleConnectEvent(enum NmConnectState, class NmId const &, int)
-	?trUtf8@NmUiEngine@@SA?AVQString@@PBD0H@Z @ 115 NONAME ; class QString NmUiEngine::trUtf8(char const *, char const *, int)
-	?createMailboxItem@NmMailboxListModel@@AAEPAVNmMailboxListModelItem@@PBVNmMailbox@@@Z @ 116 NONAME ; class NmMailboxListModelItem * NmMailboxListModel::createMailboxItem(class NmMailbox const *)
-	?setTitleDivider@NmMessageListModelItem@@QAEXABVQString@@@Z @ 117 NONAME ; void NmMessageListModelItem::setTitleDivider(class QString const &)
-	?markAsRead@NmBaseClientPlugin@@QAEXXZ @ 118 NONAME ; void NmBaseClientPlugin::markAsRead(void)
-	?getInsertionIndex@NmMessageListModel@@ABEHABVNmMessageEnvelope@@@Z @ 119 NONAME ; int NmMessageListModel::getInsertionIndex(class NmMessageEnvelope const &) const
-	?updateOperationProgress@NmOperation@@QAEXH@Z @ 120 NONAME ; void NmOperation::updateOperationProgress(int)
-	?messageEventForListModel@NmUiEngine@@AAEXW4NmMessageEvent@@ABVNmId@@ABV?$QList@VNmId@@@@1@Z @ 121 NONAME ; void NmUiEngine::messageEventForListModel(enum NmMessageEvent, class NmId const &, class QList<class NmId> const &, class NmId const &)
-	??1NmFolderListModel@@UAE@XZ @ 122 NONAME ; NmFolderListModel::~NmFolderListModel(void)
-	?operationCompleted@NmUiEngine@@IAEXABVNmOperationCompletionEvent@@@Z @ 123 NONAME ; void NmUiEngine::operationCompleted(class NmOperationCompletionEvent const &)
-	??1NmDataManager@@UAE@XZ @ 124 NONAME ; NmDataManager::~NmDataManager(void)
-	?trUtf8@NmStoreEnvelopesOperation@@SA?AVQString@@PBD0@Z @ 125 NONAME ; class QString NmStoreEnvelopesOperation::trUtf8(char const *, char const *)
-	?setAddress@NmMailboxMetaData@@QAEXABVQString@@@Z @ 126 NONAME ; void NmMailboxMetaData::setAddress(class QString const &)
-	?getStaticMetaObject@NmMessageCreationOperation@@SAABUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const & NmMessageCreationOperation::getStaticMetaObject(void)
-	?updateActiveFolder@NmUiEngine@@QAEXABVNmId@@0@Z @ 128 NONAME ; void NmUiEngine::updateActiveFolder(class NmId const &, class NmId const &)
-	?trUtf8@NmAddAttachmentsOperation@@SA?AVQString@@PBD0@Z @ 129 NONAME ; class QString NmAddAttachmentsOperation::trUtf8(char const *, char const *)
-	?name@NmMailboxMetaData@@QBE?AVQString@@XZ @ 130 NONAME ; class QString NmMailboxMetaData::name(void) const
-	?qt_metacall@NmDataManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 131 NONAME ; int NmDataManager::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?runAsyncOperation@NmOperation@@MAEXXZ @ 132 NONAME ; void NmOperation::runAsyncOperation(void)
-	??0NmFolderListModel@@QAE@AAVNmDataManager@@PAVQObject@@@Z @ 133 NONAME ; NmFolderListModel::NmFolderListModel(class NmDataManager &, class QObject *)
-	?folderTypeById@NmDataManager@@QAE?AW4NmFolderType@@VNmId@@0@Z @ 134 NONAME ; enum NmFolderType NmDataManager::folderTypeById(class NmId, class NmId)
-	?tr@NmBaseClientPlugin@@SA?AVQString@@PBD0H@Z @ 135 NONAME ; class QString NmBaseClientPlugin::tr(char const *, char const *, int)
-	??0NmMailboxMetaData@@QAE@XZ @ 136 NONAME ; NmMailboxMetaData::NmMailboxMetaData(void)
-	?setEnvelope@NmMessageListModelItem@@QAEXPAVNmMessageEnvelope@@@Z @ 137 NONAME ; void NmMessageListModelItem::setEnvelope(class NmMessageEnvelope *)
-	?saveMessage@NmUiEngine@@QAEHABVNmMessage@@@Z @ 138 NONAME ; int NmUiEngine::saveMessage(class NmMessage const &)
-	?setId@NmMailboxMetaData@@QAEXABVNmId@@@Z @ 139 NONAME ; void NmMailboxMetaData::setId(class NmId const &)
-	?folderTypeById@NmUiEngine@@QAE?AW4NmFolderType@@VNmId@@0@Z @ 140 NONAME ; enum NmFolderType NmUiEngine::folderTypeById(class NmId, class NmId)
-	?mReferenceCount@NmDataPluginFactory@@0HA @ 141 NONAME ; int NmDataPluginFactory::mReferenceCount
-	?tr@NmOperation@@SA?AVQString@@PBD0@Z @ 142 NONAME ; class QString NmOperation::tr(char const *, char const *)
-	?updateMessageEnvelope@NmMessageListModel@@AAEXABVNmId@@00@Z @ 143 NONAME ; void NmMessageListModel::updateMessageEnvelope(class NmId const &, class NmId const &, class NmId const &)
-	?tr@NmStoreEnvelopesOperation@@SA?AVQString@@PBD0@Z @ 144 NONAME ; class QString NmStoreEnvelopesOperation::tr(char const *, char const *)
-	?messagesBelongUnderSameDivider@NmMessageListModel@@ABE_NPBVNmMessageEnvelope@@0@Z @ 145 NONAME ; bool NmMessageListModel::messagesBelongUnderSameDivider(class NmMessageEnvelope const *, class NmMessageEnvelope const *) const
-	?matchFound@NmUiEngine@@IAEXABVNmId@@0@Z @ 146 NONAME ; void NmUiEngine::matchFound(class NmId const &, class NmId const &)
-	?metaObject@NmDataManager@@UBEPBUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const * NmDataManager::metaObject(void) const
-	?isSendingMessage@NmUiEngine@@QBE_NXZ @ 148 NONAME ; bool NmUiEngine::isSendingMessage(void) const
-	?freeIcons@NmIcons@@SAXXZ @ 149 NONAME ; void NmIcons::freeIcons(void)
-	?tr@NmAddAttachmentsOperation@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString NmAddAttachmentsOperation::tr(char const *, char const *)
-	?itemFromModel@NmMessageListModel@@AAEPAVNmMessageListModelItem@@ABVNmId@@@Z @ 151 NONAME ; class NmMessageListModelItem * NmMessageListModel::itemFromModel(class NmId const &)
-	?instance@NmUiEngine@@SAPAV1@XZ @ 152 NONAME ; class NmUiEngine * NmUiEngine::instance(void)
-	?createMessageListCommands@NmBaseClientPlugin@@AAEXABVNmActionRequest@@AAV?$QList@PAVNmAction@@@@@Z @ 153 NONAME ; void NmBaseClientPlugin::createMessageListCommands(class NmActionRequest const &, class QList<class NmAction *> &)
-	?updateEnvelopeProperty@NmBaseClientPlugin@@AAEXW4NmEnvelopeProperties@@@Z @ 154 NONAME ; void NmBaseClientPlugin::updateEnvelopeProperty(enum NmEnvelopeProperties)
-	??1NmAddAttachmentsOperation@@MAE@XZ @ 155 NONAME ; NmAddAttachmentsOperation::~NmAddAttachmentsOperation(void)
-	?goOffline@NmUiEngine@@QAEHABVNmId@@@Z @ 156 NONAME ; int NmUiEngine::goOffline(class NmId const &)
-	?staticMetaObject@NmDataManager@@2UQMetaObject@@B @ 157 NONAME ; struct QMetaObject const NmDataManager::staticMetaObject
-	?mInstance@NmUiEngine@@0PAV1@A @ 158 NONAME ; class NmUiEngine * NmUiEngine::mInstance
-	?attach@NmBaseClientPlugin@@QAEXXZ @ 159 NONAME ; void NmBaseClientPlugin::attach(void)
-	?setIgnoreFolderIds@NmMessageListModel@@QAEX_N@Z @ 160 NONAME ; void NmMessageListModel::setIgnoreFolderIds(bool)
-	?metaObject@NmAddAttachmentsOperation@@UBEPBUQMetaObject@@XZ @ 161 NONAME ; struct QMetaObject const * NmAddAttachmentsOperation::metaObject(void) const
-	?refresh@NmFolderListModel@@QAEXAAV?$QList@PAVNmFolder@@@@@Z @ 162 NONAME ; void NmFolderListModel::refresh(class QList<class NmFolder *> &)
-	?handleCompletedRemoveDraftOperation@NmUiEngine@@QAEXXZ @ 163 NONAME ; void NmUiEngine::handleCompletedRemoveDraftOperation(void)
-	?trUtf8@NmMailboxListModel@@SA?AVQString@@PBD0@Z @ 164 NONAME ; class QString NmMailboxListModel::trUtf8(char const *, char const *)
-	?envelopeById@NmDataManager@@QAEPAVNmMessageEnvelope@@ABVNmId@@00@Z @ 165 NONAME ; class NmMessageEnvelope * NmDataManager::envelopeById(class NmId const &, class NmId const &, class NmId const &)
-	?getStaticMetaObject@NmOperation@@SAABUQMetaObject@@XZ @ 166 NONAME ; struct QMetaObject const & NmOperation::getStaticMetaObject(void)
-	?trUtf8@NmOperation@@SA?AVQString@@PBD0@Z @ 167 NONAME ; class QString NmOperation::trUtf8(char const *, char const *)
-	?addAttachments@NmUiEngine@@QAE?AV?$QPointer@VNmAddAttachmentsOperation@@@@ABVNmMessage@@ABV?$QList@VQString@@@@@Z @ 168 NONAME ; class QPointer<class NmAddAttachmentsOperation> NmUiEngine::addAttachments(class NmMessage const &, class QList<class QString> const &)
-	?doCancelOperation@NmOperation@@MAEXXZ @ 169 NONAME ; void NmOperation::doCancelOperation(void)
-	?tr@NmOperation@@SA?AVQString@@PBD0H@Z @ 170 NONAME ; class QString NmOperation::tr(char const *, char const *, int)
-	??_ENmOperation@@UAE@I@Z @ 171 NONAME ; NmOperation::~NmOperation(unsigned int)
-	?tr@NmMessageCreationOperation@@SA?AVQString@@PBD0@Z @ 172 NONAME ; class QString NmMessageCreationOperation::tr(char const *, char const *)
-	?qt_metacall@NmMessageListModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 173 NONAME ; int NmMessageListModel::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?staticMetaObject@NmOperation@@2UQMetaObject@@B @ 174 NONAME ; struct QMetaObject const NmOperation::staticMetaObject
-	??1NmUiEngine@@EAE@XZ @ 175 NONAME ; NmUiEngine::~NmUiEngine(void)
-	?messagePartFile@NmUiEngine@@QAE?AVXQSharableFile@@ABVNmId@@000@Z @ 176 NONAME ; class XQSharableFile NmUiEngine::messagePartFile(class NmId const &, class NmId const &, class NmId const &, class NmId const &)
-	??_ENmMessageListModel@@UAE@I@Z @ 177 NONAME ; NmMessageListModel::~NmMessageListModel(unsigned int)
-	?addPreliminaryOperation@NmOperation@@QAEXPAV1@@Z @ 178 NONAME ; void NmOperation::addPreliminaryOperation(class NmOperation *)
-	?deleteMessages@NmUiEngine@@QAEHABVNmId@@0ABV?$QList@VNmId@@@@@Z @ 179 NONAME ; int NmUiEngine::deleteMessages(class NmId const &, class NmId const &, class QList<class NmId> const &)
-	??_ENmStoreEnvelopesOperation@@UAE@I@Z @ 180 NONAME ; NmStoreEnvelopesOperation::~NmStoreEnvelopesOperation(unsigned int)
-	?mailboxById@NmDataManager@@QAEPAVNmMailboxMetaData@@ABVNmId@@@Z @ 181 NONAME ; class NmMailboxMetaData * NmDataManager::mailboxById(class NmId const &)
-	?messageListModelForSearch@NmUiEngine@@QAEAAVNmMessageListModel@@ABVNmId@@@Z @ 182 NONAME ; class NmMessageListModel & NmUiEngine::messageListModelForSearch(class NmId const &)
-	?search@NmBaseClientPlugin@@QAEXXZ @ 183 NONAME ; void NmBaseClientPlugin::search(void)
-	?pluginInstances@NmDataPluginFactory@@QAEPAV?$QList@PAVQObject@@@@XZ @ 184 NONAME ; class QList<class QObject *> * NmDataPluginFactory::pluginInstances(void)
-	?tr@NmBaseClientPlugin@@SA?AVQString@@PBD0@Z @ 185 NONAME ; class QString NmBaseClientPlugin::tr(char const *, char const *)
-	?listMessages@NmDataManager@@QAEXABVNmId@@0AAV?$QList@PAVNmMessageEnvelope@@@@@Z @ 186 NONAME ; void NmDataManager::listMessages(class NmId const &, class NmId const &, class QList<class NmMessageEnvelope *> &)
-	??1NmBaseClientPlugin@@UAE@XZ @ 187 NONAME ; NmBaseClientPlugin::~NmBaseClientPlugin(void)
-	?qt_metacast@NmDataManager@@UAEPAXPBD@Z @ 188 NONAME ; void * NmDataManager::qt_metacast(char const *)
-	??0NmMessageCreationOperation@@QAE@XZ @ 189 NONAME ; NmMessageCreationOperation::NmMessageCreationOperation(void)
-	?qt_metacall@NmBaseClientPlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 190 NONAME ; int NmBaseClientPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?envelopePtr@NmMessageListModelItem@@QAEPAVNmMessageEnvelope@@XZ @ 191 NONAME ; class NmMessageEnvelope * NmMessageListModelItem::envelopePtr(void)
-	?messageListModel@NmUiEngine@@QAEAAVNmMessageListModel@@ABVNmId@@0@Z @ 192 NONAME ; class NmMessageListModel & NmUiEngine::messageListModel(class NmId const &, class NmId const &)
-	??1NmMailboxMetaData@@UAE@XZ @ 193 NONAME ; NmMailboxMetaData::~NmMailboxMetaData(void)
-	?connectionEvent@NmUiEngine@@IAEXW4NmConnectState@@ABVNmId@@@Z @ 194 NONAME ; void NmUiEngine::connectionEvent(enum NmConnectState, class NmId const &)
-	?mailbox@NmDataManager@@QAEPAVNmMailbox@@ABVNmId@@@Z @ 195 NONAME ; class NmMailbox * NmDataManager::mailbox(class NmId const &)
-	?interfaceInstance@NmDataPluginFactory@@QAEPAVNmDataPluginInterface@@PAVQObject@@@Z @ 196 NONAME ; class NmDataPluginInterface * NmDataPluginFactory::interfaceInstance(class QObject *)
-	?metaObject@NmMailboxListModel@@UBEPBUQMetaObject@@XZ @ 197 NONAME ; struct QMetaObject const * NmMailboxListModel::metaObject(void) const
-	?IconId@NmMailboxMetaData@@QBE?AVNmId@@XZ @ 198 NONAME ; class NmId NmMailboxMetaData::IconId(void) const
-	?sendOperationCompleted@NmUiEngine@@IAEXXZ @ 199 NONAME ; void NmUiEngine::sendOperationCompleted(void)
-	??0NmFolderMetaData@@QAE@XZ @ 200 NONAME ; NmFolderMetaData::NmFolderMetaData(void)
-	?staticMetaObject@NmAddAttachmentsOperation@@2UQMetaObject@@B @ 201 NONAME ; struct QMetaObject const NmAddAttachmentsOperation::staticMetaObject
-	?connectionState@NmUiEngine@@QAE?AW4NmConnectState@@ABVNmId@@@Z @ 202 NONAME ; enum NmConnectState NmUiEngine::connectionState(class NmId const &)
-	?createTitleDividerItem@NmMessageListModel@@AAEPAVNmMessageListModelItem@@PAVNmMessageEnvelope@@@Z @ 203 NONAME ; class NmMessageListModelItem * NmMessageListModel::createTitleDividerItem(class NmMessageEnvelope *)
-	?setId@NmFolderMetaData@@QAEXABVNmId@@@Z @ 204 NONAME ; void NmFolderMetaData::setId(class NmId const &)
-	??0NmOperation@@QAE@XZ @ 205 NONAME ; NmOperation::NmOperation(void)
-	?cancelOperation@NmOperation@@QAEXXZ @ 206 NONAME ; void NmOperation::cancelOperation(void)
-	??_ENmFolderMetaData@@UAE@I@Z @ 207 NONAME ; NmFolderMetaData::~NmFolderMetaData(unsigned int)
-	?qt_metacast@NmMessageListModel@@UAEPAXPBD@Z @ 208 NONAME ; void * NmMessageListModel::qt_metacast(char const *)
-	?operationProgressChanged@NmOperation@@IAEXH@Z @ 209 NONAME ; void NmOperation::operationProgressChanged(int)
-	?trUtf8@NmOperation@@SA?AVQString@@PBD0H@Z @ 210 NONAME ; class QString NmOperation::trUtf8(char const *, char const *, int)
-	??_ENmMailboxListModel@@UAE@I@Z @ 211 NONAME ; NmMailboxListModel::~NmMailboxListModel(unsigned int)
-	?messageDeleted@NmUiEngine@@IAEXABVNmId@@00@Z @ 212 NONAME ; void NmUiEngine::messageDeleted(class NmId const &, class NmId const &, class NmId const &)
-	?trUtf8@NmMessageCreationOperation@@SA?AVQString@@PBD0@Z @ 213 NONAME ; class QString NmMessageCreationOperation::trUtf8(char const *, char const *)
-	?metaObject@NmUiEngine@@UBEPBUQMetaObject@@XZ @ 214 NONAME ; struct QMetaObject const * NmUiEngine::metaObject(void) const
-	??_ENmBaseClientPlugin@@UAE@I@Z @ 215 NONAME ; NmBaseClientPlugin::~NmBaseClientPlugin(unsigned int)
-	?markAsUnread@NmBaseClientPlugin@@QAEXXZ @ 216 NONAME ; void NmBaseClientPlugin::markAsUnread(void)
-	?metaObject@NmBaseClientPlugin@@UBEPBUQMetaObject@@XZ @ 217 NONAME ; struct QMetaObject const * NmBaseClientPlugin::metaObject(void) const
-	?tr@NmDataManager@@SA?AVQString@@PBD0@Z @ 218 NONAME ; class QString NmDataManager::tr(char const *, char const *)
-	?mailboxListModel@NmUiEngine@@QAEAAVNmMailboxListModel@@XZ @ 219 NONAME ; class NmMailboxListModel & NmUiEngine::mailboxListModel(void)
-	?fetchMessage@NmUiEngine@@QAE?AV?$QPointer@VNmOperation@@@@ABVNmId@@00@Z @ 220 NONAME ; class QPointer<class NmOperation> NmUiEngine::fetchMessage(class NmId const &, class NmId const &, class NmId const &)
-	?setIconId@NmMailboxMetaData@@QAEXABVNmId@@@Z @ 221 NONAME ; void NmMailboxMetaData::setIconId(class NmId const &)
-	??1NmDataPluginFactory@@EAE@XZ @ 222 NONAME ; NmDataPluginFactory::~NmDataPluginFactory(void)
-	?refreshMailboxListModel@NmUiEngine@@QAEXXZ @ 223 NONAME ; void NmUiEngine::refreshMailboxListModel(void)
-	?qt_metacall@NmStoreEnvelopesOperation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 224 NONAME ; int NmStoreEnvelopesOperation::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@NmMessageListModel@@SA?AVQString@@PBD0@Z @ 225 NONAME ; class QString NmMessageListModel::trUtf8(char const *, char const *)
-	?rowCount@NmFolderListModel@@UBEHABVQModelIndex@@@Z @ 226 NONAME ; int NmFolderListModel::rowCount(class QModelIndex const &) const
-	?doUpdateOperationProgress@NmOperation@@MAEXXZ @ 227 NONAME ; void NmOperation::doUpdateOperationProgress(void)
-	?tr@NmMailboxListModel@@SA?AVQString@@PBD0@Z @ 228 NONAME ; class QString NmMailboxListModel::tr(char const *, char const *)
-	?removeMessage@NmUiEngine@@QAEHABVNmId@@00@Z @ 229 NONAME ; int NmUiEngine::removeMessage(class NmId const &, class NmId const &, class NmId const &)
-	??_ENmUiEngine@@UAE@I@Z @ 230 NONAME ; NmUiEngine::~NmUiEngine(unsigned int)
-	?operationCompleted@NmOperation@@IAEXH@Z @ 231 NONAME ; void NmOperation::operationCompleted(int)
-	?callEmitDataChanged@NmMessageListModelItem@@QAEXXZ @ 232 NONAME ; void NmMessageListModelItem::callEmitDataChanged(void)
+	?applicationStateInterfaceInstance@NmDataPluginFactory@@AAEPAVNmApplicationStateInterface@@PAVQObject@@@Z @ 71 NONAME ; class NmApplicationStateInterface * NmDataPluginFactory::applicationStateInterfaceInstance(class QObject *)
+	?metaObject@NmMessageListModel@@UBEPBUQMetaObject@@XZ @ 72 NONAME ; struct QMetaObject const * NmMessageListModel::metaObject(void) const
+	?messageBeingSent@NmUiEngine@@QBEPBVNmMessage@@XZ @ 73 NONAME ; class NmMessage const * NmUiEngine::messageBeingSent(void) const
+	?handleMailboxEvent@NmUiEngine@@AAEXW4NmMailboxEvent@@ABV?$QList@VNmId@@@@@Z @ 74 NONAME ; void NmUiEngine::handleMailboxEvent(enum NmMailboxEvent, class QList<class NmId> const &)
+	?interfaceInstance@NmDataPluginFactory@@QAEPAVNmDataPluginInterface@@VNmId@@@Z @ 75 NONAME ; class NmDataPluginInterface * NmDataPluginFactory::interfaceInstance(class NmId)
+	?goOffline@NmBaseClientPlugin@@AAEXABVNmId@@@Z @ 76 NONAME ; void NmBaseClientPlugin::goOffline(class NmId const &)
+	?sendMessage@NmUiEngine@@QAEXPAVNmMessage@@ABV?$QList@PAVNmOperation@@@@@Z @ 77 NONAME ; void NmUiEngine::sendMessage(class NmMessage *, class QList<class NmOperation *> const &)
+	?tr@NmDataManager@@SA?AVQString@@PBD0H@Z @ 78 NONAME ; class QString NmDataManager::tr(char const *, char const *, int)
+	??0NmMailboxListModel@@QAE@AAVNmDataManager@@PAVQObject@@@Z @ 79 NONAME ; NmMailboxListModel::NmMailboxListModel(class NmDataManager &, class QObject *)
+	?handleMessageEvent@NmMessageListModel@@QAEXW4NmMessageEvent@@ABVNmId@@ABV?$QList@VNmId@@@@1@Z @ 80 NONAME ; void NmMessageListModel::handleMessageEvent(enum NmMessageEvent, class NmId const &, class QList<class NmId> const &, class NmId const &)
+	?setPriorityNormal@NmBaseClientPlugin@@QAEXXZ @ 81 NONAME ; void NmBaseClientPlugin::setPriorityNormal(void)
+	??_ENmMessageSendingOperation@@UAE@I@Z @ 82 NONAME ; NmMessageSendingOperation::~NmMessageSendingOperation(unsigned int)
+	?changed@NmMessageListModel@@AAE_NABVNmMessageEnvelope@@0@Z @ 83 NONAME ; bool NmMessageListModel::changed(class NmMessageEnvelope const &, class NmMessageEnvelope const &)
+	?openAttachment@NmBaseClientPlugin@@QAEXXZ @ 84 NONAME ; void NmBaseClientPlugin::openAttachment(void)
+	?staticMetaObject@NmMessageCreationOperation@@2UQMetaObject@@B @ 85 NONAME ; struct QMetaObject const NmMessageCreationOperation::staticMetaObject
+	?handleMailboxEvent@NmMailboxListModel@@QAEXW4NmMailboxEvent@@ABV?$QList@VNmId@@@@@Z @ 86 NONAME ; void NmMailboxListModel::handleMailboxEvent(enum NmMailboxEvent, class QList<class NmId> const &)
+	?metaObject@NmStoreEnvelopesOperation@@UBEPBUQMetaObject@@XZ @ 87 NONAME ; struct QMetaObject const * NmStoreEnvelopesOperation::metaObject(void) const
+	?trUtf8@NmMailboxListModel@@SA?AVQString@@PBD0H@Z @ 88 NONAME ; class QString NmMailboxListModel::trUtf8(char const *, char const *, int)
+	?mPluginArray@NmDataPluginFactory@@0PAV?$QList@PAVQObject@@@@A @ 89 NONAME ; class QList<class QObject *> * NmDataPluginFactory::mPluginArray
+	?instance@NmDataPluginFactory@@SAPAV1@XZ @ 90 NONAME ; class NmDataPluginFactory * NmDataPluginFactory::instance(void)
+	?getStaticMetaObject@NmMessageListModel@@SAABUQMetaObject@@XZ @ 91 NONAME ; struct QMetaObject const & NmMessageListModel::getStaticMetaObject(void)
+	?deleteMessageFromViewerView@NmBaseClientPlugin@@QAEXXZ @ 92 NONAME ; void NmBaseClientPlugin::deleteMessageFromViewerView(void)
+	?tr@NmUiEngine@@SA?AVQString@@PBD0H@Z @ 93 NONAME ; class QString NmUiEngine::tr(char const *, char const *, int)
+	?refresh@NmMessageListModel@@QAEXVNmId@@0ABV?$QList@PAVNmMessageEnvelope@@@@@Z @ 94 NONAME ; void NmMessageListModel::refresh(class NmId, class NmId, class QList<class NmMessageEnvelope *> const &)
+	?mailboxById@NmUiEngine@@QAEPAVNmMailboxMetaData@@ABVNmId@@@Z @ 95 NONAME ; class NmMailboxMetaData * NmUiEngine::mailboxById(class NmId const &)
+	?createNewMessage@NmUiEngine@@QAE?AV?$QPointer@VNmMessageCreationOperation@@@@ABVNmId@@@Z @ 96 NONAME ; class QPointer<class NmMessageCreationOperation> NmUiEngine::createNewMessage(class NmId const &)
+	??_ENmMessageListModelItem@@UAE@I@Z @ 97 NONAME ; NmMessageListModelItem::~NmMessageListModelItem(unsigned int)
+	?replyAllMail@NmBaseClientPlugin@@QAEXXZ @ 98 NONAME ; void NmBaseClientPlugin::replyAllMail(void)
+	?handleMatchFound@NmUiEngine@@AAEXABVNmId@@0@Z @ 99 NONAME ; void NmUiEngine::handleMatchFound(class NmId const &, class NmId const &)
+	?syncStateEvent@NmUiEngine@@IAEXW4NmSyncState@@ABVNmId@@@Z @ 100 NONAME ; void NmUiEngine::syncStateEvent(enum NmSyncState, class NmId const &)
+	?refreshModelItem@NmMailboxListModel@@QAEXABVNmId@@@Z @ 101 NONAME ; void NmMailboxListModel::refreshModelItem(class NmId const &)
+	?trUtf8@NmDataManager@@SA?AVQString@@PBD0@Z @ 102 NONAME ; class QString NmDataManager::trUtf8(char const *, char const *)
+	?setEnvelopeProperties@NmMessageListModel@@QAEXW4NmEnvelopeProperties@@ABV?$QList@VNmId@@@@@Z @ 103 NONAME ; void NmMessageListModel::setEnvelopeProperties(enum NmEnvelopeProperties, class QList<class NmId> const &)
+	??1NmStoreEnvelopesOperation@@MAE@XZ @ 104 NONAME ; NmStoreEnvelopesOperation::~NmStoreEnvelopesOperation(void)
+	?tr@NmUiEngine@@SA?AVQString@@PBD0@Z @ 105 NONAME ; class QString NmUiEngine::tr(char const *, char const *)
+	?mPluginLoaderArray@NmDataPluginFactory@@0V?$QList@PAVQPluginLoader@@@@A @ 106 NONAME ; class QList<class QPluginLoader *> NmDataPluginFactory::mPluginLoaderArray
+	?trUtf8@NmBaseClientPlugin@@SA?AVQString@@PBD0@Z @ 107 NONAME ; class QString NmBaseClientPlugin::trUtf8(char const *, char const *)
+	?deleteOperation@NmOperation@@AAEXXZ @ 108 NONAME ; void NmOperation::deleteOperation(void)
+	?trUtf8@NmBaseClientPlugin@@SA?AVQString@@PBD0H@Z @ 109 NONAME ; class QString NmBaseClientPlugin::trUtf8(char const *, char const *, int)
+	?createViewerViewCommands@NmBaseClientPlugin@@AAEXABVNmActionRequest@@AAV?$QList@PAVNmAction@@@@@Z @ 110 NONAME ; void NmBaseClientPlugin::createViewerViewCommands(class NmActionRequest const &, class QList<class NmAction *> &)
+	?fetchMessagePart@NmUiEngine@@QAE?AV?$QPointer@VNmOperation@@@@ABVNmId@@000@Z @ 111 NONAME ; class QPointer<class NmOperation> NmUiEngine::fetchMessagePart(class NmId const &, class NmId const &, class NmId const &, class NmId const &)
+	?tr@NmMailboxListModel@@SA?AVQString@@PBD0H@Z @ 112 NONAME ; class QString NmMailboxListModel::tr(char const *, char const *, int)
+	?handleConnectEvent@NmUiEngine@@QAEXW4NmConnectState@@ABVNmId@@H@Z @ 113 NONAME ; void NmUiEngine::handleConnectEvent(enum NmConnectState, class NmId const &, int)
+	?trUtf8@NmUiEngine@@SA?AVQString@@PBD0H@Z @ 114 NONAME ; class QString NmUiEngine::trUtf8(char const *, char const *, int)
+	?createMailboxItem@NmMailboxListModel@@AAEPAVNmMailboxListModelItem@@PBVNmMailbox@@@Z @ 115 NONAME ; class NmMailboxListModelItem * NmMailboxListModel::createMailboxItem(class NmMailbox const *)
+	?setTitleDivider@NmMessageListModelItem@@QAEXABVQString@@@Z @ 116 NONAME ; void NmMessageListModelItem::setTitleDivider(class QString const &)
+	?markAsRead@NmBaseClientPlugin@@QAEXXZ @ 117 NONAME ; void NmBaseClientPlugin::markAsRead(void)
+	?getInsertionIndex@NmMessageListModel@@ABEHABVNmMessageEnvelope@@@Z @ 118 NONAME ; int NmMessageListModel::getInsertionIndex(class NmMessageEnvelope const &) const
+	?updateOperationProgress@NmOperation@@QAEXH@Z @ 119 NONAME ; void NmOperation::updateOperationProgress(int)
+	?messageEventForListModel@NmUiEngine@@AAEXW4NmMessageEvent@@ABVNmId@@ABV?$QList@VNmId@@@@1@Z @ 120 NONAME ; void NmUiEngine::messageEventForListModel(enum NmMessageEvent, class NmId const &, class QList<class NmId> const &, class NmId const &)
+	??1NmFolderListModel@@UAE@XZ @ 121 NONAME ; NmFolderListModel::~NmFolderListModel(void)
+	?operationCompleted@NmUiEngine@@IAEXABVNmOperationCompletionEvent@@@Z @ 122 NONAME ; void NmUiEngine::operationCompleted(class NmOperationCompletionEvent const &)
+	??1NmDataManager@@UAE@XZ @ 123 NONAME ; NmDataManager::~NmDataManager(void)
+	?trUtf8@NmStoreEnvelopesOperation@@SA?AVQString@@PBD0@Z @ 124 NONAME ; class QString NmStoreEnvelopesOperation::trUtf8(char const *, char const *)
+	?setAddress@NmMailboxMetaData@@QAEXABVQString@@@Z @ 125 NONAME ; void NmMailboxMetaData::setAddress(class QString const &)
+	?getStaticMetaObject@NmMessageCreationOperation@@SAABUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const & NmMessageCreationOperation::getStaticMetaObject(void)
+	?updateActiveFolder@NmUiEngine@@QAEXABVNmId@@0@Z @ 127 NONAME ; void NmUiEngine::updateActiveFolder(class NmId const &, class NmId const &)
+	?trUtf8@NmAddAttachmentsOperation@@SA?AVQString@@PBD0@Z @ 128 NONAME ; class QString NmAddAttachmentsOperation::trUtf8(char const *, char const *)
+	?name@NmMailboxMetaData@@QBE?AVQString@@XZ @ 129 NONAME ; class QString NmMailboxMetaData::name(void) const
+	?qt_metacall@NmDataManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 130 NONAME ; int NmDataManager::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?runAsyncOperation@NmOperation@@MAEXXZ @ 131 NONAME ; void NmOperation::runAsyncOperation(void)
+	??0NmFolderListModel@@QAE@AAVNmDataManager@@PAVQObject@@@Z @ 132 NONAME ; NmFolderListModel::NmFolderListModel(class NmDataManager &, class QObject *)
+	?folderTypeById@NmDataManager@@QAE?AW4NmFolderType@@VNmId@@0@Z @ 133 NONAME ; enum NmFolderType NmDataManager::folderTypeById(class NmId, class NmId)
+	?tr@NmBaseClientPlugin@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString NmBaseClientPlugin::tr(char const *, char const *, int)
+	??0NmMailboxMetaData@@QAE@XZ @ 135 NONAME ; NmMailboxMetaData::NmMailboxMetaData(void)
+	?setEnvelope@NmMessageListModelItem@@QAEXPAVNmMessageEnvelope@@@Z @ 136 NONAME ; void NmMessageListModelItem::setEnvelope(class NmMessageEnvelope *)
+	?saveMessage@NmUiEngine@@QAEHABVNmMessage@@@Z @ 137 NONAME ; int NmUiEngine::saveMessage(class NmMessage const &)
+	?setId@NmMailboxMetaData@@QAEXABVNmId@@@Z @ 138 NONAME ; void NmMailboxMetaData::setId(class NmId const &)
+	?folderTypeById@NmUiEngine@@QAE?AW4NmFolderType@@VNmId@@0@Z @ 139 NONAME ; enum NmFolderType NmUiEngine::folderTypeById(class NmId, class NmId)
+	?mReferenceCount@NmDataPluginFactory@@0HA @ 140 NONAME ; int NmDataPluginFactory::mReferenceCount
+	?tr@NmOperation@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString NmOperation::tr(char const *, char const *)
+	?updateMessageEnvelope@NmMessageListModel@@AAEXABVNmId@@00@Z @ 142 NONAME ; void NmMessageListModel::updateMessageEnvelope(class NmId const &, class NmId const &, class NmId const &)
+	?tr@NmStoreEnvelopesOperation@@SA?AVQString@@PBD0@Z @ 143 NONAME ; class QString NmStoreEnvelopesOperation::tr(char const *, char const *)
+	?messagesBelongUnderSameDivider@NmMessageListModel@@ABE_NPBVNmMessageEnvelope@@0@Z @ 144 NONAME ; bool NmMessageListModel::messagesBelongUnderSameDivider(class NmMessageEnvelope const *, class NmMessageEnvelope const *) const
+	?matchFound@NmUiEngine@@IAEXABVNmId@@0@Z @ 145 NONAME ; void NmUiEngine::matchFound(class NmId const &, class NmId const &)
+	?metaObject@NmDataManager@@UBEPBUQMetaObject@@XZ @ 146 NONAME ; struct QMetaObject const * NmDataManager::metaObject(void) const
+	?isSendingMessage@NmUiEngine@@QBE_NXZ @ 147 NONAME ; bool NmUiEngine::isSendingMessage(void) const
+	?freeIcons@NmIcons@@SAXXZ @ 148 NONAME ; void NmIcons::freeIcons(void)
+	?tr@NmAddAttachmentsOperation@@SA?AVQString@@PBD0@Z @ 149 NONAME ; class QString NmAddAttachmentsOperation::tr(char const *, char const *)
+	?itemFromModel@NmMessageListModel@@AAEPAVNmMessageListModelItem@@ABVNmId@@@Z @ 150 NONAME ; class NmMessageListModelItem * NmMessageListModel::itemFromModel(class NmId const &)
+	?instance@NmUiEngine@@SAPAV1@XZ @ 151 NONAME ; class NmUiEngine * NmUiEngine::instance(void)
+	?createMessageListCommands@NmBaseClientPlugin@@AAEXABVNmActionRequest@@AAV?$QList@PAVNmAction@@@@@Z @ 152 NONAME ; void NmBaseClientPlugin::createMessageListCommands(class NmActionRequest const &, class QList<class NmAction *> &)
+	?updateEnvelopeProperty@NmBaseClientPlugin@@AAEXW4NmEnvelopeProperties@@@Z @ 153 NONAME ; void NmBaseClientPlugin::updateEnvelopeProperty(enum NmEnvelopeProperties)
+	??1NmAddAttachmentsOperation@@MAE@XZ @ 154 NONAME ; NmAddAttachmentsOperation::~NmAddAttachmentsOperation(void)
+	?goOffline@NmUiEngine@@QAEHABVNmId@@@Z @ 155 NONAME ; int NmUiEngine::goOffline(class NmId const &)
+	?staticMetaObject@NmDataManager@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const NmDataManager::staticMetaObject
+	?mInstance@NmUiEngine@@0PAV1@A @ 157 NONAME ; class NmUiEngine * NmUiEngine::mInstance
+	?attach@NmBaseClientPlugin@@QAEXXZ @ 158 NONAME ; void NmBaseClientPlugin::attach(void)
+	?setIgnoreFolderIds@NmMessageListModel@@QAEX_N@Z @ 159 NONAME ; void NmMessageListModel::setIgnoreFolderIds(bool)
+	?metaObject@NmAddAttachmentsOperation@@UBEPBUQMetaObject@@XZ @ 160 NONAME ; struct QMetaObject const * NmAddAttachmentsOperation::metaObject(void) const
+	?refresh@NmFolderListModel@@QAEXAAV?$QList@PAVNmFolder@@@@@Z @ 161 NONAME ; void NmFolderListModel::refresh(class QList<class NmFolder *> &)
+	?handleCompletedRemoveDraftOperation@NmUiEngine@@QAEXXZ @ 162 NONAME ; void NmUiEngine::handleCompletedRemoveDraftOperation(void)
+	?trUtf8@NmMailboxListModel@@SA?AVQString@@PBD0@Z @ 163 NONAME ; class QString NmMailboxListModel::trUtf8(char const *, char const *)
+	?envelopeById@NmDataManager@@QAEPAVNmMessageEnvelope@@ABVNmId@@00@Z @ 164 NONAME ; class NmMessageEnvelope * NmDataManager::envelopeById(class NmId const &, class NmId const &, class NmId const &)
+	?getStaticMetaObject@NmOperation@@SAABUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const & NmOperation::getStaticMetaObject(void)
+	?trUtf8@NmOperation@@SA?AVQString@@PBD0@Z @ 166 NONAME ; class QString NmOperation::trUtf8(char const *, char const *)
+	?addAttachments@NmUiEngine@@QAE?AV?$QPointer@VNmAddAttachmentsOperation@@@@ABVNmMessage@@ABV?$QList@VQString@@@@@Z @ 167 NONAME ; class QPointer<class NmAddAttachmentsOperation> NmUiEngine::addAttachments(class NmMessage const &, class QList<class QString> const &)
+	?doCancelOperation@NmOperation@@MAEXXZ @ 168 NONAME ; void NmOperation::doCancelOperation(void)
+	?tr@NmOperation@@SA?AVQString@@PBD0H@Z @ 169 NONAME ; class QString NmOperation::tr(char const *, char const *, int)
+	??_ENmOperation@@UAE@I@Z @ 170 NONAME ; NmOperation::~NmOperation(unsigned int)
+	?tr@NmMessageCreationOperation@@SA?AVQString@@PBD0@Z @ 171 NONAME ; class QString NmMessageCreationOperation::tr(char const *, char const *)
+	?qt_metacall@NmMessageListModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 172 NONAME ; int NmMessageListModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?staticMetaObject@NmOperation@@2UQMetaObject@@B @ 173 NONAME ; struct QMetaObject const NmOperation::staticMetaObject
+	??1NmUiEngine@@EAE@XZ @ 174 NONAME ; NmUiEngine::~NmUiEngine(void)
+	?messagePartFile@NmUiEngine@@QAE?AVXQSharableFile@@ABVNmId@@000@Z @ 175 NONAME ; class XQSharableFile NmUiEngine::messagePartFile(class NmId const &, class NmId const &, class NmId const &, class NmId const &)
+	??_ENmMessageListModel@@UAE@I@Z @ 176 NONAME ; NmMessageListModel::~NmMessageListModel(unsigned int)
+	?addPreliminaryOperation@NmOperation@@QAEXPAV1@@Z @ 177 NONAME ; void NmOperation::addPreliminaryOperation(class NmOperation *)
+	?deleteMessages@NmUiEngine@@QAEHABVNmId@@0ABV?$QList@VNmId@@@@@Z @ 178 NONAME ; int NmUiEngine::deleteMessages(class NmId const &, class NmId const &, class QList<class NmId> const &)
+	??_ENmStoreEnvelopesOperation@@UAE@I@Z @ 179 NONAME ; NmStoreEnvelopesOperation::~NmStoreEnvelopesOperation(unsigned int)
+	?mailboxById@NmDataManager@@QAEPAVNmMailboxMetaData@@ABVNmId@@@Z @ 180 NONAME ; class NmMailboxMetaData * NmDataManager::mailboxById(class NmId const &)
+	?messageListModelForSearch@NmUiEngine@@QAEAAVNmMessageListModel@@ABVNmId@@@Z @ 181 NONAME ; class NmMessageListModel & NmUiEngine::messageListModelForSearch(class NmId const &)
+	?search@NmBaseClientPlugin@@QAEXXZ @ 182 NONAME ; void NmBaseClientPlugin::search(void)
+	?pluginInstances@NmDataPluginFactory@@QAEPAV?$QList@PAVQObject@@@@XZ @ 183 NONAME ; class QList<class QObject *> * NmDataPluginFactory::pluginInstances(void)
+	?tr@NmBaseClientPlugin@@SA?AVQString@@PBD0@Z @ 184 NONAME ; class QString NmBaseClientPlugin::tr(char const *, char const *)
+	?listMessages@NmDataManager@@QAEXABVNmId@@0AAV?$QList@PAVNmMessageEnvelope@@@@@Z @ 185 NONAME ; void NmDataManager::listMessages(class NmId const &, class NmId const &, class QList<class NmMessageEnvelope *> &)
+	??1NmBaseClientPlugin@@UAE@XZ @ 186 NONAME ; NmBaseClientPlugin::~NmBaseClientPlugin(void)
+	?qt_metacast@NmDataManager@@UAEPAXPBD@Z @ 187 NONAME ; void * NmDataManager::qt_metacast(char const *)
+	??0NmMessageCreationOperation@@QAE@XZ @ 188 NONAME ; NmMessageCreationOperation::NmMessageCreationOperation(void)
+	?qt_metacall@NmBaseClientPlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 189 NONAME ; int NmBaseClientPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?envelopePtr@NmMessageListModelItem@@QAEPAVNmMessageEnvelope@@XZ @ 190 NONAME ; class NmMessageEnvelope * NmMessageListModelItem::envelopePtr(void)
+	?messageListModel@NmUiEngine@@QAEAAVNmMessageListModel@@ABVNmId@@0@Z @ 191 NONAME ; class NmMessageListModel & NmUiEngine::messageListModel(class NmId const &, class NmId const &)
+	??1NmMailboxMetaData@@UAE@XZ @ 192 NONAME ; NmMailboxMetaData::~NmMailboxMetaData(void)
+	?connectionEvent@NmUiEngine@@IAEXW4NmConnectState@@ABVNmId@@@Z @ 193 NONAME ; void NmUiEngine::connectionEvent(enum NmConnectState, class NmId const &)
+	?mailbox@NmDataManager@@QAEPAVNmMailbox@@ABVNmId@@@Z @ 194 NONAME ; class NmMailbox * NmDataManager::mailbox(class NmId const &)
+	?interfaceInstance@NmDataPluginFactory@@QAEPAVNmDataPluginInterface@@PAVQObject@@@Z @ 195 NONAME ; class NmDataPluginInterface * NmDataPluginFactory::interfaceInstance(class QObject *)
+	?metaObject@NmMailboxListModel@@UBEPBUQMetaObject@@XZ @ 196 NONAME ; struct QMetaObject const * NmMailboxListModel::metaObject(void) const
+	?IconId@NmMailboxMetaData@@QBE?AVNmId@@XZ @ 197 NONAME ; class NmId NmMailboxMetaData::IconId(void) const
+	?sendOperationCompleted@NmUiEngine@@IAEXXZ @ 198 NONAME ; void NmUiEngine::sendOperationCompleted(void)
+	??0NmFolderMetaData@@QAE@XZ @ 199 NONAME ; NmFolderMetaData::NmFolderMetaData(void)
+	?staticMetaObject@NmAddAttachmentsOperation@@2UQMetaObject@@B @ 200 NONAME ; struct QMetaObject const NmAddAttachmentsOperation::staticMetaObject
+	?connectionState@NmUiEngine@@QAE?AW4NmConnectState@@ABVNmId@@@Z @ 201 NONAME ; enum NmConnectState NmUiEngine::connectionState(class NmId const &)
+	?createTitleDividerItem@NmMessageListModel@@AAEPAVNmMessageListModelItem@@PAVNmMessageEnvelope@@@Z @ 202 NONAME ; class NmMessageListModelItem * NmMessageListModel::createTitleDividerItem(class NmMessageEnvelope *)
+	?setId@NmFolderMetaData@@QAEXABVNmId@@@Z @ 203 NONAME ; void NmFolderMetaData::setId(class NmId const &)
+	??0NmOperation@@QAE@XZ @ 204 NONAME ; NmOperation::NmOperation(void)
+	?cancelOperation@NmOperation@@QAEXXZ @ 205 NONAME ; void NmOperation::cancelOperation(void)
+	??_ENmFolderMetaData@@UAE@I@Z @ 206 NONAME ; NmFolderMetaData::~NmFolderMetaData(unsigned int)
+	?qt_metacast@NmMessageListModel@@UAEPAXPBD@Z @ 207 NONAME ; void * NmMessageListModel::qt_metacast(char const *)
+	?operationProgressChanged@NmOperation@@IAEXH@Z @ 208 NONAME ; void NmOperation::operationProgressChanged(int)
+	?trUtf8@NmOperation@@SA?AVQString@@PBD0H@Z @ 209 NONAME ; class QString NmOperation::trUtf8(char const *, char const *, int)
+	??_ENmMailboxListModel@@UAE@I@Z @ 210 NONAME ; NmMailboxListModel::~NmMailboxListModel(unsigned int)
+	?messageDeleted@NmUiEngine@@IAEXABVNmId@@00@Z @ 211 NONAME ; void NmUiEngine::messageDeleted(class NmId const &, class NmId const &, class NmId const &)
+	?trUtf8@NmMessageCreationOperation@@SA?AVQString@@PBD0@Z @ 212 NONAME ; class QString NmMessageCreationOperation::trUtf8(char const *, char const *)
+	?metaObject@NmUiEngine@@UBEPBUQMetaObject@@XZ @ 213 NONAME ; struct QMetaObject const * NmUiEngine::metaObject(void) const
+	??_ENmBaseClientPlugin@@UAE@I@Z @ 214 NONAME ; NmBaseClientPlugin::~NmBaseClientPlugin(unsigned int)
+	?markAsUnread@NmBaseClientPlugin@@QAEXXZ @ 215 NONAME ; void NmBaseClientPlugin::markAsUnread(void)
+	?metaObject@NmBaseClientPlugin@@UBEPBUQMetaObject@@XZ @ 216 NONAME ; struct QMetaObject const * NmBaseClientPlugin::metaObject(void) const
+	?tr@NmDataManager@@SA?AVQString@@PBD0@Z @ 217 NONAME ; class QString NmDataManager::tr(char const *, char const *)
+	?mailboxListModel@NmUiEngine@@QAEAAVNmMailboxListModel@@XZ @ 218 NONAME ; class NmMailboxListModel & NmUiEngine::mailboxListModel(void)
+	?fetchMessage@NmUiEngine@@QAE?AV?$QPointer@VNmOperation@@@@ABVNmId@@00@Z @ 219 NONAME ; class QPointer<class NmOperation> NmUiEngine::fetchMessage(class NmId const &, class NmId const &, class NmId const &)
+	?setIconId@NmMailboxMetaData@@QAEXABVNmId@@@Z @ 220 NONAME ; void NmMailboxMetaData::setIconId(class NmId const &)
+	??1NmDataPluginFactory@@EAE@XZ @ 221 NONAME ; NmDataPluginFactory::~NmDataPluginFactory(void)
+	?refreshMailboxListModel@NmUiEngine@@QAEXXZ @ 222 NONAME ; void NmUiEngine::refreshMailboxListModel(void)
+	?qt_metacall@NmStoreEnvelopesOperation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 223 NONAME ; int NmStoreEnvelopesOperation::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@NmMessageListModel@@SA?AVQString@@PBD0@Z @ 224 NONAME ; class QString NmMessageListModel::trUtf8(char const *, char const *)
+	?rowCount@NmFolderListModel@@UBEHABVQModelIndex@@@Z @ 225 NONAME ; int NmFolderListModel::rowCount(class QModelIndex const &) const
+	?doUpdateOperationProgress@NmOperation@@MAEXXZ @ 226 NONAME ; void NmOperation::doUpdateOperationProgress(void)
+	?tr@NmMailboxListModel@@SA?AVQString@@PBD0@Z @ 227 NONAME ; class QString NmMailboxListModel::tr(char const *, char const *)
+	?removeMessage@NmUiEngine@@QAEHABVNmId@@00@Z @ 228 NONAME ; int NmUiEngine::removeMessage(class NmId const &, class NmId const &, class NmId const &)
+	??_ENmUiEngine@@UAE@I@Z @ 229 NONAME ; NmUiEngine::~NmUiEngine(unsigned int)
+	?operationCompleted@NmOperation@@IAEXH@Z @ 230 NONAME ; void NmOperation::operationCompleted(int)
+	?callEmitDataChanged@NmMessageListModelItem@@QAEXXZ @ 231 NONAME ; void NmMessageListModelItem::callEmitDataChanged(void)
+	?enableSyncIndicator@NmUiEngine@@QAEX_N@Z @ 232 NONAME ; void NmUiEngine::enableSyncIndicator(bool)
 	?handleRequest@NmBaseClientPlugin@@IAEXW4NmActionResponseCommand@@ABVNmActionRequest@@@Z @ 233 NONAME ; void NmBaseClientPlugin::handleRequest(enum NmActionResponseCommand, class NmActionRequest const &)
 	??0NmMessageListModel@@QAE@AAVNmDataManager@@PAVQObject@@@Z @ 234 NONAME ; NmMessageListModel::NmMessageListModel(class NmDataManager &, class QObject *)
 	??_ENmAddAttachmentsOperation@@UAE@I@Z @ 235 NONAME ; NmAddAttachmentsOperation::~NmAddAttachmentsOperation(unsigned int)
@@ -312,5 +312,5 @@
 	?qt_metacall@NmUiEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 311 NONAME ; int NmUiEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?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
-	?enableSyncIndicator@NmUiEngine@@QAEX_N@Z @ 314 NONAME ; void NmUiEngine::enableSyncIndicator(bool)
+	?getSignature@NmUiEngine@@QAEHABVNmId@@AAPAVQString@@@Z @ 314 NONAME ; int NmUiEngine::getSignature(class NmId const &, class QString * &)
 
--- a/emailuis/nmailuiengine/eabi/nmailuiengineu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/eabi/nmailuiengineu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -39,11 +39,11 @@
 	_ZN10NmUiEngine18operationCompletedERK26NmOperationCompletionEvent @ 38 NONAME
 	_ZN10NmUiEngine18removeDraftMessageEP9NmMessage @ 39 NONAME
 	_ZN10NmUiEngine18updateActiveFolderERK4NmIdS2_ @ 40 NONAME
-	_ZN10NmUiEngine19getStaticMetaObjectEv @ 41 NONAME
-	_ZN10NmUiEngine20contentToMessagePartERK4NmIdS2_S2_R13NmMessagePart @ 42 NONAME
-	_ZN10NmUiEngine20createForwardMessageERK4NmIdS2_ @ 43 NONAME
-	_ZN10NmUiEngine20handleSyncStateEventE11NmSyncStateRK26NmOperationCompletionEvent @ 44 NONAME
-	_ZN10NmUiEngine22getPluginIdByMailboxIdEj @ 45 NONAME
+	_ZN10NmUiEngine19enableSyncIndicatorEb @ 41 NONAME
+	_ZN10NmUiEngine19getStaticMetaObjectEv @ 42 NONAME
+	_ZN10NmUiEngine20contentToMessagePartERK4NmIdS2_S2_R13NmMessagePart @ 43 NONAME
+	_ZN10NmUiEngine20createForwardMessageERK4NmIdS2_ @ 44 NONAME
+	_ZN10NmUiEngine20handleSyncStateEventE11NmSyncStateRK26NmOperationCompletionEvent @ 45 NONAME
 	_ZN10NmUiEngine22sendOperationCompletedEv @ 46 NONAME
 	_ZN10NmUiEngine23refreshMailboxListModelEv @ 47 NONAME
 	_ZN10NmUiEngine24messageEventForListModelE14NmMessageEventRK4NmIdRK5QListIS1_ES3_ @ 48 NONAME
@@ -319,5 +319,5 @@
 	_ZThn8_N18NmBaseClientPlugin10getActionsERK15NmActionRequestR5QListIP8NmActionE @ 318 NONAME
 	_ZThn8_N18NmBaseClientPluginD0Ev @ 319 NONAME
 	_ZThn8_N18NmBaseClientPluginD1Ev @ 320 NONAME
-	_ZN10NmUiEngine19enableSyncIndicatorEb @ 321 NONAME
+	_ZN10NmUiEngine12getSignatureERK4NmIdRP7QString @ 321 NONAME
 
--- a/emailuis/nmailuiengine/inc/nmdataplugininterface.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmdataplugininterface.h	Mon Aug 23 23:32:31 2010 +0300
@@ -192,6 +192,8 @@
         const QList<quint64> &messageIds, 
         const NmId &sourceFolderId,
         const NmId &destinationFolderId) = 0;
+
+    virtual int getSignature(const NmId &mailboxId, QString *&signature) = 0;
 };
 
 Q_DECLARE_INTERFACE(NmDataPluginInterface, "sf.app.commonmail.emailuis.nmailuiengine.NmDataPluginInterface/1.0")
--- a/emailuis/nmailuiengine/inc/nmuiengine.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmuiengine.h	Mon Aug 23 23:32:31 2010 +0300
@@ -55,8 +55,6 @@
 
     void refreshMailboxListModel();
 
-    NmId getPluginIdByMailboxId(quint32 accountId);
-
     NmMessageListModel &messageListModel(const NmId &mailboxId,
                                          const NmId &folderId);
 
@@ -173,6 +171,8 @@
 
     void enableSyncIndicator(bool enabled);
 
+    int getSignature(const NmId &mailboxId, QString *&signature);
+
 public slots:
 
     void handleCompletedSendOperation();
--- a/emailuis/nmailuiengine/src/nmuiengine.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmuiengine.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -1157,6 +1157,28 @@
 	}
 }
 
+/*!
+    Gets the signature for the given mailbox.
+
+    \param mailboxId The mailbox id whose signature is asked.
+	\param signature The reference to the signature string pointer. NULL if no signature.
+*/
+int NmUiEngine::getSignature(const NmId &mailboxId, QString *&signature)
+{
+    NM_FUNCTION;
+    
+    int retVal(NmNoError);
+    
+    // Get the plugin interface.
+    NmDataPluginInterface *pluginInterface =
+        mPluginFactory->interfaceInstance(mailboxId);
+
+    if (pluginInterface) {
+        retVal = pluginInterface->getSignature(mailboxId, signature);
+    }
+    
+    return retVal;
+}
 
 /*!
     Emits signals based on message events coming from plugins.
@@ -1275,23 +1297,3 @@
         emit operationCompleted(event);
     }
 }
-
-/*!
-    returns full mailbox id from plain account id
-*/
-NmId NmUiEngine::getPluginIdByMailboxId(quint32 accountId)
-{
-    NM_FUNCTION;
-
-    NmId fullId = NULL;
-    fullId.setId32(accountId);
-    QList<NmId> mailboxList;
-    if(mDataManager){
-        mDataManager->listMailboxIds(mailboxList);
-        for(int i=0;i<mailboxList.count();i++){
-            if(mailboxList.at(i).id32() == accountId)
-                fullId.setPluginId32(mailboxList.at(i).pluginId32());
-            }
-        }
-    return fullId;
-}
--- a/emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/bwins/nmailuiwidgetsu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -132,4 +132,5 @@
 	?qt_metacall@NmBaseViewScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 131 NONAME ; int NmBaseViewScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?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)
 
--- a/emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/eabi/nmailuiwidgetsu.def	Mon Aug 23 23:32:31 2010 +0300
@@ -160,4 +160,7 @@
 	_ZThn8_N22NmAttachmentListWidget5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 159 NONAME
 	_ZThn8_N22NmAttachmentListWidgetD0Ev @ 160 NONAME
 	_ZThn8_N22NmAttachmentListWidgetD1Ev @ 161 NONAME
+	_ZN20NmAttachmentListItem10setPressedEb @ 162 NONAME
+	_ZN22NmAttachmentListWidget10checkColorEv @ 163 NONAME
+	_ZN22NmAttachmentListWidget11changeEventEP6QEvent @ 164 NONAME
 
--- a/emailuis/nmailuiwidgets/inc/nmailuiwidgetsheaders.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/inc/nmailuiwidgetsheaders.h	Mon Aug 23 23:32:31 2010 +0300
@@ -38,6 +38,9 @@
 #endif
 
 // Orbit
+#include <HbInstantFeedback>
+#include <HbFrameItem>
+#include <HbEffect>
 #include <hbmessagebox.h>
 #include <hbscrollarea.h>
 #include <hbstyleloader.h>
@@ -49,6 +52,7 @@
 #include <hbtapgesture.h>
 #include <hbevent.h>
 
+
 // nmail
 #include <nmaddress.h>
 #include <nmcommon.h>
--- a/emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/inc/nmattachmentlistitem.h	Mon Aug 23 23:32:31 2010 +0300
@@ -25,6 +25,7 @@
 class HbProgressBar;
 class HbTextItem;
 class HbTapGesture;
+class HbFrameItem;
 
 class NMAILUIWIDGETS_EXPORT NmAttachmentListItem : public HbWidget
 {
@@ -39,9 +40,10 @@
     void setProgressBarValue(const int value);
     int progressBarValue() const;
     void hideProgressBar();
+    void setPressed(bool pressed);
 
 protected: 
-    virtual void gestureEvent(QGestureEvent *event);
+   virtual void gestureEvent(QGestureEvent *event);
     
 private slots:
     void removeProgressBar();
@@ -60,6 +62,7 @@
     HbTextItem *mFileSizeText; //owned
     HbProgressBar *mProgressBar; //owned
     QColor mTextColor;
+    HbFrameItem *mBackGround; //not owned
 };
 
 #endif /* NMATTACHMENTLISTITEM_H_ */
--- a/emailuis/nmailuiwidgets/nmailuiwidgets.pro	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/nmailuiwidgets.pro	Mon Aug 23 23:32:31 2010 +0300
@@ -12,6 +12,7 @@
 TEMPLATE = lib
 TARGET = nmailuiwidgets
 CONFIG += hb
+HB += hbfeedback
 DEFINES += BUILD_NMAILUIWIDGETS_DLL
 INCLUDEPATH += ./inc \
   ../../inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmattachmentlistitem.css	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,24 @@
+NmAttachmentListItem {
+    layout:customitem;
+}
+
+NmAttachmentListItem::filename {
+  fixed-height: var(hb-param-text-height-secondary);
+  font-variant: secondary;
+  text-align: left center; 
+  size-policy-horizontal: expanding;
+  size-policy-vertical: minimum;
+}
+
+NmAttachmentListItem::filesize {
+  fixed-height: var(hb-param-text-height-secondary);
+  /* Hardcoded file size length. Maximum (999.9 Mb) fits into size field. */
+  fixed-width: 17.91045un;
+  font-variant: secondary;
+  text-align: right center; 
+  size-policy-vertical: minimum;
+}
+
+NmAttachmentListItem::progressbar {
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmattachmentlistitem.widgetml	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,16 @@
+<hbwidget version="0.1" type="NmAttachmentListItem">
+    <layout name="customitem" type="mesh">   
+        <meshitem src="filename" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-left)"/>
+        <meshitem src="filename" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
+        <meshitem src="filename" srcEdge="BOTTOM" dst="progressbar" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)"/>
+        <meshitem src="filename" srcEdge="RIGHT" dst="filesize" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)"/>
+        
+        <meshitem src="filesize" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
+        <meshitem src="filesize" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-top)"/>
+        <meshitem src="filesize" srcEdge="BOTTOM" dst="progressbar" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)"/>
+        
+        <meshitem src="progressbar" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)"/>
+        <meshitem src="" srcEdge="LEFT" dst="progressbar" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)"/>
+        <meshitem src="progressbar" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-right)"/>
+    </layout>
+</hbwidget>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmattachmentlistwidget.docml	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.0">
+    <widget name="nmattachmentlistwidget" type="HbWidget">
+        <layout type="grid"/>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmeditortextedit.widgetml	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,2 @@
+<hbwidget version="0.1" type="NmEditorTextEdit">
+</hbwidget>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmeditortexteditblack.css	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,10 @@
+
+NmEditorTextEdit {
+    color: black;
+    background: white;
+    background-color: white;
+    border: red;
+    selection-color: white;
+    selection-background-color: cyan;
+    text-align: left;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emailuis/nmailuiwidgets/resources/nmeditortexteditblue.css	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,10 @@
+
+NmEditorTextEdit {
+    color: blue;
+    background: white;
+    background-color: white;
+    border: red;
+    selection-color: white;
+    selection-background-color: cyan;
+    text-align: left;
+}
--- a/emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiwidgets/src/nmattachmentlistitem.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -19,6 +19,8 @@
 
 static const QString FILE_PATH_WIDGETML = ":nmattachmentlistitem.widgetml";
 static const QString FILE_PATH_CSS = ":nmattachmentlistitem.css";
+static const QString LIST_ITEM_BG_FRAME_NORMAL ("qtg_fr_list_normal");
+static const QString LIST_ITEM_BG_FRAME_PRESSED("qtg_fr_list_pressed");
 
 static const int PROGRESSBAR_MIN = 0; 
 static const int PROGRESSBAR_MAX = 100;
@@ -43,7 +45,8 @@
     : HbWidget( parent ),
       mFileNameText(NULL),
       mFileSizeText(NULL),
-      mProgressBar(NULL)
+      mProgressBar(NULL),
+      mBackGround(NULL)
 {
     NM_FUNCTION;
     
@@ -52,6 +55,8 @@
     // Informs GestureFramework that NmAttachmentListItem widget is interested 
     // Tap gesture and TapAndHold gesture.
     grabGesture(Qt::TapGesture);
+    HbEffect::add("mailAttachmentWidget", "listviewitem_press", "pressed");
+    HbEffect::add("mailAttachmentWidget", "listviewitem_release", "released");
 }
 
 /*!
@@ -185,19 +190,34 @@
 {
     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();
+    
+    
     //construct default ui.    
     HbStyleLoader::registerFilePath(FILE_PATH_WIDGETML);
     HbStyleLoader::registerFilePath(FILE_PATH_CSS);
     
-    mFileNameText = new HbTextItem(this); 
-    mFileNameText->setObjectName("nmattachmentlistitem_filenametext");
-    HbStyle::setItemName( mFileNameText, "filename" );    
-    mFileNameText->setElideMode(Qt::ElideRight);
-
-    mFileSizeText = new HbTextItem(this); 
-    mFileSizeText->setObjectName("nmattachmentlistitem_filenamesize");
-    HbStyle::setItemName( mFileSizeText, "filesize" );
-    mFileSizeText->setElideMode(Qt::ElideNone);
+    
+    QScopedPointer<HbTextItem> fileNameText(new HbTextItem(this));
+    fileNameText->setObjectName("nmattachmentlistitem_filenametext");
+    HbStyle::setItemName( fileNameText.data(), "filename" );  
+    fileNameText->setElideMode(Qt::ElideRight);
+    
+    
+    QScopedPointer<HbTextItem> fileSizeText(new HbTextItem(this));
+    fileSizeText->setObjectName("nmattachmentlistitem_filenamesize");
+    HbStyle::setItemName( fileSizeText.data(), "filesize" );
+    fileSizeText->setElideMode(Qt::ElideNone);
+    
+    // ownership transferred to this object
+    mFileSizeText = fileSizeText.take(); 
+    mFileNameText = fileNameText.take();
 }
 
 
@@ -220,25 +240,32 @@
 /*!
     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:
+        case HbTapGesture::Tap: 
             {
-                if (tap->state() == Qt::GestureFinished) {
+                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:
              {
-                 if (tap->state() == Qt::GestureFinished) {
                  emit itemLongPressed(event->mapToGraphicsScene(tap->position()));
-                 }
+                 setPressed(false);
              }    
              break;
         }
@@ -248,4 +275,22 @@
     }
 }
 
+/*!
+    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");
+    }    
+}
--- a/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Mon Aug 23 23:32:31 2010 +0300
@@ -201,12 +201,14 @@
     
     QPointer<NmOperation> removeDraftMessage(NmMessage *message);
 	
-	int copyMessages(
+    int copyMessages(
         const NmId &mailboxId,
         const QList<quint64> &messageIds,
         const NmId &sourceFolderId,
         const NmId &destinationFolderId);
     
+    int getSignature(const NmId &mailboxId, QString *&signature);
+
 signals:
 
     void mailboxEvent(NmMailboxEvent event, const QList<NmId> &mailboxIds);
@@ -263,8 +265,6 @@
                  const QStringList &searchStrings,
                  NmMailboxSearchObserver &searchObserver);
 
-    NmId getMailboxIdByMailMsgId(TFSMailMsgId mailbox);
-
     void removeMessageL(const NmId& mailboxId,
                         const NmId& folderId,
                         const NmId& messageId);
@@ -311,6 +311,7 @@
 	
 	void deleteMailboxByIdL(const NmId &mailboxId);    
 
+    void getSignatureL(const NmId &mailboxId, QString *&signature);
 
 private: // Data
 
--- a/emailuis/nmframeworkadapter/inc/nmfwadeletemailboxoperation.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmfwadeletemailboxoperation.h	Mon Aug 23 23:32:31 2010 +0300
@@ -42,7 +42,6 @@
 protected:
     void doRunAsyncOperation();
     void doCompleteOperation();
-    void doCancelOperation();
 
 private:
     ~NmFwaDeleteMailboxOperation();
--- a/emailuis/nmframeworkadapter/inc/nmfwaremovedraftmessageoperation.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmfwaremovedraftmessageoperation.h	Mon Aug 23 23:32:31 2010 +0300
@@ -43,7 +43,6 @@
 protected:
     void doRunAsyncOperation();
     void doCompleteOperation();
-    void doCancelOperation();
 
 private:
     ~NmFwaRemoveDraftMessageOperation();
--- a/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmframeworkadapter.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -91,7 +91,7 @@
     QList<NmMailbox*> mailboxList;
     int ret = listMailboxes(mailboxList);
 
-    if ( ret == NmNoError ) {
+    if (ret == NmNoError) {
         QListIterator<NmMailbox*> iterator(mailboxList);
         while (iterator.hasNext()) {
             NmMailbox *box = iterator.next();
@@ -121,12 +121,12 @@
 
     //if id.IsNullId(), mailboxes are listed from all plugins.
     //otherwise, only from the given one.
-    TInt rcode = mFSfw->ListMailBoxes(id,mailBoxes);
+    TInt rcode = mFSfw->ListMailBoxes(id, mailBoxes);
 
-    if ( rcode == NmNoError ) {
+    if (rcode == NmNoError) {
         // convert mailbox data to QT classes
-        NmMailbox* box(0);
-        for(TInt i=0;i<mailBoxes.Count();i++) {
+        NmMailbox *box(NULL);
+        for (TInt i(0) ; i < mailBoxes.Count(); i++) {
             box = NULL;
             if (mailBoxes[i]) {
                 box = mailBoxes[i]->GetNmMailbox();
@@ -136,7 +136,7 @@
                 }
             }
         }
-	mailBoxes.ResetAndDestroy();
+    mailBoxes.ResetAndDestroy();
     return rcode;
 }
 
@@ -186,37 +186,31 @@
 
     \return Error code.
  */
-int NmFrameworkAdapter::getFolderById( const NmId& mailboxId, const NmId& folderId, NmFolder*& folder )
-    {
+int NmFrameworkAdapter::getFolderById(const NmId& mailboxId, const NmId& folderId, NmFolder*& folder)
+{
     NM_FUNCTION;
 
-    TRAPD(err, getFolderByIdL( mailboxId, folderId, folder ) );
+    TRAPD(err, getFolderByIdL(mailboxId, folderId, folder));
     return err;
-    }
+}
 
 /*!
     Leaving version of getFolderById function
  */
-void NmFrameworkAdapter::getFolderByIdL( const NmId& mailboxId, const NmId& folderId, NmFolder*& folder )
-    {
+void NmFrameworkAdapter::getFolderByIdL(const NmId& mailboxId, const NmId& folderId, NmFolder*& folder)
+{
     NM_FUNCTION;
 
     CFSMailFolder* fsFolder(NULL);
-	if (mFSfw)
-		{
-    	fsFolder = mFSfw->GetFolderByUidL(TFSMailMsgId(mailboxId), TFSMailMsgId(folderId));
-    	if (fsFolder)
-        	{
-        	folder = fsFolder->GetNmFolder();
-        	delete fsFolder;
-        	fsFolder = NULL;
-        	}
-    	else
-    	    {
-            User::Leave(KErrNotFound);
-    	    }
-		}
+    fsFolder = mFSfw->GetFolderByUidL(TFSMailMsgId(mailboxId), TFSMailMsgId(folderId));
+    if (fsFolder) {
+        folder = fsFolder->GetNmFolder();
+        delete fsFolder;
+        fsFolder = NULL;
+    } else {
+        User::Leave(KErrNotFound);
     }
+}
 
 
 /*!
@@ -238,7 +232,7 @@
 {
     NM_FUNCTION;
 
-    TRAPD(err, getMessageByIdL(mailboxId,folderId,messageId,message));
+    TRAPD(err, getMessageByIdL(mailboxId, folderId, messageId, message));
     return err;
 }
 
@@ -267,6 +261,8 @@
 
         message->removeAllChildParts();
         childrenToNmMessagePartL(newMessage, message);
+        delete newMessage;
+        newMessage = NULL;
     }
     else {
         User::Leave(KErrNotFound);
@@ -276,29 +272,30 @@
 /*!
     Returns list of folders in a mailbox.
 
-	\param mailboxId Id of the mailbox containing the folder.
-	\param folderList Reference to a pointer list to receive pointers to the folders.
+  \param mailboxId Id of the mailbox containing the folder.
+  \param folderList Reference to a pointer list to receive pointers to the folders.
 
-	\return Error code.
+  \return Error code.
  */
 int NmFrameworkAdapter::listFolders(
     const NmId& mailboxId,
     QList<NmFolder*>& folderList)
 {
     NM_FUNCTION;
-
-    CFSMailBox* currentMailbox = NULL;
-    TRAPD (err, currentMailbox = mFSfw->GetMailBoxByUidL(mailboxId));
-    if (KErrNone == err) {
+    int err(NmNoError);
+    CFSMailBox* currentMailbox(NULL); 
+    TRAP(err, currentMailbox = mFSfw->GetMailBoxByUidL(mailboxId));
+    if (KErrNone == err && currentMailbox) {
         RPointerArray<CFSMailFolder> folders = currentMailbox->ListFolders();
         for (int i = 0; i < folders.Count(); i++) {
             folderList.append(folders[i]->GetNmFolder());
         }
-        return KErrNone;
+        delete currentMailbox;
+        currentMailbox = NULL;
+    } else {
+        err = NmNotFoundError;
     }
-    else {
-        return err;
-    }
+    return err;
 }
 
 
@@ -316,11 +313,7 @@
      const int maxEnvelopeCount)
 {
     NM_FUNCTION;
-
-    if (!folder || maxEnvelopeCount < 1) {
-        return;
-    }
-
+    // validity of input parameters is checked in calling function
     int blockSize = NmListMessagesBlock;
     int maxItemCount = NmMaxItemsInMessageList;
 
@@ -428,7 +421,7 @@
 {
     NM_FUNCTION;
 
-    TInt err = KErrNone;
+    TInt err(KErrNone);
     TRAP(err, listMessagesL(mailboxId,folderId, messageEnvelopeList,maxAmountOfEnvelopes) );
     return err;
 }
@@ -507,7 +500,7 @@
 {
     NM_FUNCTION;
 
-    CFSMailBox * currentMailbox(NULL);
+    CFSMailBox* currentMailbox(NULL);
     CFSMailFolder* folder(NULL);
 
     //If we are requesting 0 or less mails so we can return
@@ -647,6 +640,8 @@
 
     if (err == KErrNone && mailbox) {
         mailbox->CancelSearch();
+        delete mailbox;
+        mailbox = NULL;
     }
 
     return err;
@@ -730,6 +725,7 @@
     mailbox = mFSfw->GetMailBoxByUidL(mailboxId);
 
     if (mailbox) {
+        CleanupStack::PushL(mailbox);
         RPointerArray<TDesC> strings;
         CleanupResetAndDestroy<TDesC>::PushL(strings);
 
@@ -751,6 +747,7 @@
         // Clean up.
         strings.ResetAndDestroy();
         CleanupStack::Pop(&strings);
+        CleanupStack::PopAndDestroy(mailbox);
     }
 }
 
@@ -846,12 +843,12 @@
     TFSMailMsgId fsMsgId(messageId);
     TFSMailMsgId fsMsgPartId(messagePartId);
 
-    CFSMailMessage* fsMessage = NULL;
-    int error = KErrNone;
+    CFSMailMessage* fsMessage(NULL);
+    int error(KErrNone);
     TRAP(error, fsMessage = mFSfw->GetMessageByUidL(fsMboxId, fsFolderId,
             fsMsgId, details) );
 
-    CFSMailMessagePart* fsMessagePart = NULL;
+    CFSMailMessagePart* fsMessagePart(NULL);
     if (fsMessage && error == KErrNone) {
         TRAP(error, fsMessagePart = fsMessage->ChildPartL(fsMsgPartId) );
 
@@ -860,6 +857,10 @@
         RFile file = fsMessagePart->GetContentFileL();
         retFile.setHandle(file);
     }
+    delete fsMessagePart;
+    fsMessagePart = NULL;
+    delete fsMessage;
+    fsMessage = NULL;
     return retFile;
 }
 
@@ -879,34 +880,34 @@
 
     TFSMailMsgId folderId;
     NmId resultId(0);
-    CFSMailBox * currentMailbox(NULL);
+    CFSMailBox* currentMailbox(NULL);
 
-    TRAPD(error, currentMailbox = mFSfw->GetMailBoxByUidL(mailboxId) );
+    TRAPD(error, currentMailbox = mFSfw->GetMailBoxByUidL(mailboxId));
 
-    if( !currentMailbox || error != KErrNone ) {
-    	return resultId;
+    if(!currentMailbox || error != KErrNone) {
+      return resultId;
     }
 
     switch(folderType) {
-    	case NmFolderInbox:
-    		folderId = currentMailbox->GetStandardFolderId( EFSInbox );
-    		break;
-    	case NmFolderOutbox:
-    		folderId = currentMailbox->GetStandardFolderId( EFSOutbox );
-    		break;
-    	case NmFolderDrafts:
-    		folderId = currentMailbox->GetStandardFolderId( EFSDraftsFolder );
-    		break;
-    	case NmFolderSent:
-    		folderId = currentMailbox->GetStandardFolderId( EFSSentFolder );
-    		break;
-    	case NmFolderDeleted:
-    		folderId = currentMailbox->GetStandardFolderId( EFSDeleted );
-    		break;
-    	case NmFolderOther:
-    	default:
-    		folderId = currentMailbox->GetStandardFolderId( EFSOther );
-    		break;
+      case NmFolderInbox:
+        folderId = currentMailbox->GetStandardFolderId(EFSInbox);
+        break;
+      case NmFolderOutbox:
+        folderId = currentMailbox->GetStandardFolderId(EFSOutbox);
+        break;
+      case NmFolderDrafts:
+        folderId = currentMailbox->GetStandardFolderId(EFSDraftsFolder);
+        break;
+      case NmFolderSent:
+        folderId = currentMailbox->GetStandardFolderId(EFSSentFolder);
+        break;
+      case NmFolderDeleted:
+        folderId = currentMailbox->GetStandardFolderId(EFSDeleted);
+        break;
+      case NmFolderOther:
+      default:
+        folderId = currentMailbox->GetStandardFolderId(EFSOther);
+        break;
     }
 
     delete currentMailbox;
@@ -929,7 +930,7 @@
     NM_FUNCTION;
     
     TRAPD(err, RefreshMailboxL(mailboxId)); // return value not used
-    return ( err == KErrNone ) ? NmNoError : NmGeneralError;
+    return (err == KErrNone) ? NmNoError : NmGeneralError;
 }
 
 /*!
@@ -943,7 +944,7 @@
     NM_FUNCTION;
     
     TRAPD(err, GoOnlineL(mailboxId)); // return value not used
-    return ( err == KErrNone ) ? NmNoError : NmGeneralError;
+    return (err == KErrNone) ? NmNoError : NmGeneralError;
 }
 
 /*!
@@ -957,7 +958,7 @@
     NM_FUNCTION;
     
     TRAPD(err, GoOfflineL(mailboxId)); // return value not used
-    return ( err == KErrNone ) ? NmNoError : NmGeneralError;
+    return (err == KErrNone) ? NmNoError : NmGeneralError;
 }
 
 /*!
@@ -1000,7 +1001,7 @@
     cfsPart->SetFolderId(TFSMailMsgId(folderId));
     QString contentType = messagePart.contentType();
 
-    if (cfsPart && contentType.startsWith(NmContentTypeTextPlain)) {
+    if (contentType.startsWith(NmContentTypeTextPlain)) {
         // add 1 for max size for zero termination and prevend 0 size hbufc
         HBufC* data = HBufC::NewLC(cfsPart->FetchedContentSize()+1);
         TPtr dataPtr = data->Des();
@@ -1009,8 +1010,7 @@
         cfsPart->GetContentToBufferL(dataPtr, startOffset);
         messagePart.setTextContent(NmConverter::toQString(dataPtr), contentType);
         CleanupStack::PopAndDestroy(data);
-    }
-    else if (cfsPart){
+    } else {
         RFile file = cfsPart->GetContentFileL();
         TInt fileSize = 0;
         file.Size(fileSize);
@@ -1024,7 +1024,7 @@
                 User::LeaveIfError(file.Read(dataPtr));
             }
 
-            if (contentType.startsWith(NmContentTypeTextHtml) || contentType.contains( NmContentDescrAttachmentHtml )) {
+            if (contentType.startsWith(NmContentTypeTextHtml) || contentType.contains( NmContentDescrAttachmentHtml)) {
                 QRegExp rxlen("(?:charset=)(?:\"?)([\\-\\_a-zA-Z0-9]+)", Qt::CaseInsensitive);
                 QString charset;
                 int pos = rxlen.indexIn(contentType);
@@ -1038,8 +1038,7 @@
                 }
                 QString encodedStr = codec->toUnicode(msgBytes);
                 messagePart.setTextContent(encodedStr, contentType);
-            }
-            else {
+            } else {
                 messagePart.setBinaryContent(QByteArray(
                         reinterpret_cast<const char*>(dataPtr.Ptr()), fileSize), contentType);
             }
@@ -1047,11 +1046,6 @@
         }
         file.Close();
     }
-    else {
-        // null cfsPart
-        User::Leave(KErrNotFound);
-    }
-
     CleanupStack::PopAndDestroy(cfsPart);
 }
 
@@ -1065,17 +1059,17 @@
     \return Error code.
  */
 int NmFrameworkAdapter::deleteMessages(
-	const NmId &mailboxId,
-	const NmId &folderId,
-	const QList<NmId> &messageIdList)
+    const NmId &mailboxId,
+    const NmId &folderId,
+    const QList<NmId> &messageIdList)
 {
     NM_FUNCTION;
 
-    TInt err = NmNoError;
+    TInt err(NmNoError);
     RArray<TFSMailMsgId> messageIds;
-    for (TInt i=0; i<messageIdList.size(); i++) {
+    for (TInt i(0); i < messageIdList.size(); i++) {
         err = messageIds.Append(TFSMailMsgId(messageIdList[i]));
-        if (err!=NmNoError) {
+        if (err != NmNoError) {
             break;
         }
     }
@@ -1084,7 +1078,7 @@
     }
     messageIds.Close();
 
-    return ( err == NmNoError ) ? NmNoError : NmGeneralError;
+    return (err == NmNoError) ? NmNoError : NmGeneralError;
 }
 
 /*!
@@ -1097,9 +1091,9 @@
     \return NmStoreEnvelopesOperation
  */
 QPointer<NmStoreEnvelopesOperation> NmFrameworkAdapter::storeEnvelopes(
-	const NmId &mailboxId,
-	const NmId &folderId,
-	const QList<const NmMessageEnvelope*> &envelopeList)
+    const NmId &mailboxId,
+    const NmId &folderId,
+    const QList<const NmMessageEnvelope*> &envelopeList)
 {
     NM_FUNCTION;
 
@@ -1108,7 +1102,7 @@
     QPointer<NmStoreEnvelopesOperation> operation(NULL);
     RPointerArray<CFSMailMessage> envelopeMessages;
 
-    int count = envelopeList.count();
+    int count(envelopeList.count());
     for(int i(0); i < count; i++) {
         TRAP_IGNORE(envelopeMessages.AppendL(mailMessageFromEnvelopeL(*envelopeList.at(i))));
     }
@@ -1242,7 +1236,8 @@
         // void messageEvent(
         //      NmMessageEvent event,
         //      const NmId &folderId,
-        //      QList<NmId> &messageIds);
+        //      QList<NmId> &messageIds
+        //      const NmId& mailboxId);
         //
         // enum NmMessageEvent
         //   NmMessageCreated,
@@ -1315,7 +1310,7 @@
             else {
                 emit connectionEvent(Disconnected, id, NmNoError);
             }
-			}
+      }
             break;
 
         default:
@@ -1364,6 +1359,19 @@
 }
 
 /*!
+    Gets the signature for the given mailbox.
+
+    \param mailboxId Id of the mailbox.
+*/
+int NmFrameworkAdapter::getSignature(const NmId &mailboxId, QString *&signature)
+{
+    NM_FUNCTION;
+    TRAPD(error, getSignatureL(mailboxId, signature));
+    
+    return error;
+}
+
+/*!
     Subscribe to events from a mailbox.
 
     \param mailboxId Id of the mailbox.
@@ -1387,25 +1395,6 @@
     mFSfw->UnsubscribeMailboxEvents(mailboxId, *this);
 }
 
-NmId NmFrameworkAdapter::getMailboxIdByMailMsgId(TFSMailMsgId mailbox)
-{
-    NM_FUNCTION;
-    
-    NmId nmId(0);
-
-    QList<NmId> mailboxIds;
-    listMailboxIds(mailboxIds);
-
-    QListIterator<NmId> iterator(mailboxIds);
-    while (iterator.hasNext()) {
-        nmId = iterator.next();
-        if (nmId.id32() == mailbox.Id()) {
-            break;
-        }
-    }
-    mailboxIds.clear();
-    return nmId;
-}
 
 /*!
     Leaving version of removeMessage
@@ -1435,31 +1424,51 @@
     const NmId& destinationFolderId)
 {
     NM_FUNCTION;
-
+    TInt count(messageIds.count());
+    if (!count) {
+        return;
+    }
     RArray<TFSMailMsgId> messages;
     RArray<TFSMailMsgId> copiedMessages;
 
     CleanupClosePushL(messages);
     CleanupClosePushL(copiedMessages);
 
-    for (TInt i = 0; i < messageIds.count(); i++) {
+    for (TInt i = 0; i < count; i++) {
         NmId tmpId(messageIds[i]);
         messages.AppendL(TFSMailMsgId(tmpId));
     }
 
-    CFSMailBox* mailBox = NULL;
+    CFSMailBox* mailBox(NULL);
     mailBox = mFSfw->GetMailBoxByUidL(mailboxId);
     if (mailBox) {
         mailBox->CopyMessagesL(messages, copiedMessages,
             TFSMailMsgId(sourceFolderId),
             TFSMailMsgId(destinationFolderId));
         delete mailBox;
+        mailBox = NULL;
+    } else {
+        User::Leave(NmNotFoundError);
     }
-
     CleanupStack::PopAndDestroy(2,&messages);
 }
 
 /*!
+    Leaving version of getSignature
+*/
+void NmFrameworkAdapter::getSignatureL(const NmId &mailboxId, QString *&signature)
+{
+    NM_FUNCTION;
+    
+    HBufC *sig = mFSfw->GetSignatureL(TFSMailMsgId(mailboxId));
+
+    if (sig) {
+        signature = new QString(NmConverter::toQString(*sig));
+    }
+}
+
+
+/*!
    Sends the given message.
  */
 QPointer<NmMessageSendingOperation> NmFrameworkAdapter::sendMessage(
@@ -1468,7 +1477,7 @@
     NM_FUNCTION;
 
     QPointer<NmMessageSendingOperation>oper = new NmFwaMessageSendingOperation(*this, message, *mFSfw);
-	return oper;
+    return oper;
 }
 
 /*!
@@ -1509,6 +1518,7 @@
    if (KErrNone == err && mailBox) {
        TSSMailSyncState syncState = mailBox->CurrentSyncState();
        delete mailBox;
+       mailBox = NULL;
        if (EmailSyncing == syncState) {
            return Synchronizing;
        }
@@ -1528,11 +1538,12 @@
 {
     NM_FUNCTION;
 
-    CFSMailBox* mailBox = NULL;
+    CFSMailBox* mailBox(NULL);
     TRAPD(err, mailBox = mFSfw->GetMailBoxByUidL(TFSMailMsgId(mailboxId)) );
     if (KErrNone == err && mailBox) {
         TFSMailBoxStatus status = mailBox->GetMailBoxStatus();
         delete mailBox;
+        mailBox = NULL;
         if (status == EFSMailBoxOnline) {
             return Connected;
         }
@@ -1603,7 +1614,6 @@
         CleanupStack::PushL(currentMailbox);
         result = currentMailbox->RefreshNowL();
         CleanupStack::PopAndDestroy(currentMailbox);
-        currentMailbox = NULL;
     }
     return result;
 }
@@ -1622,7 +1632,6 @@
         CleanupStack::PushL(currentMailbox);
         currentMailbox->GoOnlineL();
         CleanupStack::PopAndDestroy(currentMailbox);
-        currentMailbox = NULL;
     }
     return result;
 }
@@ -1634,14 +1643,13 @@
 {
     NM_FUNCTION;
 
-	int result(KErrNotFound);
+    int result(KErrNotFound);
     CFSMailBox *currentMailbox(NULL);
     currentMailbox = mFSfw->GetMailBoxByUidL(mailboxId);
     if(currentMailbox) {
         CleanupStack::PushL(currentMailbox);
-		currentMailbox->GoOfflineL();
+        currentMailbox->GoOfflineL();
         CleanupStack::PopAndDestroy(currentMailbox);
-        currentMailbox = NULL;
     }
     return result;
 }
@@ -1649,19 +1657,12 @@
 /*!
    handles mailbox related events
  */
-void NmFrameworkAdapter::handleMailboxEvent( TFSMailMsgId mailbox, NmMailboxEvent event)
+void NmFrameworkAdapter::handleMailboxEvent(TFSMailMsgId mailbox, NmMailboxEvent event)
 {
     NM_FUNCTION;
 
     QList<NmId> mailboxIds;
-    NmId nmId;
-    if (event == NmMailboxDeleted || 
-        event == NmMailboxCreated ||
-        event == NmMailboxChanged) {
-		nmId = mailbox.GetNmId();
-    } else {
-		nmId = getMailboxIdByMailMsgId(mailbox);
-    }
+    NmId nmId = mailbox.GetNmId();
     mailboxIds.append(nmId);
     emit mailboxEvent(event, mailboxIds);
     }
--- a/emailuis/nmframeworkadapter/src/nmfwadeletemailboxoperation.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwadeletemailboxoperation.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -80,17 +80,7 @@
     
     mRequestId = NmNotFoundError;
 }
-
-/*!
-    
- */
-void NmFwaDeleteMailboxOperation::doCancelOperation()
-{
-    NM_FUNCTION;
-
-    // delete mailbox operation is not cancellable
-}
-    
+   
 /*!
     Asynchronous request response message.
     
--- a/emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwaforwardmessagecreationoperation.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -38,7 +38,7 @@
     
     const TFSMailMsgId mailMsgId(mMailboxId.pluginId32(), mMailboxId.id32());
 
-    CFSMailBox *mailBox = NULL;
+    CFSMailBox *mailBox(NULL);
     TRAP_IGNORE(mailBox = mMailClient.GetMailBoxByUidL(mailMsgId));
     
     if (mailBox) {
@@ -46,22 +46,21 @@
 
         if (err == KErrFSMailPluginNotSupported) {
             CFSMailMessage *fsMessage = mailBox->CreateForwardMessage(mOriginalMessageId);
- 
-            mMessage = fsMessage->GetNmMessage();
-            
-            delete fsMessage;
-            fsMessage = NULL;
-            
-            completeOperation(NmNoError);
+            if (fsMessage) {
+                mMessage = fsMessage->GetNmMessage();
+                delete fsMessage;
+                fsMessage = NULL;
+                completeOperation(NmNoError);
+            } else {
+                completeOperation(NmGeneralError);
+            }
         }
         else if (err != KErrNone) {
             completeOperation(NmGeneralError);
         }
-        
         delete mailBox;
         mailBox = NULL;
-    }
-    else {
+    } else {
         completeOperation(NmNotFoundError);
     }
 }
--- a/emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwamessagefetchingoperation.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -47,15 +47,15 @@
     const TFSMailMsgId folderId(mFolderId.pluginId32(), mFolderId.id32());
     const TFSMailMsgId messageId(mMessageId.pluginId32(), mMessageId.id32());
 
-    CFSMailFolder *folder( NULL );
+    CFSMailFolder *folder(NULL);
     TRAP_IGNORE(folder = mMailClient.GetFolderByUidL(mailboxId, folderId));
    
     if (folder) {
         RArray<TFSMailMsgId> messageIds; // Cleanupstack not needed
-        messageIds.Append( messageId );
-        TRAPD(err, mRequestId = folder->FetchMessagesL( messageIds, EFSMsgDataStructure, *this ));
+        messageIds.Append(messageId);
+        TRAPD(err, mRequestId = folder->FetchMessagesL(messageIds, EFSMsgDataStructure, *this));
         messageIds.Close();
-        if (err != KErrNone) {
+        if (KErrNone != err) {
             completeOperation(NmGeneralError);
         }
         delete folder;
@@ -100,10 +100,9 @@
     NM_FUNCTION;
     
     if (aRequestId == mRequestId) {
-        if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestComplete ) {
+        if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestComplete) {
             completeOperation(NmNoError);
-        }
-        else if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestCancelled) {
+        } else if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestCancelled) {
             completeOperation(NmCancelError); 
         }
     }
--- a/emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwamessagesendingoperation.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -214,11 +214,10 @@
         TFSMailMsgId mailboxId = NmConverter::nmIdToMailMsgId(mMessage->envelope().mailboxId());
         CFSMailBox *currentMailbox( NULL );
         currentMailbox = mMailClient.GetMailBoxByUidL(mailboxId);
-        CleanupStack::PushL(currentMailbox);
         if (!currentMailbox) {
             User::Leave( KErrNotFound );
         }
-    
+        CleanupStack::PushL(currentMailbox);
         CFSMailMessage *msg = CFSMailMessage::NewL(*mMessage); // no leave -> msg != NULL
         CleanupStack::PushL(msg);
         
--- a/emailuis/nmframeworkadapter/src/nmfwaremovedraftmessageoperation.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmframeworkadapter/src/nmfwaremovedraftmessageoperation.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -51,8 +51,7 @@
 NmFwaRemoveDraftMessageOperation::~NmFwaRemoveDraftMessageOperation()
 {
     NM_FUNCTION;
-    
-    doCancelOperation();
+   
     mMailClient.Close(); // decrease ref count
     delete mMessage;
     mMessage = NULL;
@@ -68,7 +67,7 @@
 {
     NM_FUNCTION;
     
-    TRAPD( err, removeMessageL() );
+    TRAPD(err, removeMessageL());
         
     if (err != KErrNone) {
         completeOperation(NmGeneralError);
@@ -86,16 +85,6 @@
 }
 
 /*!
-    
- */
-void NmFwaRemoveDraftMessageOperation::doCancelOperation()
-{
-    NM_FUNCTION;
-
-    // remove draft operation is not cancellable
-}
-    
-/*!
     Asynchronous request response message.
     
     \param aEvent Plugin event description.
@@ -125,26 +114,26 @@
 {
     NM_FUNCTION;
     
-    TFSMailMsgId mailboxId( mMessage->envelope().mailboxId() );
-    TFSMailMsgId folderId( mMessage->envelope().folderId() );
-    TFSMailMsgId messageId( mMessage->envelope().messageId() );
+    TFSMailMsgId mailboxId(mMessage->envelope().mailboxId());
+    TFSMailMsgId folderId(mMessage->envelope().folderId());
+    TFSMailMsgId messageId(mMessage->envelope().messageId());
     
-    CFSMailFolder* folder = mMailClient.GetFolderByUidL( mailboxId, folderId );
+    CFSMailFolder *folder = mMailClient.GetFolderByUidL(mailboxId, folderId);
     CleanupStack::PushL(folder);
-    if ( folder ) {
+    if (folder) {
         // try to use the asynchronous version first
-        TRAPD(err, mRequestId = folder->RemoveMessageL( messageId, *this ));
+        TRAPD(err, mRequestId = folder->RemoveMessageL(messageId, *this));
         
         if(err == KErrFSMailPluginNotSupported) {
             // async version not supported, use sync version
-            folder->RemoveMessageL( messageId );
+            folder->RemoveMessageL(messageId);
             completeOperation(NmNoError);
         } else if (KErrNone != err) {
             completeOperation(NmGeneralError);
         }
     }
     else {
-        User::Leave( KErrNotFound );
+        User::Leave(KErrNotFound);
     }
     CleanupStack::PopAndDestroy(folder);
 }
--- a/emailuis/nmhswidget/conf/nmhswidget.docml	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/conf/nmhswidget.docml	Mon Aug 23 23:32:31 2010 +0300
@@ -1,93 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hbdocument version="1.1">
-    <widget name="nmhswidgetContainer" type="HbWidget">
-        <widget name="mailRowContainer" type="HbWidget">
-            <widget name="noMailsLabel" type="HbLabel">
-                <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-                <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
-                <string locid="txt_mail_widget_info_no_messages" name="plainText" value="No mails!!!"/>
-                <string name="textColor" value="#000000"/>
+    <widget name="mainContainer" type="HbWidget">
+        <widget name="nmhswidgetContainer" type="HbWidget">
+            <widget name="mailRowContainer" type="HbWidget">
+                <widget name="noMailsLabel" type="HbLabel">
+                    <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+                    <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+                    <sizehint height="29.75un" type="PREFERRED" width="46un"/>
+                    <sizehint height="0un" type="MINIMUM" width="0un"/>
+                    <sizehint type="MAXIMUM" width="46un"/>
+                    <string name="textColor" value="#000000"/>
+                    <string locid="txt_mail_widget_info_no_messages" name="plainText" value="No mails!!!"/>
+                    <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
+                </widget>
                 <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-                <sizehint type="MAXIMUM" width="46un"/>
+                <sizehint height="expr(3*9.75un )" type="PREFERRED" width="46un"/>
                 <sizehint height="0un" type="MINIMUM" width="0un"/>
-                <sizehint height="29.75un" type="PREFERRED" width="46un"/>
+                <sizehint height="2504062.01158un" type="MAXIMUM" width="2504062.01158un"/>
+                <layout orientation="Vertical" spacing="0un" type="linear">
+                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                    <linearitem itemname="noMailsLabel"/>
+                </layout>
             </widget>
-            <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-            <sizehint height="expr(3*9.75un )" type="PREFERRED" width="46un"/>
-            <sizehint height="0un" type="MINIMUM" width="0un"/>
-            <sizehint height="2504062.01158un" type="MAXIMUM" width="2504062.01158un"/>
-            <layout orientation="Vertical" spacing="0un" type="linear">
-                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                <linearitem itemname="noMailsLabel"/>
+            <widget name="titleLayoutWidget" type="HbWidget">
+                <widget name="mailboxNameLabel" type="HbLabel">
+                    <real name="z" value="1"/>
+                    <sizepolicy horizontalPolicy="Ignored" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="34.92537un"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MAXIMUM"/>
+                    <string name="plainText" value="Mailbox gmail"/>
+                    <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                </widget>
+                <widget name="mailboxIcon" type="HbLabel">
+                    <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+                    <icon iconName="note_warning" name="icon"/>
+                    <real name="z" value="2"/>
+                    <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                    <sizehint height="10un" type="FIXED" width="10un"/>
+                    <sizehint height="10un" type="MINIMUM" width="10un"/>
+                    <sizehint height="10un" type="MAXIMUM" width="10un"/>
+                </widget>
+                <widget name="unreadCountLabel" type="HbLabel">
+                    <enums name="alignment" value="AlignRight|AlignVCenter|AlignTrailing"/>
+                    <real name="z" value="3"/>
+	            <sizepolicy horizontalPolicy="MinimumExpanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM" width="0un"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MAXIMUM" width="9un"/>
+                    <string locid="txt_mail_widget_list_l1" name="plainText" value="(999)"/>
+                    <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                </widget>
+                <widget name="collapseExpandIcon" type="HbPushButton">
+                    <icon iconName="note_warning" name="icon"/>
+                    <real name="z" value="4"/>
+                    <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                    <sizehint height="7un" type="FIXED" width="7un"/>
+                    <sizehint height="7un" type="MINIMUM" width="7un"/>
+                    <sizehint height="7un" type="MAXIMUM" width="7un"/>
+                    <string name="alignment" value="AlignVCenter|AlignHCenter"/>
+                </widget>
+                <real name="z" value="1"/>
+                <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="PREFERRED" width="46un"/>
+                <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="MINIMUM" width="expr(5*var(hb-param-margin-gene-middle-horizontal) + 27un )"/>
+                <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="MAXIMUM" width="46un"/>
+                <layout type="anchor">
+                    <anchoritem dst="mailboxIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="" srcEdge="LEFT"/>
+                    <anchoritem dst="mailboxIcon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                    <anchoritem dst="collapseExpandIcon" dstEdge="RIGHT" spacing="-0.25un" src="" srcEdge="RIGHT"/>
+                    <anchoritem dst="collapseExpandIcon" dstEdge="CENTERV" spacing="0un" src="unreadCountLabel" srcEdge="CENTERV"/>
+                    <anchoritem dst="unreadCountLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="collapseExpandIcon" srcEdge="LEFT"/>
+                    <anchoritem dst="unreadCountLabel" dstEdge="CENTERV" spacing="0un" src="mailboxNameLabel" srcEdge="CENTERV"/>
+                    <anchoritem dst="mailboxNameLabel" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="mailboxIcon" srcEdge="RIGHT"/>
+                    <anchoritem dst="mailboxNameLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
+                    <anchoritem dst="mailboxNameLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="unreadCountLabel" srcEdge="LEFT"/>
+                </layout>
+            </widget>
+            <real name="z" value="1"/>
+            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+            <sizehint height="expr(30un + var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="PREFERRED" width="46un"/>
+            <sizehint height="7un" type="MINIMUM" width="46un"/>
+            <sizehint height="42un" type="MAXIMUM" width="46un"/>
+            <layout type="anchor">
+                <anchoritem dst="titleLayoutWidget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="titleLayoutWidget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="mailRowContainer" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="mailRowContainer" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) + var(hb-param-margin-gene-bottom)  + var(hb-param-text-height-secondary))" src="" srcEdge="TOP"/>
+                <anchoritem dst="mailRowContainer" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="mailRowContainer" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
             </layout>
         </widget>
-        <widget name="titleLayoutWidget" type="HbWidget">
-            <widget name="mailboxNameLabel" type="HbLabel">
-                <real name="z" value="1"/>
-                <sizepolicy horizontalPolicy="Ignored" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="34.92537un"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MAXIMUM"/>
-                <string name="plainText" value="Mailbox gmail"/>
-                <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
-            </widget>
-            <widget name="mailboxIcon" type="HbLabel">
-                <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-                <icon iconName="note_warning" name="icon"/>
-                <real name="z" value="2"/>
-                <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                <sizehint height="11un" type="FIXED" width="11un"/>
-                <sizehint height="11un" type="MINIMUM" width="11un"/>
-                <sizehint height="11un" type="MAXIMUM" width="11un"/>
-            </widget>
-            <widget name="unreadCountLabel" type="HbLabel">
-                <enums name="alignment" value="AlignRight|AlignVCenter|AlignTrailing"/>
-                <real name="z" value="3"/>
-                <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="6un"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM" width="3un"/>
-                <sizehint height="expr(var(hb-param-text-height-secondary) )" type="MAXIMUM" width="9un"/>
-                <string locid="txt_mail_widget_list_l1" name="plainText" value="(999)"/>
-                <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
-            </widget>
-            <widget name="collapseExpandIcon" type="HbPushButton">
-                <icon iconName="note_warning" name="icon"/>
-                <real name="z" value="4"/>
-                <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                <sizehint height="7un" type="FIXED" width="7un"/>
-                <sizehint height="7un" type="MINIMUM" width="7un"/>
-                <sizehint height="7un" type="MAXIMUM" width="7un"/>
-                <string name="alignment" value="AlignVCenter|AlignHCenter"/>
-            </widget>
-            <real name="z" value="1"/>
+        <widget name="emptySpaceContainer" type="HbWidget">
             <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-            <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="PREFERRED" width="46un"/>
-            <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="MINIMUM" width="expr(5*var(hb-param-margin-gene-middle-horizontal) + 27un )"/>
-            <sizehint height="expr(var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) )" type="MAXIMUM" width="2504062.01158un"/>
-            <layout type="anchor">
-                <anchoritem dst="mailboxIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="" srcEdge="LEFT"/>
-                <anchoritem dst="mailboxIcon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="collapseExpandIcon" dstEdge="RIGHT" spacing="-0.25" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="collapseExpandIcon" dstEdge="CENTERV" spacing="0un" src="unreadCountLabel" srcEdge="CENTERV"/>
-                <anchoritem dst="unreadCountLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="collapseExpandIcon" srcEdge="LEFT"/>
-                <anchoritem dst="unreadCountLabel" dstEdge="CENTERV" spacing="0un" src="mailboxNameLabel" srcEdge="CENTERV"/>
-                <anchoritem dst="mailboxNameLabel" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="mailboxIcon" srcEdge="RIGHT"/>
-                <anchoritem dst="mailboxNameLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
-                <anchoritem dst="mailboxNameLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="unreadCountLabel" srcEdge="LEFT"/>
-            </layout>
+            <sizehint height="2.5un" type="PREFERRED" width="46un"/>
+            <sizehint height="2.5un" type="MINIMUM"/>
+            <sizehint height="2.5un" type="MAXIMUM"/>
         </widget>
-        <real name="z" value="1"/>
-        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-        <sizehint height="expr(3*9.75un + 7.5un )" type="PREFERRED" width="46un"/>
-        <sizehint height="0un" type="MINIMUM" width="46un"/>
-        <sizehint height="42un" type="MAXIMUM" width="46un"/>
+        <rect height="269.67499" name="geometry" width="308.19999" x="14" y="33"/>
+        <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+        <sizehint height="40.25un" type="PREFERRED" width="46un"/>
+        <sizehint height="40.25un" type="MINIMUM" width="46un"/>
+        <sizehint height="expr(4un + var(hb-param-margin-gene-bottom) + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-top) + 3*9.75un )" type="MAXIMUM" width="46un"/>
         <layout type="anchor">
-            <anchoritem dst="titleLayoutWidget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-            <anchoritem dst="titleLayoutWidget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-            <anchoritem dst="mailRowContainer" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-            <anchoritem dst="mailRowContainer" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) + var(hb-param-margin-gene-bottom)  + var(hb-param-text-height-secondary))" src="" srcEdge="TOP"/>
-            <anchoritem dst="mailRowContainer" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="mailRowContainer" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+            <anchoritem dst="emptySpaceContainer" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+            <anchoritem dst="emptySpaceContainer" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+            <anchoritem dst="emptySpaceContainer" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+            <anchoritem dst="nmhswidgetContainer" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+            <anchoritem dst="nmhswidgetContainer" dstEdge="TOP" spacing="0un" src="emptySpaceContainer" srcEdge="BOTTOM"/>
+            <anchoritem dst="nmhswidgetContainer" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
         </layout>
     </widget>
     <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
--- a/emailuis/nmhswidget/conf/nmhswidgetmail.docml	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/conf/nmhswidgetmail.docml	Mon Aug 23 23:32:31 2010 +0300
@@ -9,12 +9,12 @@
             <sizepolicy horizontalPolicy="Ignored" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
             <sizehint height="2" type="PREFERRED" width="50un"/>
         </widget>
-        <widget name="iconNewMail" type="HbLabel">
-            <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-            <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
+        <widget name="iconNewMail" type="HbWidget">
             <real name="z" value="2"/>
             <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Ignored" verticalStretch="0"/>
             <sizehint type="PREFERRED" width="1.25un"/>
+            <string name="alignment" value="AlignVCenter|AlignHCenter"/>
+            <string name="aspectRatioMode" value="IgnoreAspectRatio"/>
         </widget>
         <widget name="labelSender" type="HbLabel">
             <real name="z" value="3"/>
@@ -60,23 +60,17 @@
             <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
         </widget>
         <real name="z" value="1"/>
-        <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+        <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
         <sizehint height="expr(1un + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-middle-vertical) + var(hb-param-text-height-secondary) + 1un )" type="PREFERRED" width="46un"/>
-        <sizehint height="expr(1un + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-middle-vertical) + var(hb-param-text-height-secondary) + 1un )" type="MINIMUM" width="expr(4*var(hb-param-margin-gene-middle-horizontal)  + 15un )"/>
+        <sizehint height="expr(2 * var(hb-param-text-height-secondary) + 3 * var(hb-param-margin-gene-middle-vertical) )" type="MINIMUM" width="expr(4*var(hb-param-margin-gene-middle-horizontal)  + 15un )"/>
         <sizehint height="expr(1un + var(hb-param-text-height-secondary)  + var(hb-param-margin-gene-middle-vertical) + var(hb-param-text-height-secondary) + 1un )" type="MAXIMUM" width="2504062.01158un"/>
         <layout type="anchor">
             <anchoritem dst="iconSeparator" dstEdge="LEFT" spacing="2" src="" srcEdge="LEFT"/>
             <anchoritem dst="iconSeparator" dstEdge="TOP" spacing="0" src="" srcEdge="TOP"/>
             <anchoritem dst="iconSeparator" dstEdge="RIGHT" spacing="-2" src="" srcEdge="RIGHT"/>
-            <anchoritem dst="iconNewMail" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="" srcEdge="LEFT"/>
-            <anchoritem dst="iconNewMail" dstEdge="TOP" spacing="1un" src="iconSeparator" srcEdge="BOTTOM"/>
-            <anchoritem dst="iconNewMail" dstEdge="BOTTOM" spacing="-1un" src="" srcEdge="BOTTOM"/>
             <anchoritem dst="labelSubject" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="iconNewMail" srcEdge="RIGHT"/>
             <anchoritem dst="labelSubject" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="labelSender" srcEdge="BOTTOM"/>
             <anchoritem dst="labelSubject" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="iconOne" srcEdge="LEFT"/>
-            <anchoritem dst="labelSender" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="iconNewMail" srcEdge="RIGHT"/>
-            <anchoritem dst="labelSender" dstEdge="TOP" spacing="1un" src="iconSeparator" srcEdge="BOTTOM"/>
-            <anchoritem dst="labelSender" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="labelTime" srcEdge="LEFT"/>
             <anchoritem dst="labelTime" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="" srcEdge="RIGHT"/>
             <anchoritem dst="labelTime" dstEdge="CENTERV" spacing="0un" src="labelSender" srcEdge="CENTERV"/>
             <anchoritem dst="iconOne" dstEdge="RIGHT" spacing="-0.5un" src="iconTwo" srcEdge="LEFT"/>
@@ -85,6 +79,12 @@
             <anchoritem dst="iconThree" dstEdge="CENTERV" spacing="0un" src="iconOne" srcEdge="CENTERV"/>
             <anchoritem dst="iconTwo" dstEdge="RIGHT" spacing="-0.5un" src="iconThree" srcEdge="LEFT"/>
             <anchoritem dst="iconTwo" dstEdge="CENTERV" spacing="0un" src="iconOne" srcEdge="CENTERV"/>
+            <anchoritem dst="labelSender" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="iconNewMail" srcEdge="RIGHT"/>
+            <anchoritem dst="labelSender" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="iconSeparator" srcEdge="BOTTOM"/>
+            <anchoritem dst="labelSender" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" src="labelTime" srcEdge="LEFT"/>
+            <anchoritem dst="iconNewMail" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="" srcEdge="LEFT"/>
+            <anchoritem dst="iconNewMail" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="iconSeparator" srcEdge="BOTTOM"/>
+            <anchoritem dst="iconNewMail" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-middle-vertical) )" src="" srcEdge="BOTTOM"/>
         </layout>
     </widget>
     <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
--- a/emailuis/nmhswidget/inc/nmhswidget.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidget.h	Mon Aug 23 23:32:31 2010 +0300
@@ -83,19 +83,23 @@
     void createMailRowsList();
     
 private:
+    //UI components
+    HbWidget* mMainContainer;               //container including all UI components
+    HbWidget* mEmptySpaceContainer;         //container for empty space above mWidgetContainer
+    HbWidget* mWidgetContainer;             //container including title row and mContentContainer
+    NmHsWidgetTitleRow* mTitleRow;          //mailbox icon, name, unread count and expand button 
+    HbWidget* mContentContainer;            //container for mail rows or mNoMailsLabel
+    QList<NmHsWidgetEmailRow*> mMailRows;   //list including mail row instances
+    HbLabel* mNoMailsLabel;                 //label shown in mContentContainer when no mails in inbox
+    QGraphicsLinearLayout* mContentLayout;  //layout used in mContentContainer    
+    HbFrameDrawer* mBackgroundFrameDrawer;  //drawer for widget background shown in mWidgetContainer
+    QTranslator* mTranslator;
+    
     NmHsWidgetEmailEngine* mEngine;
-    NmHsWidgetTitleRow* mTitleRow;          
-    QList<NmHsWidgetEmailRow*> mMailRows;   //list including mail row instances
     NmId mAccountId;                        //mail account id widget is monitoring
     QString mAccountIconName;               //name of mailbox icon shown in titlerow
-    QTranslator* mTranslator;
-    HbFrameDrawer* mBackgroundFrameDrawer;  //drawer for widget backgound
-    bool mIsExpanded;                       //true when widget expanded, false when collapsed
-    NmHsWidgetDateTimeObserver* mDateObserver;  //observer for time/locale changes
-    HbLabel* mNoMailsLabel;                 //label shown in widget when no mails in inbox
-    HbWidget* mWidgetContainer;             //container including title row and content container
-    HbWidget* mContentContainer;            //container including mail rows and mNoMailsLabel
-    QGraphicsLinearLayout* mContentLayout;  //layout for mail rows
+    NmHsWidgetDateTimeObserver* mDateObserver;  //observer for time/locale changes    
+    bool mIsExpanded;                       //true when widget expanded, false when collapsed  
     
 public:    
     friend class TestNmHsWidget;     
--- a/emailuis/nmhswidget/inc/nmhswidgetconsts.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidgetconsts.h	Mon Aug 23 23:32:31 2010 +0300
@@ -33,8 +33,12 @@
 /**  docml file including UI definitions */
 const QString KNmHsWidgetDocML = ":/docml/nmhswidget.docml";
 /** container widget including all UI components */
+const QString KNmHsWidgetMainContainer = "mainContainer";
+/** container widget including title row and content container */
 const QString KNmHsWidgetContainer = "nmhswidgetContainer";
 /** container widget including content (mail rows / no mails label */
+const QString KNmHsWidgetEmptySpaceContainer = "emptySpaceContainer";
+/** container widget including content (mail rows / no mails label */
 const QString KNmHsWidgetContentContainer = "mailRowContainer";
 /** no mails label - shown when inbox is empty */
 const QString KNmHsWidgetNoMailsLabel = "noMailsLabel";
--- a/emailuis/nmhswidget/inc/nmhswidgetemailrow.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidgetemailrow.h	Mon Aug 23 23:32:31 2010 +0300
@@ -37,6 +37,7 @@
     ~NmHsWidgetEmailRow();
     NmId messageId();
     bool setupUI();
+    void gestureEvent(QGestureEvent *event);
 
 public slots:
     void updateMailData( const NmMessageEnvelope& envelope );
@@ -55,15 +56,13 @@
     void showHighlight( bool pressed );
     
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     bool event( QEvent *event );
     
 private:
     HbLabel *mSenderLabel;
     HbLabel *mSubjectLabel;
     HbLabel *mTimeLabel;
-    HbLabel *mNewMailIcon;
+    HbWidget *mNewMailIcon;
     HbLabel *mSeparatorIcon;
     NmId mMessageId;
     QDateTime mMessageSentTime;
--- a/emailuis/nmhswidget/inc/nmhswidgettitlerow.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/inc/nmhswidgettitlerow.h	Mon Aug 23 23:32:31 2010 +0300
@@ -34,9 +34,11 @@
     NmHsWidgetTitleRow(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
     ~NmHsWidgetTitleRow();
     QPainterPath shape() const;
+    qreal containerHeight();
     bool setupUI(HbDocumentLoader &loader); 
     void setAccountIcon(const QString& accountIconName );
     void setExpandCollapseIcon(const bool& expand);
+    void gestureEvent(QGestureEvent *event);
     
 private:
     bool loadDocML(HbDocumentLoader &loader);
@@ -54,11 +56,10 @@
     void mailboxLaunchTriggered();
     
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     bool event( QEvent *event );
     
 private:
+    HbWidget *mContainer;
     HbLabel *mMailboxIcon;
     HbLabel *mMailboxInfo;
     HbLabel *mUnreadCountLabel;
--- a/emailuis/nmhswidget/nmhswidget.pro	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/nmhswidget.pro	Mon Aug 23 23:32:31 2010 +0300
@@ -19,6 +19,7 @@
 CONFIG += plugin hb mobility qtservice
 QTSERVICE.DESCRIPTOR = resources/nmhswidget.xml
 MOBILITY = serviceframework
+HB += hbfeedback
 TARGET = nmhswidget
 QT += core
 RESOURCES += nmhswidget.qrc
--- a/emailuis/nmhswidget/src/nmhswidget.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/src/nmhswidget.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -34,18 +34,20 @@
 
 NmHsWidget::NmHsWidget(QGraphicsItem *parent, Qt::WindowFlags flags)
     : HbWidget(parent, flags), 
-      mEngine(0),
+      mMainContainer(0),
+      mEmptySpaceContainer(0),
+      mWidgetContainer(0),
       mTitleRow(0),
+      mContentContainer(0),
+      mNoMailsLabel(0),
+      mContentLayout(0),              
+      mBackgroundFrameDrawer(0),
+      mTranslator(0),
+      mEngine(0),      
       mAccountId(0),
       mAccountIconName(),
-      mTranslator(0),
-      mBackgroundFrameDrawer(0),
-      mIsExpanded(false),
       mDateObserver(0),
-      mNoMailsLabel(0),
-      mWidgetContainer(0),
-      mContentContainer(0),
-      mContentLayout(0)
+      mIsExpanded(false)
 {
     NM_FUNCTION;
 }
@@ -84,11 +86,21 @@
     
     QPainterPath path;
     path.setFillRule(Qt::WindingFill);
-    
-    path.addRect(this->rect());
-    if (mTitleRow){
-        path.addPath(mTitleRow->shape());
+    if (mWidgetContainer){
+        //add mWidgetContainer using geometry to get
+        //correct point for top-left-corner
+        QRectF widgetRect = mWidgetContainer->geometry();
+        path.addRect(widgetRect); 
+        
+        //then fetch shape from title row 
+        QPainterPath titlepath;
+        titlepath.addPath(mTitleRow->shape());
+        //translate it's location to be inside mWidgetContainer
+        titlepath.translate(widgetRect.topLeft());
+        //and finally add it to path
+        path.addPath(titlepath);    
     }
+    //simplified path, i.e. only outlines
     return path.simplified();
 }
 
@@ -132,10 +144,13 @@
     loader.load(KNmHsWidgetDocML, &ok);
     
     if(ok) {
-        mWidgetContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetContainer));        
+        mMainContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetMainContainer));  
+        mWidgetContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetContainer));
         mContentContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetContentContainer));
+        mEmptySpaceContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetEmptySpaceContainer));
         mNoMailsLabel = static_cast<HbLabel*> (loader.findWidget(KNmHsWidgetNoMailsLabel));
-        if (!mWidgetContainer || !mContentContainer || !mNoMailsLabel) {
+        if (!mMainContainer || !mWidgetContainer || !mContentContainer 
+                || !mEmptySpaceContainer || !mNoMailsLabel ) {
             //something failed in documentloader, no point to continue
             NM_ERROR(1,"NmHsWidget::loadDocML fail @ containers or label");
             ok = false;
@@ -172,7 +187,7 @@
     widgetLayout->setContentsMargins(KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin,
             KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin);
     widgetLayout->setSpacing(KNmHsWidgetContentsMargin);
-    widgetLayout->addItem(mWidgetContainer);
+    widgetLayout->addItem(mMainContainer);
     this->setLayout(widgetLayout);
 
     //fetch pointer to content container layout
@@ -193,10 +208,9 @@
     HbFrameItem* backgroundLayoutItem = new HbFrameItem(mBackgroundFrameDrawer);
     //set to NULL to indicate that ownership transferred
     mBackgroundFrameDrawer = NULL;
-    setBackgroundItem(backgroundLayoutItem);   
+    mWidgetContainer->setBackgroundItem(backgroundLayoutItem);
 }
 
-
 /*!
  Initializes the widget.
  
@@ -205,11 +219,12 @@
 void NmHsWidget::onInitialize()
 {
     NM_FUNCTION;
-
+    
     QT_TRY {
-        
 	    // Use document loader to load the contents
 	    HbDocumentLoader loader;
+		//setup localization before docml loading
+	    setupLocalization();
 		
 	    //load containers and mNoMailsLabel
         if (!loadDocML(loader)) {
@@ -228,7 +243,6 @@
         }
 				
         setupUi();
-        setupLocalization();
 
         //Engine construction is 2 phased. 
         mEngine = new NmHsWidgetEmailEngine(mAccountId);
@@ -243,7 +257,6 @@
             return;
         }
 
-
         mTitleRow->updateAccountName(mEngine->accountName());
 
         //create observer for date/time change events
@@ -274,7 +287,8 @@
 	    connect(mTitleRow, SIGNAL( expandCollapseButtonPressed() )
 	            ,this, SLOT( handleExpandCollapseEvent() ) );
 	    
-	    setMinimumSize(mTitleRow->minimumSize());
+	    setMinimumSize(mTitleRow->minimumWidth(), 
+	            mEmptySpaceContainer->minimumHeight() + mTitleRow->minimumHeight());
     }
     QT_CATCH(...) {
         NM_ERROR(1,"NmHsWidget::onInitialize fail @ catch");
@@ -282,7 +296,6 @@
     }
 }
 
-
 /*!
  updateMailData slot
  */
@@ -471,11 +484,15 @@
     }
 
     //resize the widget to new layout size
-    qreal totalHeight = mTitleRow->preferredHeight() + mContentContainer->maximumHeight();
-    //set maximum size, otherwise widget will stay huge also when collapsed
-    this->setMaximumHeight(totalHeight);
+    qreal totalHeight = mEmptySpaceContainer->preferredHeight() + mTitleRow->containerHeight() + mContentContainer->maximumHeight();
+    //set maximum sizes, otherwise widget will stay huge also when collapsed
+    setMaximumHeight(totalHeight);
+    mMainContainer->setMaximumHeight(totalHeight);
+    mWidgetContainer->setMaximumHeight(totalHeight - mEmptySpaceContainer->preferredHeight());
     //resize here or widget cannot draw mail rows when expanding
-    this->resize(mTitleRow->preferredWidth(), totalHeight);
+    resize(mTitleRow->maximumWidth(), totalHeight);
+    mMainContainer->resize(mTitleRow->maximumWidth(), totalHeight);
+    mWidgetContainer->resize(mTitleRow->maximumWidth(), totalHeight - mEmptySpaceContainer->preferredHeight());
 
     updateMailRowsVisibility(mailCount);
 }
--- a/emailuis/nmhswidget/src/nmhswidgetemailrow.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/src/nmhswidgetemailrow.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -23,6 +23,8 @@
 #include <hbframeitem.h>
 #include <hbcolorscheme.h>
 #include <hbevent.h>
+#include <hbtapgesture.h>
+#include <hbinstantfeedback.h>
 #include "nmicons.h"
 #include "nmcommon.h"
 #include "nmhswidgetemailrow.h"
@@ -40,6 +42,7 @@
     mBackgroundLayoutItem(0)
 {
     NM_FUNCTION;
+    grabGesture(Qt::TapGesture);
 }
 
 /*!
@@ -121,7 +124,7 @@
         mTimeLabel = static_cast<HbLabel*> (loader.findWidget(KNmHsWidgetMailRowTimeLabel));
     
         //icons
-        mNewMailIcon = static_cast<HbLabel*> (loader.findWidget(KNmHsWidgetMailRowNewMailIcon));
+        mNewMailIcon = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetMailRowNewMailIcon));
         // KNmHsWidgetMailRowLeftIcon is not yet used, because followup information is not shown in client side
         // and thus it is not wanted to be shown in widget side
         mStatusIcons.append(static_cast<HbLabel*> (loader.findWidget(KNmHsWidgetMailRowRightIcon)));
@@ -240,16 +243,18 @@
     //Time shown if message is sent today, otherwise show date
     HbExtendedLocale locale = HbExtendedLocale::system();
     QDateTime now = QDateTime::currentDateTime();
-    if ( mMessageSentTime.date() == now.date() )
+    //change time to locale time. mMessageSentTime is always in GMT
+    QDateTime localTime = mMessageSentTime.addSecs(locale.universalTimeOffset());
+    if ( localTime.date() == now.date() )
         {
         //time format specification
         QString timeSpec = r_qtn_time_usual;
-        mTimeLabel->setPlainText( locale.format(mMessageSentTime.time(), timeSpec) );
+        mTimeLabel->setPlainText( locale.format(localTime.time(), timeSpec) );
         }
     else
         {
         QString dateSpec = r_qtn_date_without_year;
-        mTimeLabel->setPlainText( locale.format(mMessageSentTime.date(), dateSpec) );
+        mTimeLabel->setPlainText( locale.format(localTime.date(), dateSpec) );
         }
     }
 
@@ -380,27 +385,39 @@
     }
     }
 
-/*!
- mousePressEvent(QGraphicsSceneMouseEvent *event)
+/*
+ * NmHsWidgetEmailRow::gestureEvent(QGestureEvent *event)
  */
-void NmHsWidgetEmailRow::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void NmHsWidgetEmailRow::gestureEvent(QGestureEvent *event)
 {
     NM_FUNCTION;
-    Q_UNUSED(event); 
-    setHighlighedFontsColor(true);
-    showHighlight(true);
-}
-
-/*!
-    mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-*/
-void NmHsWidgetEmailRow::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    NM_FUNCTION;
-    Q_UNUSED(event);
-    setHighlighedFontsColor(false);
-    showHighlight(false);
-    emit mailViewerLaunchTriggered(mMessageId);
+    if(!event){
+        return;
+    }
+    HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if(!gesture){
+        return;
+    }
+    switch (gesture->state()) {
+        case Qt::GestureStarted:
+            setHighlighedFontsColor(true);
+            showHighlight(true);
+        break;
+        case Qt::GestureCanceled:
+            setHighlighedFontsColor(false);
+            showHighlight(false);
+        break;
+        case Qt::GestureFinished:
+            setHighlighedFontsColor(false);
+            showHighlight(false);
+            if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                HbInstantFeedback::play(HbFeedback::BasicItem);
+                emit mailViewerLaunchTriggered(mMessageId);
+            }
+        break;
+    default: 
+        break;
+    }
 }
 
 /*
--- a/emailuis/nmhswidget/src/nmhswidgettitlerow.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmhswidget/src/nmhswidgettitlerow.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -24,6 +24,8 @@
 #include <hbevent.h>
 #include <hbframedrawer.h>
 #include <hbframeitem.h>
+#include <hbtapgesture.h>
+#include <hbinstantfeedback.h>
 #include "nmicons.h"
 #include "nmhswidgettitlerow.h"
 #include "nmhswidgetconsts.h"
@@ -31,6 +33,7 @@
 
 NmHsWidgetTitleRow::NmHsWidgetTitleRow(QGraphicsItem *parent, Qt::WindowFlags flags) :
     HbWidget(parent, flags), 
+    mContainer(0),
     mMailboxIcon(0), 
     mMailboxInfo(0), 
     mUnreadCountLabel(0),
@@ -40,6 +43,7 @@
     mBackgroundLayoutItem(0)
 {
     NM_FUNCTION;
+    grabGesture(Qt::TapGesture);
 }
 
 /*!
@@ -64,14 +68,28 @@
     
     QPainterPath path;
     path.setFillRule(Qt::WindingFill);
-    
-    path.addRect(this->geometry());
+    if (mContainer){
+        path.addRect(mContainer->geometry());
+    }
     if (mMailboxIcon){
         path.addRect(mMailboxIcon->geometry());
     }    
     return path.simplified();
 }
 
+/*!
+ \fn qreal NmHsWidgetTitleRow::containerHeight()
+
+ /return qreal defining title row container height in pixels
+ */
+qreal NmHsWidgetTitleRow::containerHeight()
+{
+    if (mContainer){
+        return mContainer->preferredHeight();
+    }
+    return 0;
+}
+
 /*
  Setup email row ui
   Must be called after constructor.
@@ -95,21 +113,12 @@
 {
     NM_FUNCTION;
     QT_TRY{
-        //Create layout
-        QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
-    
-        layout->setContentsMargins(KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin,
-            KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin);
-        layout->setSpacing(KNmHsWidgetContentsMargin);
-        setLayout(layout); //pass the ownership
-    
         // find container widget
-        QGraphicsWidget *container = loader.findWidget(KNmHsWidgetTitleRowContainer);
-        if (!container) {
+        mContainer = static_cast<HbWidget*> (loader.findWidget(KNmHsWidgetTitleRowContainer));
+        if (!mContainer) {
             NM_ERROR(1,"NmHsWidgetTitleRow::loadDocML Fail @ container");
             return false;
         }
-        layout->addItem(container);
     
         //child items possible to update
         mMailboxIcon = static_cast<HbLabel*> (loader.findWidget(KNmHsWidgetTitleRowMailboxIcon));
@@ -147,12 +156,15 @@
         //pressed background
         backgroundFrameDrawer = new HbFrameDrawer("qtg_fr_hsitems_pressed", HbFrameDrawer::NinePieces);
         mBackgroundLayoutItem = new HbFrameItem( backgroundFrameDrawer );
-        setBackgroundItem( mBackgroundLayoutItem );
+        mContainer->setBackgroundItem( mBackgroundLayoutItem );
 		mBackgroundLayoutItem->hide();
         
         //set fonts color
 		setHighlighedFontsColor(false);
-
+		
+		//to get gestures
+		setGeometry(mContainer->childrenBoundingRect());
+		
         return true;
     }
     QT_CATCH(...){
@@ -166,7 +178,6 @@
     
 }
 
-
 /*!
  Slot for updating account name, calls updateData to update ui.
  */
@@ -270,37 +281,46 @@
     }
     }
 
-/*!
- mousePressEvent(QGraphicsSceneMouseEvent *event)
+/*
+ * NmHsWidgetTitleRow::gestureEvent(QGestureEvent *event)
  */
-void NmHsWidgetTitleRow::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void NmHsWidgetTitleRow::gestureEvent(QGestureEvent *event)
 {
     NM_FUNCTION;
-	
-	//to avoid opening email account mistakenly  when tabbing expand/collapse button
-	//we dont handle events that are on the top, down or right side of the button
-    if(event->pos().x() < mUnreadCountLabel->geometry().right())
-        {
-        setHighlighedFontsColor(true);
-        showHighlight(true);
+    
+    if(!event){
+        return;
+    }    
+    HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if(!gesture){
+        return;
+    }
+    //to avoid opening email account mistakenly  when tabbing expand/collapse button
+    //we dont handle events that are on the top, down or right side of the button
+    QPointF posFromScene = mapFromScene(event->mapToGraphicsScene(gesture->position()));
+    if(posFromScene.x() < mUnreadCountLabel->geometry().right())
+        {    
+        switch (gesture->state()) {
+            case Qt::GestureStarted:
+                setHighlighedFontsColor(true);
+                showHighlight(true);
+            break;
+            case Qt::GestureCanceled:
+                setHighlighedFontsColor(false);
+                showHighlight(false);
+            break;
+            case Qt::GestureFinished:
+                setHighlighedFontsColor(false);
+                showHighlight(false);
+                if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+                    HbInstantFeedback::play(HbFeedback::BasicItem);
+                    emit mailboxLaunchTriggered();
+                }
+            break;
+        default: 
+            break;
         }
-}
-
-/*!
-    mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-*/
-void NmHsWidgetTitleRow::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    NM_FUNCTION;
-	
-	//to avoid opening email account mistakenly when tabbing expand/collapse button
-	//we dont handle events that are on the top, down or right side of the button
-    if(event->pos().x() < mUnreadCountLabel->geometry().right())
-        {
-        setHighlighedFontsColor(false);
-        showHighlight(false);
-        emit mailboxLaunchTriggered();
-        }
+    }
 }
 
 /*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/BaseMrInfoObject.h	Mon Aug 23 23:32:31 2010 +0300
@@ -0,0 +1,18 @@
+/*
+* 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/emailstore/base_plugin/inc/BaseMrInfoObject.h"
\ No newline at end of file
--- a/inc/basemrinfoobject.h	Thu Aug 05 21:09:09 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/emailstore/base_plugin/inc/BaseMrInfoObject.h"
\ No newline at end of file
--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Mon Aug 23 23:32:31 2010 +0300
@@ -46,8 +46,8 @@
 NONSHARABLE_CLASS (CIpsSosAOMBoxLogic) : 
 //</Qmail>
     public CBase, 
-                           public MIpsSosAOPluginTimerCallBack,
-                           public MIpsSosAOAgentOperationResponse
+    public MIpsSosAOPluginTimerCallBack,
+    public MIpsSosAOAgentOperationResponse
     {
 
 public:
--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOPlugin.hrh	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOPlugin.hrh	Mon Aug 23 23:32:31 2010 +0300
@@ -26,7 +26,7 @@
 const TInt KIpsSosAOMaxReTryTimes = 3;
 const TInt KIpsSosAOSuspendWatchdogTime = 300;
 const TInt KIpsSosAOContinueWaitTime = 5;
-
+const TInt KAODefaultInboxSyncTimeSecs = 3600;
 const TInt IpsSosAODefaultGranularity = 2;
 
 
--- a/ipsservices/ipssosaoplugin/inc/ipssosaopluginheaders.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/ipssosaopluginheaders.h	Mon Aug 23 23:32:31 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description: 
-*     Contains mailbox specified always online logic
+*     
 *
 */
 
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -20,7 +20,6 @@
 
 //<QMail>
 const TInt KAOSecondsInMinute = 60;
-const TInt KAODefaultInboxSyncTimeSecs = 3600;
 //</QMail>
 const TInt KIpsSosAOMboxLogicMinGra = 1;
 
@@ -413,10 +412,7 @@
                     INFO_1("CIpsSosAOMBoxLogic: timer scheduled: %d", KIpsSosAOContinueWaitTime);
                     iTimer->After( KIpsSosAOContinueWaitTime );
                     }
-                else
-                    {
-                    event = EEventNop;
-                    }
+                event = EEventNop;
                 // ignore if in other states
                 break;
             case EEventStopAndRemoveOps:
@@ -481,6 +477,7 @@
         ( agentState == CIpsSosAOBaseAgent::EStateConnectAndSyncOnHold || 
           agentState == CIpsSosAOBaseAgent::EStatePopulateOnHold ) )
         {
+        iTimer->Cancel();
         iAgent->ContinueHoldOperations();
         NM_COMMENT("CIpsSosAOMBoxLogic: switching state: EStateSyncOngoing");
         iState = EStateSyncOngoing;
@@ -488,6 +485,7 @@
     else if ( iState == EStateSuspended && 
             agentState == CIpsSosAOBaseAgent::EStateFetchOnHold )
         {
+        iTimer->Cancel();
         iAgent->ContinueHoldOperations();
         NM_COMMENT("CIpsSosAOMBoxLogic: switching state: EStateFetchOngoing");
         iState = EStateFetchOngoing;
@@ -623,15 +621,15 @@
         {
         iAgent->HoldOperations();
         }
-    NM_COMMENT("CIpsSosAOMBoxLogic: switching state: EStateSuspended");
-    iState = EStateSuspended;
     // set suspend watchdog, if clien not continue this
     // ensure ao logic to continue
-    if ( !iTimer->IsActive() )
+    if ( !iTimer->IsActive() || iState == EStateSyncOngoing || iState == EStateFetchOngoing)
         {
         INFO_1("CIpsSosAOMBoxLogic: timer scheduled: %d", KIpsSosAOSuspendWatchdogTime);
         iTimer->After( KIpsSosAOSuspendWatchdogTime );
         }
+    NM_COMMENT("CIpsSosAOMBoxLogic: switching state: EStateSuspended");
+    iState = EStateSuspended;
     }
 
 // ----------------------------------------------------------------------------
--- a/ipsservices/ipssosplugin/inc/ipsplgmsgmapper.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosplugin/inc/ipsplgmsgmapper.h	Mon Aug 23 23:32:31 2010 +0300
@@ -260,7 +260,7 @@
      * Converts entry type field UID as a MIME type
      */
     TInt ConvertBodyPartMimeType( 
-        const TUid& aEntryType, 
+        const TMsvEmailEntry& aEntry, 
         TDes& aMimeType );
 
     /**
--- a/ipsservices/ipssosplugin/inc/mipsplgmailstorerobserver.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosplugin/inc/mipsplgmailstorerobserver.h	Mon Aug 23 23:32:31 2010 +0300
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include "cfsmailcommon.h"
+#include "CFSMailCommon.h"
 
 class MIpsPlgMailStorerObserver
  	{
--- a/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -942,17 +942,24 @@
 // ---------------------------------------------------------------------------
 // <cmail>
 TInt CIpsPlgMsgMapper::ConvertBodyPartMimeType(
-    const TUid& aEntryType,
+    const TMsvEmailEntry& aEntry,
     TDes& aMimeType )
     {
     FUNC_LOG;
     TInt result( KErrNone );
 
-    switch ( aEntryType.iUid )
+    switch ( aEntry.iType.iUid )
     {
     case KUidMsvEmailTextEntryValue:
         {
+        if( aEntry.ICalendar() )
+            {
+            aMimeType.Append( KFSMailContentTypeTextCalendar );
+            }
+        else
+            {
             aMimeType.Append( KMimeTypeTextPlain );
+            }
         break;
         }
     case KUidMsvEmailHtmlEntryValue:
@@ -1164,11 +1171,11 @@
     FUNC_LOG;
     CFSMailMessagePart* result( NULL );
     TInt status;
-// <cmail>
     HBufC* buf = HBufC::NewLC( KMaxContentTypeLength );
     TPtr contentType = buf->Des();
 
-    status = ConvertBodyPartMimeType( aEntry.iType, contentType );
+    status = ConvertBodyPartMimeType( aEntry, contentType );
+    
     __ASSERT_DEBUG( ( status == KErrNone ),
         User::Panic( KIpsPlgPanicCategory, EIpsPlgInvalidEntry ) );
     if ( status == KErrNone )
@@ -1181,7 +1188,6 @@
             {
             GetCharsetParameterL( aEntry, contentType );
             }
-// </cmail>
         result->SetContentType( contentType );
         result->SetMailBoxId( aMailBoxId );
 
--- a/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -2500,7 +2500,10 @@
     
     //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() ) )
         {
         //folder is inbox
         if ( iSyncStateHandler->GetMailboxIpsState( aActiveMailboxId.Id() )
--- a/ipsservices/nmipssettings/inc/nmipssettingshelper.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/nmipssettings/inc/nmipssettingshelper.h	Mon Aug 23 23:32:31 2010 +0300
@@ -117,13 +117,14 @@
     void receivingWeekdaysModified();
     void startTimeModified(QTime time);
     void endTimeModified(QTime time);
-    void refreshPeriodModified(QPersistentModelIndex, QVariant);
+    void refreshPeriodModified(HbAction *action);
     void handleMailboxDelete(HbAction *action);
     void handleMailboxDeleteUpdate(HbAction *action);
     void handleUserDefinedIncomingPortInput(HbAction *action);
     void handleUserDefinedFolderPathInput(HbAction *action);
     void handleUserDefinedOutgoingPortInput(HbAction *action);
     void handleConnectionSelected(uint status);
+    void refreshIndexModified(int index);
     
 private:
 
@@ -164,6 +165,7 @@
     CmApplSettingsUi *mDestinationDialog; // Owned.
     bool mServerInfoDynamicItemsVisible;
     bool mAbortDynamicRSItemHandling;
+    int mCurrentRefreshIndex;
 };
 
 #endif // NMIPSSETTINGSHELPER_H
--- a/ipsservices/nmipssettings/inc/nmipssettingsplugin.h	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/nmipssettings/inc/nmipssettingsplugin.h	Mon Aug 23 23:32:31 2010 +0300
@@ -34,6 +34,7 @@
 class NmId;
 class NmIpsSettingsHelper;
 class NmIpsSettingsManagerBase;
+class HbAction;
 
 class NmIpsSettingsPlugin : public QObject, public NmSettingsPluginInterface
 {
@@ -61,7 +62,8 @@
 private slots:
 
     void createUserDefinedMode();
-    void showMailInInboxModified(QPersistentModelIndex, QVariant value);
+    void showMailInInboxModified(HbAction*);
+    void inboxSelectionModified(int index);
 
 private:
 
@@ -81,6 +83,7 @@
     HbDataFormModel *mModel; // Not owned.
     HbDataForm *mForm; // Not owned.
     bool mHiddenItem;
+    int mCurrentInboxIndex;
 };
 
 #endif // NMIPSSETTINGS_H
--- a/ipsservices/nmipssettings/src/nmipssettingshelper.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipssettingshelper.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -100,7 +100,8 @@
   mOutgoingPortInputValidator(0),
   mDestinationDialog(0),
   mServerInfoDynamicItemsVisible(false),
-  mAbortDynamicRSItemHandling(false)
+  mAbortDynamicRSItemHandling(false),
+  mCurrentRefreshIndex(-1)
 {
 }
 
@@ -315,9 +316,12 @@
                                      << HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_every_1_hour"))
                                      << HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_every_4_hours"));
                     formItemData->setContentWidgetData("items", refreshMailItems);
-                    mDataForm.addConnection(
-                        formItemData, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-                        this, SLOT(refreshPeriodModified(QPersistentModelIndex, QVariant)));
+                    
+                    mDataForm.addConnection(formItemData, SIGNAL(finished(HbAction *)),
+                           this, SLOT(refreshPeriodModified(HbAction *)));
+                    
+                    mDataForm.addConnection(formItemData, SIGNAL(itemSelected(int)),
+                           this, SLOT(refreshIndexModified(int)));
                 }
 
                 // Update data
@@ -1095,28 +1099,6 @@
 }
 
 /*!
-    Handles refresh period modifications.
-    \param value Selected value as a text.
-*/
-void NmIpsSettingsHelper::refreshPeriodModified(QPersistentModelIndex, QVariant value)
-{
-    QMap<QString, int> conversionTable;
-    conversionTable[HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_keep_uptodate"))] = 5;
-    conversionTable[HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_every_15_minutes"))] = 15;
-    conversionTable[HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_every_1_hour"))] = 60;
-    conversionTable[HbStringUtil::convertDigits(hbTrId("txt_mailips_setlabel_val_every_4_hours"))] = 240;
-
-    int selectedValue(conversionTable.value(value.toString()));
-    QVariant previouslySelectedValue;
-    mSettingsManager.readSetting(IpsServices::ReceptionRefreshPeriodDayTime,
-        previouslySelectedValue);
-    if (selectedValue != previouslySelectedValue.toInt()) {
-        handleReceivingScheduleSettingChange(IpsServices::ReceptionRefreshPeriodDayTime,
-            selectedValue);
-    }
-}
-
-/*!
     Handles end time modifications.
     \param time Modified start time.
 */
@@ -1521,3 +1503,40 @@
     // Open the dialog.
     mDestinationDialog->open();
 }
+
+/*!
+Handles refresh period modifications.
+
+Index   Value
+0       5 minutes
+1       15 minutes
+2       60 minutes
+3       240 minutes
+
+\param index The index value of the selection.
+*/
+void NmIpsSettingsHelper::refreshIndexModified(int index)
+{
+    mCurrentRefreshIndex = index;
+}
+
+/*!
+    Handles refresh period modifications.
+    \param action Action that determines whether user clicked OK or cancel.
+*/
+void NmIpsSettingsHelper::refreshPeriodModified(HbAction *action)
+{
+    if ((action->text() == hbTrId("txt_common_button_ok")
+            && (mCurrentRefreshIndex >=0 && mCurrentRefreshIndex <=3))) {
+        int conversionTable[] = { 5, 15, 60, 240 };
+        int selectedValue(conversionTable[mCurrentRefreshIndex]);
+        QVariant previouslySelectedValue;
+        mSettingsManager.readSetting(IpsServices::ReceptionRefreshPeriodDayTime,
+            previouslySelectedValue);
+        if (selectedValue != previouslySelectedValue.toInt()) {
+            handleReceivingScheduleSettingChange(IpsServices::ReceptionRefreshPeriodDayTime,
+                selectedValue);
+        }
+    }
+    mCurrentRefreshIndex = -1;
+}
--- a/ipsservices/nmipssettings/src/nmipssettingsplugin.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/ipsservices/nmipssettings/src/nmipssettingsplugin.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -26,6 +26,7 @@
 #include <HbDataFormModel>
 #include <HbDataFormModelItem>
 #include <HbLineEdit>
+#include <HbAction>
 
 #include <cpsettingformitemdata.h>
 
@@ -60,7 +61,8 @@
 NmIpsSettingsPlugin::NmIpsSettingsPlugin()
 : mSettingsHelper(0),
   mSettingsManager(0),
-  mHiddenItem(false)
+  mHiddenItem(false),
+  mCurrentInboxIndex(-1)
 {
     QString lang = QLocale::system().name();
     QString path = "Z:/resource/qt/translations/";
@@ -336,10 +338,11 @@
     // Active sync profile connection
     mForm->addConnection(infoItem, SIGNAL(currentIndexChanged(int)),
         mSettingsHelper, SLOT(receivingScheduleChange(int)));
-
-    mForm->addConnection(showMailInInboxItem, SIGNAL(valueChanged(QPersistentModelIndex, QVariant)),
-        this, SLOT(showMailInInboxModified(QPersistentModelIndex, QVariant)));
-
+    mForm->addConnection(showMailInInboxItem, SIGNAL(finished(HbAction *)),
+           this, SLOT(showMailInInboxModified(HbAction *)));
+    mForm->addConnection(showMailInInboxItem, SIGNAL(itemSelected(int)),
+           this, SLOT(inboxSelectionModified(int)));
+    
     // Must be called manually here, because the signal->slot connection set above using
     // HbDataForm::addConnection() is actually established AFTER the properties have first been
     // set to the widget, causing the first currentIndexChanged signal not to reach
@@ -634,25 +637,40 @@
 }
 
 /*!
-    Handles mail in inbox modifications.
+Handles mail in inbox modifications.
 
-    \param value Selected value as a text.
+\param action Action that determines whether user clicked OK or cancel.
 */
-void NmIpsSettingsPlugin::showMailInInboxModified(QPersistentModelIndex, QVariant value)
+void NmIpsSettingsPlugin::showMailInInboxModified(HbAction *action)
 {
-    QMap<QString, int> conversionTable;
-    conversionTable[HbStringUtil::convertDigits("50")] = 50;
-    conversionTable[HbStringUtil::convertDigits("100")] = 100;
-    conversionTable[HbStringUtil::convertDigits("500")] = 500;
-    conversionTable[hbTrId("txt_mailips_setlabel_val_all")] = 0;
+    if ((action->text() == hbTrId("txt_common_button_ok"))
+            && (mCurrentInboxIndex >=0 && mCurrentInboxIndex <=3)) {
+        int conversionTable[] = { 50, 100, 500, 0 };
+        int selectedValue(conversionTable[mCurrentInboxIndex]);
+        
+        QVariant previouslySelectedValue;
+        mSettingsManager->readSetting(IpsServices::ReceptionInboxSyncWindow, previouslySelectedValue);
+        if (previouslySelectedValue.toInt() != selectedValue) {
+            mSettingsHelper->handleReceivingScheduleSettingChange(
+                IpsServices::ReceptionInboxSyncWindow, selectedValue);
+        }
+    }
+    mCurrentInboxIndex = -1;
+}
+/*!
+Handles mail in inbox modifications.
 
-    int selectedValue(conversionTable.value(value.toString()));
-    QVariant previouslySelectedValue;
-    mSettingsManager->readSetting(IpsServices::ReceptionInboxSyncWindow, previouslySelectedValue);
-    if (previouslySelectedValue.toInt() != selectedValue) {
-        mSettingsHelper->handleReceivingScheduleSettingChange(
-            IpsServices::ReceptionInboxSyncWindow, selectedValue);
-    }
+Index   Value
+0       50
+1       100
+2       500
+3       All
+
+\param index The index value of the selection.
+*/
+void NmIpsSettingsPlugin::inboxSelectionModified(int index)
+{
+    mCurrentInboxIndex = index;
 }
 
 Q_EXPORT_PLUGIN2(nmipssettings, NmIpsSettingsPlugin);