--- a/emailuis/nmailui/src/nmmailboxselectiondialog.cpp	Mon May 24 21:02:02 2010 +0300
+++ b/emailuis/nmailui/src/nmmailboxselectiondialog.cpp	Fri May 28 13:56:43 2010 +0300
@@ -42,6 +42,8 @@
       mParent(parent),
       mMailboxId(0)
 {
+    NM_FUNCTION;
+    
     // No implementation required.
 }
 
@@ -51,6 +53,8 @@
 */
 NmMailboxSelectionDialog::~NmMailboxSelectionDialog()
 {
+    NM_FUNCTION;
+    
     delete mContentItemModel;
     delete mMailboxListView;
     delete mMailboxSelectionDialog;
@@ -63,7 +67,8 @@
 */
 void NmMailboxSelectionDialog::open()
 {
-    NMLOG("NmMailboxSelectionDialog::open()");
+    NM_FUNCTION;
+    
     mMailboxId = 0;
 
     // Initialize the UI and fetch the mailbox items into the list.
@@ -79,10 +84,12 @@
  */
 void NmMailboxSelectionDialog::dialogClosed(HbAction *action)
 {
+    NM_FUNCTION;
+    
     Q_UNUSED(action);
 
     // Store the ID of the selected mailbox into the given argument.
-    NMLOG(QString("NmMailboxSelectionDialog::dialogClosed() return %1").
+    NM_COMMENT(QString("NmMailboxSelectionDialog::dialogClosed() return %1").
         arg(mMailboxId.id()));
 
     emit selectionDialogClosed(mMailboxId);
@@ -96,8 +103,8 @@
 */
 bool NmMailboxSelectionDialog::initializeUi()
 {
-    NMLOG("NmMailboxSelectionDialog::initializeUi()");
-
+    NM_FUNCTION;
+    
     // Use the document loader to load the widgets.
     HbDocumentLoader documentLoader;
     bool documentLoaded = false;
@@ -118,7 +125,7 @@
     }
 
     if (!mMailboxSelectionDialog || !mMailboxListView) {
-        NMLOG("NmMailboxSelectionDialog::initializeUi(): Failed to load widgets!");
+        NM_ERROR(1,"NmMailboxSelectionDialog::initializeUi(): Failed to load widgets!");
         return false;
     }
 
@@ -153,7 +160,8 @@
 */
 bool NmMailboxSelectionDialog::populateListItems()
 {
-    NMLOG("NmMailboxSelectionDialog::populateListItems()");
+    NM_FUNCTION;
+    
     const int count = mMailboxListModel.rowCount();
 
     if (!mContentItemModel || count == 0) {
@@ -191,6 +199,8 @@
 */
 NmMailboxMetaData *NmMailboxSelectionDialog::mailboxMetaData(int index) const
 {
+    NM_FUNCTION;
+    
     QVariant mailbox = mMailboxListModel.data(mMailboxListModel.index(index, 0));
     NmMailboxMetaData *mailboxMetaData = mailbox.value<NmMailboxMetaData*>();
     return mailboxMetaData;
@@ -204,6 +214,8 @@
 */
 void NmMailboxSelectionDialog::itemActivated(QModelIndex index)
 {
+    NM_FUNCTION;
+    
     const int rowIndex = index.row();
     NmMailboxMetaData *metaData = mailboxMetaData(rowIndex);