--- a/ipsservices/ipssosplugin/inc/ipsplgsearch.inl	Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosplugin/inc/ipsplgsearch.inl	Fri Apr 16 14:51:52 2010 +0300
@@ -19,11 +19,7 @@
 #include <StringLoader.h>
 
 const TInt KIpsPlgArrayGranularity = 3;
-// <cmail> mirrored
-//_LIT( KIpsPlgPattern, "*%0U*" );
-_LIT( KIpsPlgPattern, "*" );
-// </cmail> 
-
+_LIT( KIpsPlgPattern, "*%1U*" );
 
 // ---------------------------------------------------------------------------
 // CIpsPlgSearch::TSearchParams::TSearchParams()
@@ -113,27 +109,16 @@
 
     for ( TInt item = 0; item < aSearchStrings.Count(); item++ )
         {
-        // <cmail> mirrored
-
         // Add the wildcards here.
-        //TBuf<5> pattern( KIpsPlgPattern );
+        TBuf<5> pattern( KIpsPlgPattern );
         RBuf destroyThisHackStringNow;
         destroyThisHackStringNow.CreateL(
             aSearchStrings[item]->Length() + 2 );
         CleanupClosePushL( destroyThisHackStringNow );
 
-        destroyThisHackStringNow.Insert(0, KIpsPlgPattern);
-        destroyThisHackStringNow.Append(*aSearchStrings[item]);
-        destroyThisHackStringNow.Append(KIpsPlgPattern);
-        /*
         StringLoader::Format(
-            destroyThisHackStringNow, pattern, 0, *aSearchStrings[item] );
-        */
-
-        // </cmail> 
-
-        
-        iSearchStrings->AppendL( destroyThisHackStringNow ); //<cmail>
+            destroyThisHackStringNow, pattern, 1, *aSearchStrings[item] );
+        iSearchStrings->AppendL( *destroyThisHackStringNow.AllocL() );
 
         CleanupStack::PopAndDestroy( &destroyThisHackStringNow );
         }
@@ -153,7 +138,7 @@
 
     for ( TInt item = 0; item < aSearchStrings.Count(); item++ )
         {
-        iSearchStrings->AppendL( aSearchStrings[item] ); //<cmail>
+        iSearchStrings->AppendL( *aSearchStrings[item].AllocL() );
         }
     }