--- a/qtmobility/src/messaging/qmessageaddress.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaddress.cpp	Mon May 03 13:18:40 2010 +0300
@@ -52,7 +52,7 @@
 
     \ingroup messaging
    
-    A message address consists of a recipient string and a type.
+    A message address consists of an addressee string and a type.
 */    
 
 /*!
@@ -60,10 +60,10 @@
 
     This enum type is used to describe the type of a message address.
     
-    \value System   A system address.
-    \value Phone    A telephony address.
-    \value Email    An Email, Internet Message Format address.
-    \value Xmpp     An XMPP, Extensible Messaging and Presence Protocol address.
+    \value System             A system address.
+    \value Phone              A telephony address.
+    \value Email              An Email, Internet Message Format address.
+    \value InstantMessage     An Instant Messaging address.
     
     \sa type(), setType()
 */
@@ -78,13 +78,13 @@
 }
 
 /*!
-    Constructs a message address with the type \a type and the recipient address \a recipient.
+    Constructs a message address with the given \a type and \a addressee.
 */
-QMessageAddress::QMessageAddress(Type type, const QString &recipient)
+QMessageAddress::QMessageAddress(Type type, const QString &addressee)
     : d_ptr(new QMessageAddressPrivate(this))
 {
     d_ptr->type = type;
-    d_ptr->recipient = recipient;
+    d_ptr->addressee = addressee;
 }
 
 /*!
@@ -100,7 +100,7 @@
 QMessageAddress& QMessageAddress::operator=(const QMessageAddress& other)
 {
     if (&other != this) {
-        d_ptr->recipient = other.d_ptr->recipient;
+        d_ptr->addressee = other.d_ptr->addressee;
         d_ptr->type = other.d_ptr->type;
     }
 
@@ -119,7 +119,7 @@
 /*! \internal */
 bool QMessageAddress::operator==(const QMessageAddress& other) const
 {
-    return ((d_ptr->type == other.d_ptr->type) && (d_ptr->recipient == other.d_ptr->recipient));
+    return ((d_ptr->type == other.d_ptr->type) && (d_ptr->addressee == other.d_ptr->addressee));
 }
 
 /*! \internal */
@@ -129,23 +129,23 @@
 }
 
 /*!
-    Returns the recipient.
+    Returns the addressee.
 
-    \sa setRecipient()
+    \sa setAddressee()
 */
-QString QMessageAddress::recipient() const
+QString QMessageAddress::addressee() const
 {
-    return d_ptr->recipient;
+    return d_ptr->addressee;
 }
 
 /*!
-    Sets the recipient to \a recipient.
+    Sets the addressee to \a addressee.
 
-    \sa recipient()
+    \sa addressee()
 */
-void QMessageAddress::setRecipient(const QString &recipient)
+void QMessageAddress::setAddressee(const QString &addressee)
 {
-    d_ptr->recipient = recipient;
+    d_ptr->addressee = addressee;
 }
 
 /*!