diff -r 84d9eb65b26f -r e4592d119491 messagingapp/msgui/unifiedviewer/inc/univiewerfeeder_p.h
--- a/messagingapp/msgui/unifiedviewer/inc/univiewerfeeder_p.h	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgui/unifiedviewer/inc/univiewerfeeder_p.h	Fri May 14 15:49:35 2010 +0300
@@ -25,7 +25,6 @@
 
 #include "convergedmessage.h"
 #include "unidatamodelplugininterface.h"
-#include <qmobilityglobal.h>
 
 class QDateTime;
 class UniViewerFeeder;
@@ -33,12 +32,6 @@
 class UniDataModelPluginInterface;
 class UniDataModelLoader;
 
-QTM_BEGIN_NAMESPACE
-class QContactManager;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
-
 /**
  * UniViewerFeederPrivate
  * Feeder Private class for unified viewer. Fetches data from the
@@ -180,13 +173,6 @@
      * Returns the sending state of the message.
      */
     int sendingState();
-    
-    /**
-     * Gets the name(alias) for a address from the Contact database
-     * @int returns number of phone addresses for the specified address.
-     */
-    static int GetNameFromContacts(const QString& address, QString& alias);
-
 
 private:
     /**