--- a/emailservices/nmclientapi/src/nmapiengine.cpp	Mon May 24 21:02:02 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiengine.cpp	Fri May 28 13:56:43 2010 +0300
@@ -15,6 +15,7 @@
  *
  */
 
+#include "emailtrace.h"
 
 #include <nmapicommonheader.h>
 
@@ -43,6 +44,8 @@
 NmApiEngine::NmApiEngine() :
     mFactory(NULL)
 {
+    NM_FUNCTION;
+    
     mFactory = NmApiDataPluginFactory::instance();
 }
 
@@ -51,6 +54,8 @@
  */
 NmApiEngine::~NmApiEngine()
 {
+    NM_FUNCTION;
+    
     NmApiDataPluginFactory::releaseInstance(mFactory);
 }
 
@@ -63,6 +68,8 @@
  */
 NmApiEngine *NmApiEngine::instance()
 {
+    NM_FUNCTION;
+    
     if (!mInstance) {
         mInstance = new NmApiEngine();
     }
@@ -75,6 +82,8 @@
  */
 void NmApiEngine::startCollectingEvents()
 {
+    NM_FUNCTION;
+    
     QObject *plugin = mFactory->plugin();
     if(plugin){
         connect(plugin, SIGNAL(messageEvent(NmMessageEvent, NmId, QList<NmId> , NmId)), this,
@@ -94,6 +103,8 @@
  */
 void NmApiEngine::mailboxChangedArrived(NmMailboxEvent mailboxEvent, const QList<NmId> &mailboxIds)
 {
+    NM_FUNCTION;
+    
     NmApiMessage message;
     message.objectType = EMailbox;
     switch (mailboxEvent) {
@@ -138,6 +149,8 @@
     const QList<NmId> &messageIds,
     const NmId &mailboxId)
 {
+    NM_FUNCTION;
+    
     NmApiMessage message;
     message.objectType = EMessage;
     switch (messageEvent) {
@@ -175,6 +188,8 @@
  */
 void NmApiEngine::releaseInstance(NmApiEngine *&instance)
 {
+    NM_FUNCTION;
+    
     //can't have passed out instances if we don't have any
     if (mInstance) {
         if (instance == mInstance) {
@@ -196,6 +211,8 @@
  */
 void NmApiEngine::listMailboxes(QList<EmailClientApi::NmApiMailbox> &mailboxList)
 {
+    NM_FUNCTION;
+    
     QList<NmMailbox*> mailboxFromPlugin;
 
     NmDataPluginInterface *instance =  mFactory->interfaceInstance();
@@ -219,6 +236,8 @@
  */
 void NmApiEngine::listFolders(const quint64 mailboxId, QList<EmailClientApi::NmApiFolder> &folderList)
 {
+    NM_FUNCTION;
+    
     QList<NmFolder*> folderFromPlugin;
     NmDataPluginInterface *instance = mFactory->interfaceInstance();
     if (instance) {
@@ -243,6 +262,8 @@
 void NmApiEngine::listEnvelopes(const quint64 mailboxId, const quint64 folderId, 
                     QList<EmailClientApi::NmApiMessageEnvelope> &messageEnvelopeList)
 {
+    NM_FUNCTION;
+    
     QList<NmMessage*> messages;
     NmDataPluginInterface *instance = mFactory->interfaceInstance();
     if (instance) {
@@ -287,6 +308,8 @@
     const quint64 envelopeId,
     EmailClientApi::NmApiMessageEnvelope &envelope)
 {
+    NM_FUNCTION;
+    
     //flag indicating that envelope with given id was found
     bool found = false;
     NmDataPluginInterface *instance = mFactory->interfaceInstance();
@@ -327,6 +350,8 @@
  */
 bool NmApiEngine::getMailboxById(const quint64 mailboxId, EmailClientApi::NmApiMailbox &mailbox)
 {
+    NM_FUNCTION;
+    
     //flag indicating that mailbox with given id was found
     bool found = false;
     NmDataPluginInterface *instance = mFactory->interfaceInstance();