--- a/qtmobility/src/messaging/qmessageaddress.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaddress.h	Mon May 03 13:18:40 2010 +0300
@@ -57,12 +57,12 @@
         System = 1,
         Phone,
         Email,
-        Xmpp
+        InstantMessage
         // Extensible
     };
 
     QMessageAddress();
-    QMessageAddress(Type type, const QString &recipient);
+    QMessageAddress(Type type, const QString &addressee);
     QMessageAddress(const QMessageAddress &other);
 
     virtual ~QMessageAddress();
@@ -75,8 +75,8 @@
     Type type() const;
     void setType(Type type);
 
-    QString recipient() const;
-    void setRecipient(const QString &recipient);
+    QString addressee() const;
+    void setAddressee(const QString &addressee);
 
     static void parseEmailAddress(const QString& emailAddress, QString *name, QString *address, QString *suffix = 0, bool *startDelimeterFound = 0, bool *endDelimeterFound = 0);