diff -r ecc8def7944a -r 2dc6caa42ec3 emailservices/nmailbase/inc/nmmessageenvelope.h
--- a/emailservices/nmailbase/inc/nmmessageenvelope.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/nmailbase/inc/nmmessageenvelope.h	Fri May 14 15:41:10 2010 +0300
@@ -38,8 +38,8 @@
     bool isFlagSet(const NmMessageFlag flag) const;
 
 public:
-    NmId mId;
-    NmId mParentId; // id for top-level message/messageId for message parts
+    NmId mMessageId;
+    NmId mFolderId; // id for top-level message/messageId for message parts
     NmId mMailboxId;
     QString mSubject;
     NmAddress mSender;
@@ -58,7 +58,7 @@
 
 public:
     NmMessageEnvelope();
-    NmMessageEnvelope(const NmId &id);
+    NmMessageEnvelope(const NmId &messageId);
     NmMessageEnvelope(const NmMessageEnvelope &envelope);
     NmMessageEnvelope(QExplicitlySharedDataPointer<NmMessageEnvelopePrivate> nmPrivateMessageEnvelope);
     NmMessageEnvelope &operator=(const NmMessageEnvelope &envelope);
@@ -66,14 +66,14 @@
     bool operator!=(const NmMessageEnvelope &envelope) const;
     virtual ~NmMessageEnvelope();
 
-    void setId(const NmId &id);
-    NmId id() const;
+    void setMessageId(const NmId &messageId);
+    NmId messageId() const;
 
-    NmId parentId() const;
-    void setParentId(const NmId &id);
+    NmId folderId() const;
+    void setFolderId(const NmId &folderId);
 
     NmId mailboxId() const;
-    void setMailboxId(const NmId &id);
+    void setMailboxId(const NmId &mailboxId);
 
     void setSubject(const QString &subject);
     QString subject() const;