--- a/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Tue Jul 06 22:50:16 2010 +0530
+++ b/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Fri Jul 09 14:46:10 2010 +0530
@@ -113,6 +113,11 @@
 
         CleanupStack::PopAndDestroy(4);
 
+        // TODO: Remove this check once Video support is provided in UniEditor.
+        if (info->MediaType() == EMsgMediaVideo)
+        {
+            return EInsertNotSupported;
+        }
 
         // In "free" mode user can insert images that are larger by dimensions than allowed by conformance
         if (iCreationMode != EMmsCreationModeRestricted)
@@ -267,10 +272,6 @@
 //
 void MmsConformanceCheck::showPopup(const QString& text)
 {
-    HbNotificationDialog* dlg = new HbNotificationDialog();
-    dlg->setFocusPolicy(Qt::NoFocus);
-    dlg->setAttribute(Qt::WA_DeleteOnClose, true);
-    dlg->setText(text);
-    dlg->show();
+    HbMessageBox::information(text, 0, 0, HbMessageBox::Ok);
 }