--- a/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Fri Jun 04 10:25:39 2010 +0100
+++ b/messagingapp/msgui/msguiutils/src/mmsconformancecheck.cpp	Fri Jun 11 13:35:48 2010 +0300
@@ -21,19 +21,19 @@
 #include <MmsConformance.h>
 #include <centralrepository.h>
 #include <mmsconst.h>
-#include <msgmediainfo.h>
+#include <MsgMediaInfo.h>
 #include <fileprotectionresolver.h>
 
 #include <MsgMediaResolver.h>
 #include <DRMHelper.h>
 #include <MmsEngineInternalCRKeys.h>
 #include <hbmessagebox.h>
-#include <hbnotificationdialog>
+#include <HbNotificationDialog>
 #include <hbaction.h>
 
 #include "unidatamodelloader.h"
 #include "unidatamodelplugininterface.h"
-#include "unieditorgenutils.h" // This is needed for KDefaultMaxSize
+#include "UniEditorGenUtils.h" // This is needed for KDefaultMaxSize
 #include "s60qconversions.h"
 #include "debugtraces.h"
 
@@ -163,78 +163,6 @@
     return EInsertSuccess;
 }
 
-// ---------------------------------------------------------
-// MmsConformanceCheck::validateMsgForForward
-// ---------------------------------------------------------
-//
-bool MmsConformanceCheck::validateMsgForForward(int messageId)
-{
-    UniDataModelLoader* pluginLoader = new UniDataModelLoader();
-    UniDataModelPluginInterface* pluginInterface =
-            pluginLoader->getDataModelPlugin(ConvergedMessage::Mms);
-    pluginInterface->setMessageId(messageId);
-
-    //Check if slide count is greater than 1
-    if (pluginInterface->slideCount() > 1)
-    {
-        delete pluginLoader;
-        return false;
-    }
-
-    //Check if message size is inside max mms composition limits 
-    if (pluginInterface->messageSize() > iMaxMmsSize)
-    {
-        return false;
-    }
-
-    //If there is restricted content then return false
-    UniMessageInfoList slideContentList = pluginInterface->slideContent(0);
-    bool retValue = true;
-
-    for (int i = 0; i < slideContentList.size(); ++i)
-    {
-        if (checkModeForInsert(slideContentList.at(i)->path(), false)
-                != EInsertSuccess)
-        {
-            retValue = false;
-            break;
-        }
-    }
-
-    foreach(UniMessageInfo *slide,slideContentList)
-        {
-            delete slide;
-        }
-
-    if (!retValue)
-    {
-        delete pluginLoader;
-
-        return false;
-    }
-
-    UniMessageInfoList modelAttachmentList = pluginInterface->attachmentList();
-
-    for (int i = 0; i < modelAttachmentList.count(); ++i)
-    {
-        if (checkModeForInsert(modelAttachmentList.at(i)->path(), false)
-                != EInsertSuccess)
-        {
-            retValue = false;
-            break;
-        }
-    }
-
-    foreach(UniMessageInfo *attachment,modelAttachmentList)
-        {
-            delete attachment;
-        }
-
-    delete pluginLoader;
-
-    return retValue;
-}
-
 // -----------------------------------------------------------------------------
 // MmsConformanceCheck::onDialogInsertMedia
 // -----------------------------------------------------------------------------