--- a/emailservices/emailframework/group/FSMailFramework.mmp	Tue Jan 26 11:45:42 2010 +0200
+++ b/emailservices/emailframework/group/FSMailFramework.mmp	Tue Feb 02 00:02:40 2010 +0200
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-
+#include "../../../inc/emailtraceconfig.hrh"
 #include "../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
 
 TARGET        FSMailFramework.dll
@@ -33,31 +33,31 @@
 
 USERINCLUDE ../../../inc
 APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE 	/epoc32/include/variant
+SYSTEMINCLUDE   /epoc32/include/variant
 
 
-USERINCLUDE   	../inc
-USERINCLUDE   	../commonlib/inc
-SOURCEPATH    	../src
-SOURCE        	CFSFWImplementation.cpp
-SOURCE        	CFSMailClient.cpp
-SOURCE        	CFSMailPluginManager.cpp
-SOURCE        	CFSMailBrand.cpp
+USERINCLUDE     ../inc
+USERINCLUDE     ../commonlib/inc
+SOURCEPATH      ../src
+SOURCE          CFSFWImplementation.cpp
+SOURCE          CFSMailClient.cpp
+SOURCE          CFSMailPluginManager.cpp
+SOURCE          CFSMailBrand.cpp
 SOURCE          CFSMailBrandManagerImpl.cpp
 SOURCE          CFSClientAPIRequestHandler.cpp 
 SOURCE          CFSClientAPI.cpp
 
-LIBRARY 		bafl.lib
-LIBRARY  		euser.lib
-LIBRARY	 		estor.lib 
-LIBRARY  		efsrv.lib
-LIBRARY  		ecom.lib
-LIBRARY     	gdi.lib
-LIBRARY     	egul.lib
-LIBRARY     	aknicon.lib
+LIBRARY         bafl.lib
+LIBRARY         euser.lib
+LIBRARY         estor.lib 
+LIBRARY         efsrv.lib
+LIBRARY         ecom.lib
+LIBRARY         gdi.lib
+LIBRARY         egul.lib
+LIBRARY         aknicon.lib
 
-LIBRARY        	FSFWCommonLib.lib
-LIBRARY			centralrepository.lib  
+LIBRARY         FSFWCommonLib.lib
+LIBRARY         centralrepository.lib  
 
 // <gmail_brand_issue>
 LIBRARY         ETel.lib   // RTelServer
@@ -67,6 +67,9 @@
 // </gmail_brand_issue>
 LIBRARY         cmaillogger.lib
 
+#ifdef TRACE_INTO_FILE
+LIBRARY         flogger.lib
+#endif // TRACE_INTO_FILE
 
 
 SOURCEPATH      ../data
@@ -81,3 +84,5 @@
 MACRO DEBUGLOGGER_LOG_DEBUG
 MACRO DEBUGLOGGER_DEBUG_ASSERTS
 #endif
+
+LIBRARY       flogger.lib