diff -r 478bc57ad291 -r 64e38f08e49c emailservices/emailframework/bwins/FSMailFrameworkU.DEF
--- a/emailservices/emailframework/bwins/FSMailFrameworkU.DEF	Thu Sep 02 20:15:00 2010 +0300
+++ b/emailservices/emailframework/bwins/FSMailFrameworkU.DEF	Fri Sep 17 08:27:21 2010 +0300
@@ -2,32 +2,23 @@
 	?DeleteMailBoxByUidL@CFSMailClient@@QAEHVTFSMailMsgId@@AAVMFSMailRequestObserver@@@Z @ 1 NONAME ; int CFSMailClient::DeleteMailBoxByUidL(class TFSMailMsgId, class MFSMailRequestObserver &)
 	?CancelL@CFSMailClient@@QAEXH@Z @ 2 NONAME ; void CFSMailClient::CancelL(int)
 	?ReleaseExtension@CFSMailClient@@UAEXPAVCEmailExtension@@@Z @ 3 NONAME ; void CFSMailClient::ReleaseExtension(class CEmailExtension *)
-	?CleanTempDirL@CFSMailClient@@QAEXXZ @ 4 NONAME ; void CFSMailClient::CleanTempDirL(void)
-	?Close@CFSMailClient@@QAEXXZ @ 5 NONAME ; void CFSMailClient::Close(void)
-	?DeleteMessagesByUidL@CFSMailClient@@QAEXVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 6 NONAME ; void CFSMailClient::DeleteMessagesByUidL(class TFSMailMsgId, class TFSMailMsgId, class RArray<class TFSMailMsgId> const &)
-	?WizardDataAvailableL@CFSMailClient@@QAEHXZ @ 7 NONAME ; int CFSMailClient::WizardDataAvailableL(void)
-	?ListMailBoxes@CFSMailClient@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailBox@@@@@Z @ 8 NONAME ; int CFSMailClient::ListMailBoxes(class TFSMailMsgId, class RPointerArray<class CFSMailBox> &)
-	?GetTempDirL@CFSMailClient@@QAEAAVTDesC16@@XZ @ 9 NONAME ; class TDesC16 & CFSMailClient::GetTempDirL(void)
-	?GetFolderByUidL@CFSMailClient@@QAEPAVCFSMailFolder@@VTFSMailMsgId@@0@Z @ 10 NONAME ; class CFSMailFolder * CFSMailClient::GetFolderByUidL(class TFSMailMsgId, class TFSMailMsgId)
-	?ExtensionL@CFSMailClient@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 11 NONAME ; class CEmailExtension * CFSMailClient::ExtensionL(class TUid const &)
-	?PrepareMrDescriptionL@CFSMailClient@@UAEXABVTFSMailMsgId@@0@Z @ 12 NONAME ; void CFSMailClient::PrepareMrDescriptionL(class TFSMailMsgId const &, class TFSMailMsgId const &)
-	?NewL@CFSMailClient@@SAPAV1@H@Z @ 13 NONAME ; class CFSMailClient * CFSMailClient::NewL(int)
-	?SetMailboxName@CFSMailClient@@QAEXVTFSMailMsgId@@ABVTDesC16@@@Z @ 14 NONAME ; void CFSMailClient::SetMailboxName(class TFSMailMsgId, class TDesC16 const &)
-	?GetMessageByUidL@CFSMailClient@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 15 NONAME ; class CFSMailMessage * CFSMailClient::GetMessageByUidL(class TFSMailMsgId, class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails)
-	?GetMailBoxByUidL@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 16 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidL(class TFSMailMsgId)
-	?AuthenticateL@CFSMailClient@@QAEHAAVMFSMailRequestObserver@@@Z @ 17 NONAME ; int CFSMailClient::AuthenticateL(class MFSMailRequestObserver &)
-	?GetBrandManagerL@CFSMailClient@@QAEAAVMFSMailBrandManager@@XZ @ 18 NONAME ; class MFSMailBrandManager & CFSMailClient::GetBrandManagerL(void)
-	??1CFSMailClient@@EAE@XZ @ 19 NONAME ; CFSMailClient::~CFSMailClient(void)
-	?NewLC@CFSMailClient@@SAPAV1@H@Z @ 20 NONAME ; class CFSMailClient * CFSMailClient::NewLC(int)
-	?UnregisterRequestObserver@CFSMailClient@@QAEXH@Z @ 21 NONAME ; void CFSMailClient::UnregisterRequestObserver(int)
-	?RemoveObserver@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 22 NONAME ; void CFSMailClient::RemoveObserver(class MFSMailEventObserver &)
-	?SubscribeMailboxEventsL@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 23 NONAME ; void CFSMailClient::SubscribeMailboxEventsL(class TFSMailMsgId, class MFSMailEventObserver &)
-	?ListMessages@CFSMailClient@@QAEPAVMFSMailIterator@@VTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 24 NONAME ; class MFSMailIterator * CFSMailClient::ListMessages(class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
-	?UnsubscribeMailboxEvents@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 25 NONAME ; void CFSMailClient::UnsubscribeMailboxEvents(class TFSMailMsgId, class MFSMailEventObserver &)
-	?CancelAllL@CFSMailClient@@QAEXXZ @ 26 NONAME ; void CFSMailClient::CancelAllL(void)
-	?GetMailBoxByUidLC@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 27 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidLC(class TFSMailMsgId)
-	?NewL@CFSMailClient@@SAPAV1@XZ @ 28 NONAME ; class CFSMailClient * CFSMailClient::NewL(void)
-	?AddObserverL@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 29 NONAME ; void CFSMailClient::AddObserverL(class MFSMailEventObserver &)
-	?IncReferenceCount@CFSMailClient@@QAEHXZ @ 30 NONAME ; int CFSMailClient::IncReferenceCount(void)
-	?GetSignatureL@CFSMailClient@@QAEPAVHBufC16@@ABVTFSMailMsgId@@@Z @ 31 NONAME ; class HBufC16 * CFSMailClient::GetSignatureL(class TFSMailMsgId const &)
+	?Close@CFSMailClient@@QAEXXZ @ 4 NONAME ; void CFSMailClient::Close(void)
+	?DeleteMessagesByUidL@CFSMailClient@@QAEXVTFSMailMsgId@@0ABV?$RArray@VTFSMailMsgId@@@@@Z @ 5 NONAME ; void CFSMailClient::DeleteMessagesByUidL(class TFSMailMsgId, class TFSMailMsgId, class RArray<class TFSMailMsgId> const &)
+	?ListMailBoxes@CFSMailClient@@QAEHVTFSMailMsgId@@AAV?$RPointerArray@VCFSMailBox@@@@@Z @ 6 NONAME ; int CFSMailClient::ListMailBoxes(class TFSMailMsgId, class RPointerArray<class CFSMailBox> &)
+	?GetFolderByUidL@CFSMailClient@@QAEPAVCFSMailFolder@@VTFSMailMsgId@@0@Z @ 7 NONAME ; class CFSMailFolder * CFSMailClient::GetFolderByUidL(class TFSMailMsgId, class TFSMailMsgId)
+	?ExtensionL@CFSMailClient@@UAEPAVCEmailExtension@@ABVTUid@@@Z @ 8 NONAME ; class CEmailExtension * CFSMailClient::ExtensionL(class TUid const &)
+	?NewL@CFSMailClient@@SAPAV1@H@Z @ 9 NONAME ; class CFSMailClient * CFSMailClient::NewL(int)
+	?GetMessageByUidL@CFSMailClient@@QAEPAVCFSMailMessage@@VTFSMailMsgId@@00W4TFSMailDetails@@@Z @ 10 NONAME ; class CFSMailMessage * CFSMailClient::GetMessageByUidL(class TFSMailMsgId, class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails)
+	?GetMailBoxByUidL@CFSMailClient@@QAEPAVCFSMailBox@@VTFSMailMsgId@@@Z @ 11 NONAME ; class CFSMailBox * CFSMailClient::GetMailBoxByUidL(class TFSMailMsgId)
+	??1CFSMailClient@@EAE@XZ @ 12 NONAME ; CFSMailClient::~CFSMailClient(void)
+	?NewLC@CFSMailClient@@SAPAV1@H@Z @ 13 NONAME ; class CFSMailClient * CFSMailClient::NewLC(int)
+	?GetSignatureL@CFSMailClient@@QAEPAVHBufC16@@ABVTFSMailMsgId@@@Z @ 14 NONAME ; class HBufC16 * CFSMailClient::GetSignatureL(class TFSMailMsgId const &)
+	?RemoveObserver@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 15 NONAME ; void CFSMailClient::RemoveObserver(class MFSMailEventObserver &)
+	?SubscribeMailboxEventsL@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 16 NONAME ; void CFSMailClient::SubscribeMailboxEventsL(class TFSMailMsgId, class MFSMailEventObserver &)
+	?ListMessages@CFSMailClient@@QAEPAVMFSMailIterator@@VTFSMailMsgId@@0W4TFSMailDetails@@ABV?$RArray@VTFSMailSortCriteria@@@@@Z @ 17 NONAME ; class MFSMailIterator * CFSMailClient::ListMessages(class TFSMailMsgId, class TFSMailMsgId, enum TFSMailDetails, class RArray<class TFSMailSortCriteria> const &)
+	?UnsubscribeMailboxEvents@CFSMailClient@@QAEXVTFSMailMsgId@@AAVMFSMailEventObserver@@@Z @ 18 NONAME ; void CFSMailClient::UnsubscribeMailboxEvents(class TFSMailMsgId, class MFSMailEventObserver &)
+	?NewL@CFSMailClient@@SAPAV1@XZ @ 19 NONAME ; class CFSMailClient * CFSMailClient::NewL(void)
+	?AddObserverL@CFSMailClient@@QAEXAAVMFSMailEventObserver@@@Z @ 20 NONAME ; void CFSMailClient::AddObserverL(class MFSMailEventObserver &)
+	?IncReferenceCount@CFSMailClient@@QAEHXZ @ 21 NONAME ; int CFSMailClient::IncReferenceCount(void)
+	?PrepareMrDescriptionL@CFSMailClient@@UAEXABVTFSMailMsgId@@0@Z @ 22 NONAME ; void CFSMailClient::PrepareMrDescriptionL(class TFSMailMsgId const &, class TFSMailMsgId const &)