diff -r dcf0eedfc1a3 -r d189ee25cf9d emailservices/emailframework/eabi/FSMailFrameworkU.DEF
--- a/emailservices/emailframework/eabi/FSMailFrameworkU.DEF	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailframework/eabi/FSMailFrameworkU.DEF	Tue Aug 31 15:04:17 2010 +0300
@@ -1,46 +1,35 @@
 EXPORTS
-	_ZN12CFSClientAPI4NewLEP25MEmailClientPluginManager @ 1 NONAME
-	_ZN13CFSMailClient10CancelAllLEv @ 2 NONAME
-	_ZN13CFSMailClient10ExtensionLERK4TUid @ 3 NONAME
-	_ZN13CFSMailClient11GetTempDirLEv @ 4 NONAME
-	_ZN13CFSMailClient12AddObserverLER20MFSMailEventObserver @ 5 NONAME
-	_ZN13CFSMailClient12ListMessagesE12TFSMailMsgIdS0_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 6 NONAME
-	_ZN13CFSMailClient13AuthenticateLER22MFSMailRequestObserver @ 7 NONAME
-	_ZN13CFSMailClient13CleanTempDirLEv @ 8 NONAME
-	_ZN13CFSMailClient13ListMailBoxesE12TFSMailMsgIdR13RPointerArrayI10CFSMailBoxE @ 9 NONAME
-	_ZN13CFSMailClient14RemoveObserverER20MFSMailEventObserver @ 10 NONAME
-	_ZN13CFSMailClient14SetMailboxNameE12TFSMailMsgIdRK7TDesC16 @ 11 NONAME
-	_ZN13CFSMailClient15GetFolderByUidLE12TFSMailMsgIdS0_ @ 12 NONAME
-	_ZN13CFSMailClient16GetBrandManagerLEv @ 13 NONAME
-	_ZN13CFSMailClient16GetMailBoxByUidLE12TFSMailMsgId @ 14 NONAME
-	_ZN13CFSMailClient16GetMessageByUidLE12TFSMailMsgIdS0_S0_14TFSMailDetails @ 15 NONAME
-	_ZN13CFSMailClient16ReleaseExtensionEP15CEmailExtension @ 16 NONAME
-	_ZN13CFSMailClient19DeleteMailBoxByUidLE12TFSMailMsgIdR22MFSMailRequestObserver @ 17 NONAME
-	_ZN13CFSMailClient20DeleteMessagesByUidLE12TFSMailMsgIdS0_RK6RArrayIS0_E @ 18 NONAME
-	_ZN13CFSMailClient20WizardDataAvailableLEv @ 19 NONAME
-	_ZN13CFSMailClient23SubscribeMailboxEventsLE12TFSMailMsgIdR20MFSMailEventObserver @ 20 NONAME
-	_ZN13CFSMailClient24UnsubscribeMailboxEventsE12TFSMailMsgIdR20MFSMailEventObserver @ 21 NONAME
-	_ZN13CFSMailClient25UnregisterRequestObserverEi @ 22 NONAME
-	_ZN13CFSMailClient4NewLEi @ 23 NONAME
-	_ZN13CFSMailClient4NewLEv @ 24 NONAME
-	_ZN13CFSMailClient5CloseEv @ 25 NONAME
-	_ZN13CFSMailClient5NewLCEi @ 26 NONAME
-	_ZN13CFSMailClient7CancelLEi @ 27 NONAME
-	_ZN13CFSMailClientD0Ev @ 28 NONAME
-	_ZN13CFSMailClientD1Ev @ 29 NONAME
-	_ZN13CFSMailClientD2Ev @ 30 NONAME
-	_ZTI12CFSClientAPI @ 31 NONAME
-	_ZTI12CFSMailBrand @ 32 NONAME
-	_ZTI19CFSFWImplementation @ 33 NONAME
-	_ZTI20CFSMailPluginManager @ 34 NONAME
-	_ZTI23CFSMailBrandManagerImpl @ 35 NONAME
-	_ZTI26CFSClientAPIRequestHandler @ 36 NONAME
-	_ZTV12CFSClientAPI @ 37 NONAME
-	_ZTV12CFSMailBrand @ 38 NONAME
-	_ZTV19CFSFWImplementation @ 39 NONAME
-	_ZTV20CFSMailPluginManager @ 40 NONAME
-	_ZTV23CFSMailBrandManagerImpl @ 41 NONAME
-	_ZTV26CFSClientAPIRequestHandler @ 42 NONAME
-	_ZN13CFSMailClient17GetMailBoxByUidLCE12TFSMailMsgId @ 43 NONAME
-	_ZN13CFSMailClient21PrepareMrDescriptionLERK12TFSMailMsgIdS2_ @ 44 NONAME
+	_ZN13CFSMailClient10CancelAllLEv @ 1 NONAME
+	_ZN13CFSMailClient10ExtensionLERK4TUid @ 2 NONAME
+	_ZN13CFSMailClient11GetTempDirLEv @ 3 NONAME
+	_ZN13CFSMailClient12AddObserverLER20MFSMailEventObserver @ 4 NONAME
+	_ZN13CFSMailClient12ListMessagesE12TFSMailMsgIdS0_14TFSMailDetailsRK6RArrayI19TFSMailSortCriteriaE @ 5 NONAME
+	_ZN13CFSMailClient13AuthenticateLER22MFSMailRequestObserver @ 6 NONAME
+	_ZN13CFSMailClient13CleanTempDirLEv @ 7 NONAME
+	_ZN13CFSMailClient13ListMailBoxesE12TFSMailMsgIdR13RPointerArrayI10CFSMailBoxE @ 8 NONAME
+	_ZN13CFSMailClient14RemoveObserverER20MFSMailEventObserver @ 9 NONAME
+	_ZN13CFSMailClient14SetMailboxNameE12TFSMailMsgIdRK7TDesC16 @ 10 NONAME
+	_ZN13CFSMailClient15GetFolderByUidLE12TFSMailMsgIdS0_ @ 11 NONAME
+	_ZN13CFSMailClient16GetBrandManagerLEv @ 12 NONAME
+	_ZN13CFSMailClient16GetMailBoxByUidLE12TFSMailMsgId @ 13 NONAME
+	_ZN13CFSMailClient16GetMessageByUidLE12TFSMailMsgIdS0_S0_14TFSMailDetails @ 14 NONAME
+	_ZN13CFSMailClient16ReleaseExtensionEP15CEmailExtension @ 15 NONAME
+	_ZN13CFSMailClient17GetMailBoxByUidLCE12TFSMailMsgId @ 16 NONAME
+	_ZN13CFSMailClient17IncReferenceCountEv @ 17 NONAME
+	_ZN13CFSMailClient19DeleteMailBoxByUidLE12TFSMailMsgIdR22MFSMailRequestObserver @ 18 NONAME
+	_ZN13CFSMailClient20DeleteMessagesByUidLE12TFSMailMsgIdS0_RK6RArrayIS0_E @ 19 NONAME
+	_ZN13CFSMailClient20WizardDataAvailableLEv @ 20 NONAME
+	_ZN13CFSMailClient21PrepareMrDescriptionLERK12TFSMailMsgIdS2_ @ 21 NONAME
+	_ZN13CFSMailClient23SubscribeMailboxEventsLE12TFSMailMsgIdR20MFSMailEventObserver @ 22 NONAME
+	_ZN13CFSMailClient24UnsubscribeMailboxEventsE12TFSMailMsgIdR20MFSMailEventObserver @ 23 NONAME
+	_ZN13CFSMailClient25UnregisterRequestObserverEi @ 24 NONAME
+	_ZN13CFSMailClient4NewLEi @ 25 NONAME
+	_ZN13CFSMailClient4NewLEv @ 26 NONAME
+	_ZN13CFSMailClient5CloseEv @ 27 NONAME
+	_ZN13CFSMailClient5NewLCEi @ 28 NONAME
+	_ZN13CFSMailClient7CancelLEi @ 29 NONAME
+	_ZN13CFSMailClientD0Ev @ 30 NONAME
+	_ZN13CFSMailClientD1Ev @ 31 NONAME
+	_ZN13CFSMailClientD2Ev @ 32 NONAME
+	_ZN13CFSMailClient13GetSignatureLERK12TFSMailMsgId @ 33 NONAME