diff -r 8ba0afbb4637 -r a15d9966050f messagingapp/msgutils/eabi/convergedmessageutilsu.def
--- a/messagingapp/msgutils/eabi/convergedmessageutilsu.def	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgutils/eabi/convergedmessageutilsu.def	Fri Sep 17 08:28:39 2010 +0300
@@ -7,74 +7,78 @@
 	_ZN16ConvergedMessage11setPropertyENS_15MessagePropertyE @ 6 NONAME
 	_ZN16ConvergedMessage12setDirectionENS_9DirectionE @ 7 NONAME
 	_ZN16ConvergedMessage12setMessageIdER18ConvergedMessageId @ 8 NONAME
-	_ZN16ConvergedMessage12setTimeStampEx @ 9 NONAME
-	_ZN16ConvergedMessage14addAttachmentsER5QListIP26ConvergedMessageAttachmentE @ 10 NONAME
-	_ZN16ConvergedMessage14addCcRecipientER23ConvergedMessageAddress @ 11 NONAME
-	_ZN16ConvergedMessage14addToRecipientER23ConvergedMessageAddress @ 12 NONAME
-	_ZN16ConvergedMessage14setMessageTypeENS_11MessageTypeE @ 13 NONAME
-	_ZN16ConvergedMessage15addBccRecipientER23ConvergedMessageAddress @ 14 NONAME
-	_ZN16ConvergedMessage15addCcRecipientsER5QListIP23ConvergedMessageAddressE @ 15 NONAME
-	_ZN16ConvergedMessage15addToRecipientsER5QListIP23ConvergedMessageAddressE @ 16 NONAME
-	_ZN16ConvergedMessage15setSendingStateENS_12SendingStateE @ 17 NONAME
-	_ZN16ConvergedMessage16addBccRecipientsER5QListIP23ConvergedMessageAddressE @ 18 NONAME
-	_ZN16ConvergedMessage16addFromRecipientER23ConvergedMessageAddress @ 19 NONAME
-	_ZN16ConvergedMessageC1ENS_11MessageTypeE @ 20 NONAME
-	_ZN16ConvergedMessageC1ERK18ConvergedMessageId @ 21 NONAME
-	_ZN16ConvergedMessageC1ERKS_ @ 22 NONAME
-	_ZN16ConvergedMessageC2ENS_11MessageTypeE @ 23 NONAME
-	_ZN16ConvergedMessageC2ERK18ConvergedMessageId @ 24 NONAME
-	_ZN16ConvergedMessageC2ERKS_ @ 25 NONAME
-	_ZN16ConvergedMessageD1Ev @ 26 NONAME
-	_ZN16ConvergedMessageD2Ev @ 27 NONAME
-	_ZN18ConvergedMessageId11deserializeER11QDataStream @ 28 NONAME
-	_ZN18ConvergedMessageId5setIdEi @ 29 NONAME
-	_ZN18ConvergedMessageIdC1ERKS_ @ 30 NONAME
-	_ZN18ConvergedMessageIdC1Ei @ 31 NONAME
-	_ZN18ConvergedMessageIdC2ERKS_ @ 32 NONAME
-	_ZN18ConvergedMessageIdC2Ei @ 33 NONAME
-	_ZN18ConvergedMessageIdaSERKS_ @ 34 NONAME
-	_ZN23ConvergedMessageAddress10setAddressERK7QString @ 35 NONAME
-	_ZN23ConvergedMessageAddress11deserializeER11QDataStream @ 36 NONAME
-	_ZN23ConvergedMessageAddress8setAliasERK7QString @ 37 NONAME
-	_ZN23ConvergedMessageAddressC1ERK7QStringS2_ @ 38 NONAME
-	_ZN23ConvergedMessageAddressC2ERK7QStringS2_ @ 39 NONAME
-	_ZN23ConvergedMessageAddressD1Ev @ 40 NONAME
-	_ZN23ConvergedMessageAddressD2Ev @ 41 NONAME
-	_ZN26ConvergedMessageAttachment11deserializeER11QDataStream @ 42 NONAME
-	_ZN26ConvergedMessageAttachment11setFilePathERK7QString @ 43 NONAME
-	_ZN26ConvergedMessageAttachment17setAttachmentTypeEi @ 44 NONAME
-	_ZN26ConvergedMessageAttachmentC1ERK7QStringi @ 45 NONAME
-	_ZN26ConvergedMessageAttachmentC2ERK7QStringi @ 46 NONAME
-	_ZN26ConvergedMessageAttachmentD1Ev @ 47 NONAME
-	_ZN26ConvergedMessageAttachmentD2Ev @ 48 NONAME
-	_ZNK16ConvergedMessage10propertiesEv @ 49 NONAME
-	_ZNK16ConvergedMessage11attachmentsEv @ 50 NONAME
-	_ZNK16ConvergedMessage11fromAddressEv @ 51 NONAME
-	_ZNK16ConvergedMessage11messageTypeEv @ 52 NONAME
-	_ZNK16ConvergedMessage12sendingStateEv @ 53 NONAME
-	_ZNK16ConvergedMessage13ccAddressListEv @ 54 NONAME
-	_ZNK16ConvergedMessage13hasAttachmentEv @ 55 NONAME
-	_ZNK16ConvergedMessage13toAddressListEv @ 56 NONAME
-	_ZNK16ConvergedMessage14bccAddressListEv @ 57 NONAME
-	_ZNK16ConvergedMessage2idEv @ 58 NONAME
-	_ZNK16ConvergedMessage7subjectEv @ 59 NONAME
-	_ZNK16ConvergedMessage8bodyTextEv @ 60 NONAME
-	_ZNK16ConvergedMessage8isUnreadEv @ 61 NONAME
-	_ZNK16ConvergedMessage8locationEv @ 62 NONAME
-	_ZNK16ConvergedMessage8priorityEv @ 63 NONAME
-	_ZNK16ConvergedMessage9directionEv @ 64 NONAME
-	_ZNK16ConvergedMessage9serializeER11QDataStream @ 65 NONAME
-	_ZNK16ConvergedMessage9timeStampEv @ 66 NONAME
-	_ZNK18ConvergedMessageId5getIdEv @ 67 NONAME
-	_ZNK18ConvergedMessageId9serializeER11QDataStream @ 68 NONAME
-	_ZNK18ConvergedMessageIdeqERKS_ @ 69 NONAME
-	_ZNK23ConvergedMessageAddress5aliasEv @ 70 NONAME
-	_ZNK23ConvergedMessageAddress7addressEv @ 71 NONAME
-	_ZNK23ConvergedMessageAddress9serializeER11QDataStream @ 72 NONAME
-	_ZNK26ConvergedMessageAttachment14attachmentTypeEv @ 73 NONAME
-	_ZNK26ConvergedMessageAttachment8filePathEv @ 74 NONAME
-	_ZNK26ConvergedMessageAttachment9serializeER11QDataStream @ 75 NONAME
-	_ZNK26ConvergedMessageAttachmenteqERKS_ @ 76 NONAME
-	_ZN16ConvergedMessage17setMessageSubTypeENS_14MessageSubTypeE @ 77 NONAME
-	_ZNK16ConvergedMessage14messageSubTypeEv @ 78 NONAME
+	_ZN16ConvergedMessage12setReplyPathEb @ 9 NONAME
+	_ZN16ConvergedMessage12setTimeStampEx @ 10 NONAME
+	_ZN16ConvergedMessage14addAttachmentsER5QListIP26ConvergedMessageAttachmentE @ 11 NONAME
+	_ZN16ConvergedMessage14addCcRecipientER23ConvergedMessageAddress @ 12 NONAME
+	_ZN16ConvergedMessage14addToRecipientER23ConvergedMessageAddress @ 13 NONAME
+	_ZN16ConvergedMessage14setMessageTypeENS_11MessageTypeE @ 14 NONAME
+	_ZN16ConvergedMessage15addBccRecipientER23ConvergedMessageAddress @ 15 NONAME
+	_ZN16ConvergedMessage15addCcRecipientsER5QListIP23ConvergedMessageAddressE @ 16 NONAME
+	_ZN16ConvergedMessage15addToRecipientsER5QListIP23ConvergedMessageAddressE @ 17 NONAME
+	_ZN16ConvergedMessage15setSendingStateENS_12SendingStateE @ 18 NONAME
+	_ZN16ConvergedMessage16addBccRecipientsER5QListIP23ConvergedMessageAddressE @ 19 NONAME
+	_ZN16ConvergedMessage16addFromRecipientER23ConvergedMessageAddress @ 20 NONAME
+	_ZN16ConvergedMessage16setOriginatingSCERK7QString @ 21 NONAME
+	_ZN16ConvergedMessage17setMessageSubTypeENS_14MessageSubTypeE @ 22 NONAME
+	_ZN16ConvergedMessage9replyPathEv @ 23 NONAME
+	_ZN16ConvergedMessageC1ENS_11MessageTypeE @ 24 NONAME
+	_ZN16ConvergedMessageC1ERK18ConvergedMessageId @ 25 NONAME
+	_ZN16ConvergedMessageC1ERKS_ @ 26 NONAME
+	_ZN16ConvergedMessageC2ENS_11MessageTypeE @ 27 NONAME
+	_ZN16ConvergedMessageC2ERK18ConvergedMessageId @ 28 NONAME
+	_ZN16ConvergedMessageC2ERKS_ @ 29 NONAME
+	_ZN16ConvergedMessageD1Ev @ 30 NONAME
+	_ZN16ConvergedMessageD2Ev @ 31 NONAME
+	_ZN18ConvergedMessageId11deserializeER11QDataStream @ 32 NONAME
+	_ZN18ConvergedMessageId5setIdEi @ 33 NONAME
+	_ZN18ConvergedMessageIdC1ERKS_ @ 34 NONAME
+	_ZN18ConvergedMessageIdC1Ei @ 35 NONAME
+	_ZN18ConvergedMessageIdC2ERKS_ @ 36 NONAME
+	_ZN18ConvergedMessageIdC2Ei @ 37 NONAME
+	_ZN18ConvergedMessageIdaSERKS_ @ 38 NONAME
+	_ZN23ConvergedMessageAddress10setAddressERK7QString @ 39 NONAME
+	_ZN23ConvergedMessageAddress11deserializeER11QDataStream @ 40 NONAME
+	_ZN23ConvergedMessageAddress8setAliasERK7QString @ 41 NONAME
+	_ZN23ConvergedMessageAddressC1ERK7QStringS2_ @ 42 NONAME
+	_ZN23ConvergedMessageAddressC2ERK7QStringS2_ @ 43 NONAME
+	_ZN23ConvergedMessageAddressD1Ev @ 44 NONAME
+	_ZN23ConvergedMessageAddressD2Ev @ 45 NONAME
+	_ZN26ConvergedMessageAttachment11deserializeER11QDataStream @ 46 NONAME
+	_ZN26ConvergedMessageAttachment11setFilePathERK7QString @ 47 NONAME
+	_ZN26ConvergedMessageAttachment17setAttachmentTypeEi @ 48 NONAME
+	_ZN26ConvergedMessageAttachmentC1ERK7QStringi @ 49 NONAME
+	_ZN26ConvergedMessageAttachmentC2ERK7QStringi @ 50 NONAME
+	_ZN26ConvergedMessageAttachmentD1Ev @ 51 NONAME
+	_ZN26ConvergedMessageAttachmentD2Ev @ 52 NONAME
+	_ZNK16ConvergedMessage10propertiesEv @ 53 NONAME
+	_ZNK16ConvergedMessage11attachmentsEv @ 54 NONAME
+	_ZNK16ConvergedMessage11fromAddressEv @ 55 NONAME
+	_ZNK16ConvergedMessage11messageTypeEv @ 56 NONAME
+	_ZNK16ConvergedMessage12sendingStateEv @ 57 NONAME
+	_ZNK16ConvergedMessage13ccAddressListEv @ 58 NONAME
+	_ZNK16ConvergedMessage13hasAttachmentEv @ 59 NONAME
+	_ZNK16ConvergedMessage13originatingSCEv @ 60 NONAME
+	_ZNK16ConvergedMessage13toAddressListEv @ 61 NONAME
+	_ZNK16ConvergedMessage14bccAddressListEv @ 62 NONAME
+	_ZNK16ConvergedMessage14messageSubTypeEv @ 63 NONAME
+	_ZNK16ConvergedMessage2idEv @ 64 NONAME
+	_ZNK16ConvergedMessage7subjectEv @ 65 NONAME
+	_ZNK16ConvergedMessage8bodyTextEv @ 66 NONAME
+	_ZNK16ConvergedMessage8isUnreadEv @ 67 NONAME
+	_ZNK16ConvergedMessage8locationEv @ 68 NONAME
+	_ZNK16ConvergedMessage8priorityEv @ 69 NONAME
+	_ZNK16ConvergedMessage9directionEv @ 70 NONAME
+	_ZNK16ConvergedMessage9serializeER11QDataStream @ 71 NONAME
+	_ZNK16ConvergedMessage9timeStampEv @ 72 NONAME
+	_ZNK18ConvergedMessageId5getIdEv @ 73 NONAME
+	_ZNK18ConvergedMessageId9serializeER11QDataStream @ 74 NONAME
+	_ZNK18ConvergedMessageIdeqERKS_ @ 75 NONAME
+	_ZNK23ConvergedMessageAddress5aliasEv @ 76 NONAME
+	_ZNK23ConvergedMessageAddress7addressEv @ 77 NONAME
+	_ZNK23ConvergedMessageAddress9serializeER11QDataStream @ 78 NONAME
+	_ZNK26ConvergedMessageAttachment14attachmentTypeEv @ 79 NONAME
+	_ZNK26ConvergedMessageAttachment8filePathEv @ 80 NONAME
+	_ZNK26ConvergedMessageAttachment9serializeER11QDataStream @ 81 NONAME
+	_ZNK26ConvergedMessageAttachmenteqERKS_ @ 82 NONAME