--- a/emailuis/nmailuiengine/src/nmuiengine.cpp	Thu Aug 05 21:09:09 2010 +0300
+++ b/emailuis/nmailuiengine/src/nmuiengine.cpp	Mon Aug 23 23:32:31 2010 +0300
@@ -1157,6 +1157,28 @@
 	}
 }
 
+/*!
+    Gets the signature for the given mailbox.
+
+    \param mailboxId The mailbox id whose signature is asked.
+	\param signature The reference to the signature string pointer. NULL if no signature.
+*/
+int NmUiEngine::getSignature(const NmId &mailboxId, QString *&signature)
+{
+    NM_FUNCTION;
+    
+    int retVal(NmNoError);
+    
+    // Get the plugin interface.
+    NmDataPluginInterface *pluginInterface =
+        mPluginFactory->interfaceInstance(mailboxId);
+
+    if (pluginInterface) {
+        retVal = pluginInterface->getSignature(mailboxId, signature);
+    }
+    
+    return retVal;
+}
 
 /*!
     Emits signals based on message events coming from plugins.
@@ -1275,23 +1297,3 @@
         emit operationCompleted(event);
     }
 }
-
-/*!
-    returns full mailbox id from plain account id
-*/
-NmId NmUiEngine::getPluginIdByMailboxId(quint32 accountId)
-{
-    NM_FUNCTION;
-
-    NmId fullId = NULL;
-    fullId.setId32(accountId);
-    QList<NmId> mailboxList;
-    if(mDataManager){
-        mDataManager->listMailboxIds(mailboxList);
-        for(int i=0;i<mailboxList.count();i++){
-            if(mailboxList.at(i).id32() == accountId)
-                fullId.setPluginId32(mailboxList.at(i).pluginId32());
-            }
-        }
-    return fullId;
-}