--- a/emailservices/emailframework/inc/CFSMailPlugin.inl	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.inl	Thu Sep 30 11:43:07 2010 +0300
@@ -60,9 +60,10 @@
 //
 inline CFSMailPlugin* CFSMailPlugin::NewL(TUid aUid)
     {
-    return static_cast<CFSMailPlugin*>(
+    CFSMailPlugin* plugin = static_cast<CFSMailPlugin*>(
         REComSession::CreateImplementationL(
             aUid, _FOFF( CFSMailPlugin, iDtor_ID_Key ) ) );
+    return plugin;
     }
 
 // -----------------------------------------------------------------------------
@@ -153,13 +154,3 @@
     }
 // </qmail>
 
-// <qmail>
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::Id
-// -----------------------------------------------------------------------------
-inline TUid CFSMailPlugin::Id( ) const
-    {
-    return iDtor_ID_Key;
-    }
-// </qmail>
-