--- a/emailservices/emailclientapi/src/emailmessagesearch.cpp	Tue Apr 27 16:20:14 2010 +0300
+++ b/emailservices/emailclientapi/src/emailmessagesearch.cpp	Tue May 11 15:57:15 2010 +0300
@@ -226,6 +226,7 @@
     iObserver = &aObserver;
     const TFSMailMsgId fsMailboxId( iPluginData.Uid(), iMailboxId.iId );
     RArray <TFSMailMsgId> folderIds;
+    CleanupClosePushL( folderIds );  
     
     /** Search API */
     
@@ -263,6 +264,7 @@
         *this );
     // Gate is kept closed as search is asynchronous. Gate will be reopen after search is completed, i.e. 
     // CEmailMessageSearchAsync::SearchCompleted.
+    CleanupStack::PopAndDestroy( &folderIds );
     }
 
 /**
@@ -359,7 +361,7 @@
     /**
     * Asks client if search engine should change search priority 
   	*/
-void CEmailMessageSearchAsync::ClientRequiredSearchPriority(TInt *apRequiredSearchPriority)
+void CEmailMessageSearchAsync::ClientRequiredSearchPriority(TInt * /* apRequiredSearchPriority */ )
     {
     return;
     }