diff -r d620048b4810 -r dcf0eedfc1a3 emailuis/emailui/inc/FreestyleEmailUiHtmlViewerContainer.h
--- a/emailuis/emailui/inc/FreestyleEmailUiHtmlViewerContainer.h	Thu Jul 15 18:19:25 2010 +0300
+++ b/emailuis/emailui/inc/FreestyleEmailUiHtmlViewerContainer.h	Thu Aug 19 09:38:05 2010 +0300
@@ -197,14 +197,12 @@
     void LoadContentFromFileL( RFile& aFile );
     void LoadContentFromUrlL( const TDesC& aUrl );
     void LoadContentFromMailMessageL( CFSMailMessage* aMailMessage, TBool aResetScrollPos=ETrue );
-    void ResetContent(const TBool aDisconnect = EFalse);
+    void ResetContent( TBool aDisconnect = EFalse, TBool aClearFlags = ETrue );
     void CancelFetch();
     void ClearCacheAndLoadEmptyContent();
-    // <cmail>
     void PrepareForExit();
     void PrepareForMessageNavigation();
-    // </cmail>
-    
+
 // from base class CCoeControl
 
     CCoeControl* ComponentControl( TInt aIndex ) const;
@@ -303,7 +301,7 @@
     void ConvertToHtmlFileL( CFSMailMessagePart& aTextBodyPart, const TDesC& aHtmlFileName );
 
     // Reads given file content to buffer and return pointer to it
-    HBufC8* ReadContentFromFileLC( RFile& aFile, CFSMailMessagePart& aHtmlBodyPart );
+    HBufC8* ReadContentFromFileLC( RFile& aFile, CFSMailMessagePart& aBodyPart );
     // Writes buffer to given file
     void WriteContentToFileL( const TDesC8& aContent, const TDesC& aFileName, CFSMailMessagePart& aHtmlBodyPart );