diff -r 84197e66a4bd -r 35b64624a9e7 messagingapp/msgui/conversationview/src/msgviewutils.cpp
--- a/messagingapp/msgui/conversationview/src/msgviewutils.cpp	Fri Jun 11 13:35:48 2010 +0300
+++ b/messagingapp/msgui/conversationview/src/msgviewutils.cpp	Wed Jun 23 18:09:17 2010 +0300
@@ -16,7 +16,7 @@
  */
 
 #include "msgviewutils.h"
-#include "s60qconversions.h"
+#include <xqconversions.h>
 
 // ---------------------------------------------------------------------------
 // Constructor
@@ -44,7 +44,7 @@
     RFs rfs;
     RFile file;
 
-    HBufC* fileName = S60QConversions::qStringToS60Desc(aFileName);
+    HBufC* fileName = XQConversions::qStringToS60Desc(aFileName);
 
     //TODO: The RFs and RApaLsSession has to be connected 1's, not for every mms
 
@@ -69,7 +69,7 @@
             rfs.Close();
             apaSession.Close();
 
-            return S60QConversions::s60Desc8ToQString(fileType);
+            return XQConversions::s60Desc8ToQString(fileType);
             }
         }