diff -r 238255e8b033 -r 84d9eb65b26f messagingappbase/msgmedia/src/MsgMediaResolver.cpp
--- a/messagingappbase/msgmedia/src/MsgMediaResolver.cpp	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingappbase/msgmedia/src/MsgMediaResolver.cpp	Mon May 03 12:29:07 2010 +0300
@@ -104,6 +104,12 @@
 //
 CMsgMediaResolver::~CMsgMediaResolver()
     {
+    if ( iWait.IsStarted() )
+        {
+        // Stop active wait.
+        iWait.AsyncStop();
+        }
+    
     iFs.Close();
     iApaLsSession.Close();
     iMimeGroupArray.ResetAndDestroy();
@@ -262,13 +268,13 @@
 EXPORT_C void CMsgMediaResolver::ParseInfoDetailsL( CMsgMediaInfo* aInfo, RFile& aFile )
     {
     aInfo->ParseInfoDetailsL( aFile, *iDRMHelper, *this );
-    /* if ( iWait.IsStarted() )
+     if ( iWait.IsStarted() )
         {
         // Stop active wait.
         iWait.AsyncStop();
         }
     // Start active wait
-    iWait.Start();*/
+    iWait.Start();
     }
 
 // -----------------------------------------------------------------------------
@@ -338,11 +344,11 @@
 //
 void CMsgMediaResolver::MediaInfoParsed()
     {
-    /*if ( iWait.IsStarted() )
+    if ( iWait.IsStarted() )
         {
         // Stop active wait.
         iWait.AsyncStop();
-        }*/
+        }
     }
 
 //  End of File