--- a/emailservices/emailcommon/src/CFSMailPluginData.cpp	Mon May 24 21:02:02 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailPluginData.cpp	Fri May 28 13:56:43 2010 +0300
@@ -15,11 +15,12 @@
 *
 */
 
+#include "emailtrace.h"
+
 // <qmail>
 #include <nmcommonheaders.h>
 // </qmail>
 
-#include "emailtrace.h"
 #include "CFSMailPluginData.h"
 
 // -----------------------------------------------------------------------------
@@ -27,8 +28,7 @@
 // -----------------------------------------------------------------------------
 CFSMailPluginData::CFSMailPluginData()
 {
-    FUNC_LOG;
-
+    NM_FUNCTION;
 }
 
 // -----------------------------------------------------------------------------
@@ -36,7 +36,8 @@
 // -----------------------------------------------------------------------------
 CFSMailPluginData::~CFSMailPluginData()
 {
-    FUNC_LOG;
+    NM_FUNCTION;
+    
 	if(iPlugin)
 		{
 		delete iPlugin;