--- a/ipsservices/ipssosplugin/src/ipsplgsearch.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgsearch.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -569,7 +569,7 @@
     FUNC_LOG;
     iActiveEntry->SetEntryL( aParams.iMailbox.Id() );
     
-    if ( iActiveEntry->Entry().iMtm == KSenduiMtmPop3Uid )
+    if ( iActiveEntry->Entry().iMtm == KUidMsgTypePOP3 )
         {
         aParams.iFolderIds.AppendL( 
             TFSMailMsgId( iPlugin.PluginId(), aParams.iMailbox.Id() ) );
@@ -1005,7 +1005,7 @@
             const TMsvEntry& entry = ( *iActiveEntry )[msg];
             if ( entry.iType == KUidMsvMessageEntry &&
             	 entry.iServiceId == serviceId &&
-                 ( entry.iMtm.iUid == KSenduiMtmSmtpUidValue ||
+                 ( entry.iMtm == KUidMsgTypeSMTP ||
                    entry.iMtm.iUid == iPlugin.MtmId().iUid ) )
                 {
                 iEmailMessages.AppendL( TMsgContainer( entry,