diff -r 518b245aa84c -r 4e4b6adb1024 messagingapp/msgui/eabi/unifiededitoru.def
--- a/messagingapp/msgui/eabi/unifiededitoru.def	Fri Jun 25 15:47:40 2010 +0530
+++ b/messagingapp/msgui/eabi/unifiededitoru.def	Tue Jun 29 23:42:47 2010 +0530
@@ -24,45 +24,46 @@
 	_ZN20MsgUnifiedEditorView14changePriorityEv @ 23 NONAME
 	_ZN20MsgUnifiedEditorView14forwardMessageER18ConvergedMessageIdN16ConvergedMessage11MessageTypeE @ 24 NONAME
 	_ZN20MsgUnifiedEditorView15contactsFetchedERK8QVariant @ 25 NONAME
-	_ZN20MsgUnifiedEditorView15populateContentERK5QListI8QVariantE @ 26 NONAME
-	_ZN20MsgUnifiedEditorView16createTempFolderEv @ 27 NONAME
-	_ZN20MsgUnifiedEditorView16enableSendButtonEb @ 28 NONAME
-	_ZN20MsgUnifiedEditorView16generateFileNameER7QString @ 29 NONAME
-	_ZN20MsgUnifiedEditorView16onContentChangedEv @ 30 NONAME
-	_ZN20MsgUnifiedEditorView16removeTempFolderEv @ 31 NONAME
-	_ZN20MsgUnifiedEditorView16staticMetaObjectE @ 32 NONAME DATA 16
-	_ZN20MsgUnifiedEditorView17onDialogDeleteMsgEP8HbAction @ 33 NONAME
-	_ZN20MsgUnifiedEditorView17openDraftsMessageERK5QListI8QVariantE @ 34 NONAME
-	_ZN20MsgUnifiedEditorView19getStaticMetaObjectEv @ 35 NONAME
-	_ZN20MsgUnifiedEditorView19onDialogMmsSettingsEP8HbAction @ 36 NONAME
-	_ZN20MsgUnifiedEditorView19onDialogSmsSettingsEP8HbAction @ 37 NONAME
-	_ZN20MsgUnifiedEditorView19saveContentToDraftsEv @ 38 NONAME
-	_ZN20MsgUnifiedEditorView19serviceRequestErrorEiRK7QString @ 39 NONAME
-	_ZN20MsgUnifiedEditorView20activateInputBlockerEv @ 40 NONAME
-	_ZN20MsgUnifiedEditorView21doDelayedConstructionEv @ 41 NONAME
-	_ZN20MsgUnifiedEditorView22deactivateInputBlockerEv @ 42 NONAME
-	_ZN20MsgUnifiedEditorView22setAttachOptionEnabledENS_16TBE_AttachOptionEb @ 43 NONAME
-	_ZN20MsgUnifiedEditorView23handleViewExtnActivatedEP16HbListWidgetItem @ 44 NONAME
-	_ZN20MsgUnifiedEditorView25populateContentIntoEditorERK16ConvergedMessageb @ 45 NONAME
-	_ZN20MsgUnifiedEditorView25removeAttachmentContainerEv @ 46 NONAME
-	_ZN20MsgUnifiedEditorView25updateOtherRecipientCountEb @ 47 NONAME
-	_ZN20MsgUnifiedEditorView4sendEv @ 48 NONAME
-	_ZN20MsgUnifiedEditorView7addMenuEv @ 49 NONAME
-	_ZN20MsgUnifiedEditorView8addCcBccEv @ 50 NONAME
-	_ZN20MsgUnifiedEditorView8initViewEv @ 51 NONAME
-	_ZN20MsgUnifiedEditorView8setFocusEP26MsgUnifiedEditorBaseWidget @ 52 NONAME
-	_ZN20MsgUnifiedEditorView9vkbClosedEv @ 53 NONAME
-	_ZN20MsgUnifiedEditorView9vkbOpenedEv @ 54 NONAME
-	_ZN20MsgUnifiedEditorViewC1EP13QGraphicsItem @ 55 NONAME
-	_ZN20MsgUnifiedEditorViewC2EP13QGraphicsItem @ 56 NONAME
-	_ZN20MsgUnifiedEditorViewD0Ev @ 57 NONAME
-	_ZN20MsgUnifiedEditorViewD1Ev @ 58 NONAME
-	_ZN20MsgUnifiedEditorViewD2Ev @ 59 NONAME
-	_ZNK20MsgUnifiedEditorView10metaObjectEv @ 60 NONAME
-	_ZTI20MsgUnifiedEditorView @ 61 NONAME
-	_ZTV20MsgUnifiedEditorView @ 62 NONAME
-	_ZThn16_N20MsgUnifiedEditorViewD0Ev @ 63 NONAME
-	_ZThn16_N20MsgUnifiedEditorViewD1Ev @ 64 NONAME
-	_ZThn8_N20MsgUnifiedEditorViewD0Ev @ 65 NONAME
-	_ZThn8_N20MsgUnifiedEditorViewD1Ev @ 66 NONAME
+	_ZN20MsgUnifiedEditorView15formatAddressesER5QListIP23ConvergedMessageAddressE @ 26 NONAME
+	_ZN20MsgUnifiedEditorView15populateContentERK5QListI8QVariantE @ 27 NONAME
+	_ZN20MsgUnifiedEditorView16createTempFolderEv @ 28 NONAME
+	_ZN20MsgUnifiedEditorView16enableSendButtonEb @ 29 NONAME
+	_ZN20MsgUnifiedEditorView16generateFileNameER7QString @ 30 NONAME
+	_ZN20MsgUnifiedEditorView16onContentChangedEv @ 31 NONAME
+	_ZN20MsgUnifiedEditorView16removeTempFolderEv @ 32 NONAME
+	_ZN20MsgUnifiedEditorView16staticMetaObjectE @ 33 NONAME DATA 16
+	_ZN20MsgUnifiedEditorView17onDialogDeleteMsgEP8HbAction @ 34 NONAME
+	_ZN20MsgUnifiedEditorView17openDraftsMessageERK5QListI8QVariantE @ 35 NONAME
+	_ZN20MsgUnifiedEditorView19getStaticMetaObjectEv @ 36 NONAME
+	_ZN20MsgUnifiedEditorView19onDialogMmsSettingsEP8HbAction @ 37 NONAME
+	_ZN20MsgUnifiedEditorView19onDialogSmsSettingsEP8HbAction @ 38 NONAME
+	_ZN20MsgUnifiedEditorView19saveContentToDraftsEv @ 39 NONAME
+	_ZN20MsgUnifiedEditorView19serviceRequestErrorEiRK7QString @ 40 NONAME
+	_ZN20MsgUnifiedEditorView20activateInputBlockerEv @ 41 NONAME
+	_ZN20MsgUnifiedEditorView21doDelayedConstructionEv @ 42 NONAME
+	_ZN20MsgUnifiedEditorView22deactivateInputBlockerEv @ 43 NONAME
+	_ZN20MsgUnifiedEditorView22setAttachOptionEnabledENS_16TBE_AttachOptionEb @ 44 NONAME
+	_ZN20MsgUnifiedEditorView23handleViewExtnActivatedEP16HbListWidgetItem @ 45 NONAME
+	_ZN20MsgUnifiedEditorView25populateContentIntoEditorERK16ConvergedMessageb @ 46 NONAME
+	_ZN20MsgUnifiedEditorView25removeAttachmentContainerEv @ 47 NONAME
+	_ZN20MsgUnifiedEditorView25updateOtherRecipientCountEb @ 48 NONAME
+	_ZN20MsgUnifiedEditorView4sendEv @ 49 NONAME
+	_ZN20MsgUnifiedEditorView7addMenuEv @ 50 NONAME
+	_ZN20MsgUnifiedEditorView8addCcBccEv @ 51 NONAME
+	_ZN20MsgUnifiedEditorView8initViewEv @ 52 NONAME
+	_ZN20MsgUnifiedEditorView8setFocusEP26MsgUnifiedEditorBaseWidget @ 53 NONAME
+	_ZN20MsgUnifiedEditorView9vkbClosedEv @ 54 NONAME
+	_ZN20MsgUnifiedEditorView9vkbOpenedEv @ 55 NONAME
+	_ZN20MsgUnifiedEditorViewC1EP13QGraphicsItem @ 56 NONAME
+	_ZN20MsgUnifiedEditorViewC2EP13QGraphicsItem @ 57 NONAME
+	_ZN20MsgUnifiedEditorViewD0Ev @ 58 NONAME
+	_ZN20MsgUnifiedEditorViewD1Ev @ 59 NONAME
+	_ZN20MsgUnifiedEditorViewD2Ev @ 60 NONAME
+	_ZNK20MsgUnifiedEditorView10metaObjectEv @ 61 NONAME
+	_ZTI20MsgUnifiedEditorView @ 62 NONAME
+	_ZTV20MsgUnifiedEditorView @ 63 NONAME
+	_ZThn16_N20MsgUnifiedEditorViewD0Ev @ 64 NONAME
+	_ZThn16_N20MsgUnifiedEditorViewD1Ev @ 65 NONAME
+	_ZThn8_N20MsgUnifiedEditorViewD0Ev @ 66 NONAME
+	_ZThn8_N20MsgUnifiedEditorViewD1Ev @ 67 NONAME