--- a/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Wed Jun 23 18:09:17 2010 +0300
+++ b/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Tue Jul 06 14:12:40 2010 +0300
@@ -55,6 +55,9 @@
 _LIT(KRemoveMsgStmnt,"DELETE FROM conversation_messages WHERE message_id=:message_id");
 
 const TInt KDefaultMaxSize = 300 * 1024;
+//Preview thumbnail size
+const TInt KWidth = 9.5 * 6.7;
+const TInt KHeight = 9.5 * 6.7;
 
 // NOTE:- DRAFTS ENTRIES ARE NOT HANDLED IN THE PLUGIN
 
@@ -362,7 +365,7 @@
                     }
 
                     //image parsing
-                    if (!isImageSet && (mimetype.Find(_L8("image"))
+                    if (!isVideoSet && !isImageSet && (mimetype.Find(_L8("image"))
                             != KErrNotFound))
                     {
                         //get thumbnail for this image
@@ -389,7 +392,7 @@
                     }
 
                     //audio content
-                    if (!isAudioSet && (mimetype.Find(_L8("audio"))
+                    if (!isVideoSet && !isAudioSet && (mimetype.Find(_L8("audio"))
                             != KErrNotFound))
                     {
                         isAudioSet = ETrue;
@@ -405,7 +408,7 @@
                     }
 
                     //video content
-                    if (!isVideoSet && (mimetype.Find(_L8("video"))
+                    if (!( isImageSet || isAudioSet) && !isVideoSet && (mimetype.Find(_L8("video"))
                             != KErrNotFound))
                     {
                         videoPath.Set(mediaInfo->FullFilePath());
@@ -796,7 +799,7 @@
     iThumbnailManager->SetFlagsL(CThumbnailManager::ECropToAspectRatio);
 
     //TODO replace with hb-param-graphic-size-image-portrait * value of un in pixcels
-    iThumbnailManager->SetThumbnailSizeL(TSize(63.65, 63.65)); 
+    iThumbnailManager->SetThumbnailSizeL(TSize(KWidth, KHeight)); 
     
     //optimize for performace
     iThumbnailManager->SetQualityPreferenceL(