diff -r 9ba4404ef423 -r 759dc5235cdb emailuis/nmailui/src/nmviewerwebview.cpp
--- a/emailuis/nmailui/src/nmviewerwebview.cpp	Thu May 27 12:43:55 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerwebview.cpp	Fri Jun 11 13:27:14 2010 +0300
@@ -23,6 +23,7 @@
 NmMailViewerWK::NmMailViewerWK()
 	:QGraphicsWebView()
 {
+    NM_FUNCTION;
 }
 
 /*!
@@ -30,6 +31,8 @@
 */
 NmMailViewerWK::~NmMailViewerWK()
 {
+    NM_FUNCTION;
+    
     mContent.clear();
 }
 
@@ -38,28 +41,37 @@
 */
 void NmMailViewerWK::setParentView(NmViewerView *parentView)
 {
+    NM_FUNCTION;
+    
     mParentView = parentView;
 }
 
 /*!
     addContent. Function adds content into web view.
 */
-void NmMailViewerWK::addContent(QString key, QVariant val) {
-    mContent[key] = val;
+void NmMailViewerWK::addContent(QString key, QVariant val, NmId partId, bool isFetched) 
+{
+    NM_FUNCTION;
+    
+    mContent[key] = NmMailViewerWkContentItem(val, partId, isFetched);
 }
 
 /*!
     loadResource. Function returns resource from added content (added with addContent)
 */
-QVariant NmMailViewerWK::loadResource(int type, const QUrl &name)
+QVariant NmMailViewerWK::loadResource(int type, const QUrl &name, NmId &partId, bool &isFetched)
 {
+    NM_FUNCTION;
+    
     if (type == QTextDocument::ImageResource) {
         QString key = '<' + name.path() + '>';
         if (!mContent.contains(key)) {
             key = name.path();
         }
         if (mContent.contains(key)) {
-            return mContent[key];
+            partId = mContent[key].mPartId;
+            isFetched = mContent[key].mIsFetched;
+            return mContent[key].mData;
         }
         return 0;
     }
@@ -71,6 +83,8 @@
 */
 void NmMailViewerWK::sendMousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+    NM_FUNCTION;
+    
     if (event){
         QGraphicsWebView::mousePressEvent(event);
     }
@@ -81,6 +95,8 @@
 */
 void NmMailViewerWK::sendMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    NM_FUNCTION;
+    
     if (event) {
         QGraphicsWebView::mouseReleaseEvent(event);
     }