--- a/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Fri Sep 17 20:16:33 2010 +0530
+++ b/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Tue Oct 05 13:58:47 2010 +0530
@@ -353,20 +353,20 @@
     iMmsMtm->SwitchCurrentEntryL(msgId);
     iMmsMtm->LoadMessageL();
 
-    CUniDataModel* iUniDataModel = CUniDataModel::NewL(ifsSession, *iMmsMtm);
-    CleanupStack::PushL(iUniDataModel);
-    iUniDataModel->RestoreL(*this, ETrue);
+    CUniDataModel* uniDataModel = CUniDataModel::NewL(ifsSession, *iMmsMtm);
+    CleanupStack::PushL(uniDataModel);
+    uniDataModel->RestoreL(*this, ETrue);
     
     //msg property
     TInt msgProperty = 0;
-    if (iUniDataModel->AttachmentList().Count() > 0)
+    if (uniDataModel->AttachmentList().Count() > 0)
         {
         msgProperty |= EPreviewAttachment;
         }
 
     //check for msg forward
     //Validate if the mms msg can be forwarded or not
-    if (ValidateMsgForForward(iUniDataModel))
+    if (ValidateMsgForForward(uniDataModel))
         {
         msgProperty |= EPreviewForward;
         }
@@ -375,7 +375,7 @@
     TPtrC imagePath;
 
     // preview parsing
-    TInt slideCount = iUniDataModel->SmilModel().SlideCount();
+    TInt slideCount = uniDataModel->SmilModel().SlideCount();
     TBool isBodyTextSet = EFalse;
     TBool isImageSet = EFalse;
     TBool isAudioSet = EFalse;
@@ -383,10 +383,10 @@
 
     for (int i = 0; i < slideCount; i++)
         {
-        int slideobjcount = iUniDataModel->SmilModel().SlideObjectCount(i);
+        int slideobjcount = uniDataModel->SmilModel().SlideObjectCount(i);
         for (int j = 0; j < slideobjcount; j++)
             {
-            CUniObject *obj = iUniDataModel->SmilModel(). GetObjectByIndex(i,
+            CUniObject *obj = uniDataModel->SmilModel(). GetObjectByIndex(i,
                     j);
             CMsgMediaInfo *mediaInfo = obj->MediaInfo();