--- a/messagingapp/msgutils/convergedmessageutils/src/convergedmessageimpl.cpp	Wed Aug 18 00:46:12 2010 +0530
+++ b/messagingapp/msgutils/convergedmessageutils/src/convergedmessageimpl.cpp	Tue Aug 31 18:53:38 2010 +0530
@@ -38,7 +38,8 @@
             mPriority(ConvergedMessage::Normal), mLocation(
                     ConvergedMessage::Delete), mDirection(
                     ConvergedMessage::Incoming), mSendingState(
-                    ConvergedMessage::Unknown)
+                    ConvergedMessage::Unknown),
+    mOriginatingSC(0)
     {
     mMessageType = messageType;
     mId = new ConvergedMessageId();
@@ -56,11 +57,11 @@
             mPriority(ConvergedMessage::Normal), mLocation(
                     ConvergedMessage::Delete), mDirection(
                     ConvergedMessage::Incoming), mSendingState(
-                    ConvergedMessage::Unknown)
+                    ConvergedMessage::Unknown),
+    mOriginatingSC(0)
     {
     mId = new ConvergedMessageId(id);
     mFromAddress = new ConvergedMessageAddress();
-
     }
 
 //----------------------------------------------------------------
@@ -121,6 +122,7 @@
     mLocation = msg.location();
     mDirection = msg.direction();
     mSendingState = msg.sendingState();
+    mOriginatingSC = QString(msg.originatingSC());
     }
 
 //----------------------------------------------------------------
@@ -507,7 +509,6 @@
         ConvergedMessageAttachmentList attachmentList)
     {
     mAttachments.append(attachmentList);
-
     }
 
 //----------------------------------------------------------------
@@ -560,6 +561,7 @@
     stream << mLocation;
     stream << mDirection;
     stream << mSendingState;
+    stream << mOriginatingSC;
     }
 
 //----------------------------------------------------------------
@@ -633,6 +635,52 @@
     stream >> mLocation;
     stream >> mDirection;
     stream >> mSendingState;
+    stream >> mOriginatingSC;
+    }
+
+//----------------------------------------------------------------
+// ConvergedMessageImpl::setReplyPath
+// @see header
+//----------------------------------------------------------------
+void ConvergedMessageImpl::setReplyPath(bool replypath)
+    {
+    if( replypath )
+        {
+        // set replypath property
+        mProperty |= ConvergedMessage::ReplyPath;
+        }
+    else
+        {
+        // reset replypath property
+        mProperty &= ~ConvergedMessage::ReplyPath;
+        }
+    }
+
+//----------------------------------------------------------------
+// ConvergedMessageImpl::replyPath
+// @see header
+//----------------------------------------------------------------
+bool ConvergedMessageImpl::replyPath()
+    {
+    return mProperty & ConvergedMessage::ReplyPath;
+    }
+
+//----------------------------------------------------------------
+// ConvergedMessageImpl::setOriginatingSC
+// @see header
+//----------------------------------------------------------------
+void ConvergedMessageImpl::setOriginatingSC(const QString& scaddress)
+    {
+    mOriginatingSC = scaddress;
+    }
+    
+//----------------------------------------------------------------
+// ConvergedMessageImpl::originatingSC
+// @see header
+//----------------------------------------------------------------
+const QString& ConvergedMessageImpl::originatingSC() const
+    {
+    return mOriginatingSC;
     }
 
 // eof