--- a/emailservices/nmutilities/eabi/nmutilitiesu.def	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/nmutilities/eabi/nmutilitiesu.def	Thu Sep 30 11:43:07 2010 +0300
@@ -1,27 +1,27 @@
 EXPORTS
-	_ZN16EmailMailboxInfoC1Ev @ 1 NONAME
-	_ZN16EmailMailboxInfoC2Ev @ 2 NONAME
-	_ZN16EmailMailboxInfoD1Ev @ 3 NONAME
-	_ZN16EmailMailboxInfoD2Ev @ 4 NONAME
-	_ZN18NmUiEventsNotifier11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
-	_ZN18NmUiEventsNotifier11qt_metacastEPKc @ 6 NONAME
-	_ZN18NmUiEventsNotifier12valueChangedERK13XQSettingsKeyRK8QVariant @ 7 NONAME
-	_ZN18NmUiEventsNotifier16staticMetaObjectE @ 8 NONAME DATA 16
-	_ZN18NmUiEventsNotifier16viewStateChangedENS_13NmUiEventTypeE10NmUiViewId4NmId @ 9 NONAME
-	_ZN18NmUiEventsNotifier19getStaticMetaObjectEv @ 10 NONAME
-	_ZN18NmUiEventsNotifier22notifyViewStateChangedENS_13NmUiEventTypeE10NmUiViewIdRK4NmId @ 11 NONAME
-	_ZN18NmUiEventsNotifierC1EP7QObject @ 12 NONAME
-	_ZN18NmUiEventsNotifierC2EP7QObject @ 13 NONAME
-	_ZN18NmUiEventsNotifierD0Ev @ 14 NONAME
-	_ZN18NmUiEventsNotifierD1Ev @ 15 NONAME
-	_ZN18NmUiEventsNotifierD2Ev @ 16 NONAME
-	_ZNK16EmailMailboxInfo11mailboxIconERK8QVariant @ 17 NONAME
-	_ZNK16EmailMailboxInfo11mailboxNameERK8QVariant @ 18 NONAME
-	_ZNK18NmUiEventsNotifier10metaObjectEv @ 19 NONAME
-	_ZNK18NmUiEventsNotifier13parseKeyValueERK10QByteArrayRNS_13NmUiEventTypeER10NmUiViewIdR4NmId @ 20 NONAME
-	_ZNK18NmUiEventsNotifier9keysEqualERK13XQSettingsKeyRK32XQPublishAndSubscribeSettingsKey @ 21 NONAME
-	_ZTI18NmUiEventsNotifier @ 22 NONAME
-	_ZTV18NmUiEventsNotifier @ 23 NONAME
+	_ZN11NmUriParser11extractDataERK7QString @ 1 NONAME
+	_ZN11NmUriParser18addAddressesToListER7QStringR11QStringList @ 2 NONAME
+	_ZN11NmUriParser9resetDataEv @ 3 NONAME
+	_ZN11NmUriParserC1Ev @ 4 NONAME
+	_ZN11NmUriParserC2Ev @ 5 NONAME
+	_ZN11NmUriParserD1Ev @ 6 NONAME
+	_ZN11NmUriParserD2Ev @ 7 NONAME
+	_ZN16EmailMailboxInfoC1Ev @ 8 NONAME
+	_ZN16EmailMailboxInfoC2Ev @ 9 NONAME
+	_ZN16EmailMailboxInfoD1Ev @ 10 NONAME
+	_ZN16EmailMailboxInfoD2Ev @ 11 NONAME
+	_ZN18NmUiEventsNotifier11qt_metacallEN11QMetaObject4CallEiPPv @ 12 NONAME
+	_ZN18NmUiEventsNotifier11qt_metacastEPKc @ 13 NONAME
+	_ZN18NmUiEventsNotifier12valueChangedERK13XQSettingsKeyRK8QVariant @ 14 NONAME
+	_ZN18NmUiEventsNotifier16staticMetaObjectE @ 15 NONAME DATA 16
+	_ZN18NmUiEventsNotifier16viewStateChangedENS_13NmUiEventTypeE10NmUiViewId4NmId @ 16 NONAME
+	_ZN18NmUiEventsNotifier19getStaticMetaObjectEv @ 17 NONAME
+	_ZN18NmUiEventsNotifier22notifyViewStateChangedENS_13NmUiEventTypeE10NmUiViewIdRK4NmId @ 18 NONAME
+	_ZN18NmUiEventsNotifierC1EP7QObject @ 19 NONAME
+	_ZN18NmUiEventsNotifierC2EP7QObject @ 20 NONAME
+	_ZN18NmUiEventsNotifierD0Ev @ 21 NONAME
+	_ZN18NmUiEventsNotifierD1Ev @ 22 NONAME
+	_ZN18NmUiEventsNotifierD2Ev @ 23 NONAME
 	_ZN21NmContactHistoryModel11qt_metacallEN11QMetaObject4CallEiPPv @ 24 NONAME
 	_ZN21NmContactHistoryModel11qt_metacastEPKc @ 25 NONAME
 	_ZN21NmContactHistoryModel14modelCompletedEi @ 26 NONAME
@@ -40,34 +40,52 @@
 	_ZN25NmContactHistoryModelItemC1Ev @ 39 NONAME
 	_ZN25NmContactHistoryModelItemC2ERKS_ @ 40 NONAME
 	_ZN25NmContactHistoryModelItemC2Ev @ 41 NONAME
-	_ZN25NmContactHistoryModelItemD1Ev @ 42 NONAME
-	_ZN25NmContactHistoryModelItemD2Ev @ 43 NONAME
-	_ZN8EmailMRU10entryIndexEi @ 44 NONAME
-	_ZN8EmailMRU10readCenRepEi @ 45 NONAME
-	_ZN8EmailMRU10writeEntryEi7QStringS0_ @ 46 NONAME
-	_ZN8EmailMRU11updateEntryEi7QString @ 47 NONAME
-	_ZN8EmailMRU11writeCenRepEi7QString @ 48 NONAME
-	_ZN8EmailMRU16searchForAddressE7QString @ 49 NONAME
-	_ZN8EmailMRU17getNextEntryIndexEv @ 50 NONAME
-	_ZN8EmailMRU19nameKeyByEntryIndexEi @ 51 NONAME
-	_ZN8EmailMRU22addressKeyByEntryIndexEi @ 52 NONAME
-	_ZN8EmailMRU5resetEv @ 53 NONAME
-	_ZN8EmailMRU8getEntryEiR7QStringS1_ @ 54 NONAME
-	_ZN8EmailMRU9moveEntryEii @ 55 NONAME
-	_ZN8EmailMRU9nameOrderEv @ 56 NONAME
-	_ZN8EmailMRU9updateMRUE7QStringS0_ @ 57 NONAME
-	_ZN8EmailMRUC1Ev @ 58 NONAME
-	_ZN8EmailMRUC2Ev @ 59 NONAME
-	_ZN8EmailMRUD1Ev @ 60 NONAME
-	_ZN8EmailMRUD2Ev @ 61 NONAME
-	_ZNK21NmContactHistoryModel10metaObjectEv @ 62 NONAME
-	_ZNK21NmContactHistoryModel4dataERK11QModelIndexi @ 63 NONAME
-	_ZNK21NmContactHistoryModel8rowCountERK11QModelIndex @ 64 NONAME
-	_ZNK25NmContactHistoryModelItem10subEntriesEv @ 65 NONAME
-	_ZNK25NmContactHistoryModelItem12subItemCountEv @ 66 NONAME
-	_ZNK25NmContactHistoryModelItem9contactIdEv @ 67 NONAME
-	_ZNK25NmContactHistoryModelItem9subItemAtEi @ 68 NONAME
-	_ZNK8EmailMRU10entryCountEv @ 69 NONAME
-	_ZTI21NmContactHistoryModel @ 70 NONAME
-	_ZTV21NmContactHistoryModel @ 71 NONAME
+	_ZN25NmContactHistoryModelItemD0Ev @ 42 NONAME
+	_ZN25NmContactHistoryModelItemD1Ev @ 43 NONAME
+	_ZN25NmContactHistoryModelItemD2Ev @ 44 NONAME
+	_ZN8EmailMRU10entryIndexEi @ 45 NONAME
+	_ZN8EmailMRU10readCenRepEi @ 46 NONAME
+	_ZN8EmailMRU10writeEntryEi7QStringS0_ @ 47 NONAME
+	_ZN8EmailMRU11updateEntryEi7QString @ 48 NONAME
+	_ZN8EmailMRU11writeCenRepEi7QString @ 49 NONAME
+	_ZN8EmailMRU16searchForAddressE7QString @ 50 NONAME
+	_ZN8EmailMRU17getNextEntryIndexEv @ 51 NONAME
+	_ZN8EmailMRU19nameKeyByEntryIndexEi @ 52 NONAME
+	_ZN8EmailMRU22addressKeyByEntryIndexEi @ 53 NONAME
+	_ZN8EmailMRU5resetEv @ 54 NONAME
+	_ZN8EmailMRU8getEntryEiR7QStringS1_ @ 55 NONAME
+	_ZN8EmailMRU9moveEntryEii @ 56 NONAME
+	_ZN8EmailMRU9nameOrderEv @ 57 NONAME
+	_ZN8EmailMRU9updateMRUE7QStringS0_ @ 58 NONAME
+	_ZN8EmailMRUC1Ev @ 59 NONAME
+	_ZN8EmailMRUC2Ev @ 60 NONAME
+	_ZN8EmailMRUD0Ev @ 61 NONAME
+	_ZN8EmailMRUD1Ev @ 62 NONAME
+	_ZN8EmailMRUD2Ev @ 63 NONAME
+	_ZNK11NmUriParser11ccAddressesEv @ 64 NONAME
+	_ZNK11NmUriParser11toAddressesEv @ 65 NONAME
+	_ZNK11NmUriParser12bccAddressesEv @ 66 NONAME
+	_ZNK11NmUriParser7subjectEv @ 67 NONAME
+	_ZNK11NmUriParser8bodyTextEv @ 68 NONAME
+	_ZNK16EmailMailboxInfo11mailboxIconERK7QString @ 69 NONAME
+	_ZNK16EmailMailboxInfo11mailboxNameERK7QString @ 70 NONAME
+	_ZNK18NmUiEventsNotifier10metaObjectEv @ 71 NONAME
+	_ZNK18NmUiEventsNotifier13parseKeyValueERK10QByteArrayRNS_13NmUiEventTypeER10NmUiViewIdR4NmId @ 72 NONAME
+	_ZNK18NmUiEventsNotifier9keysEqualERK13XQSettingsKeyRK32XQPublishAndSubscribeSettingsKey @ 73 NONAME
+	_ZNK21NmContactHistoryModel10metaObjectEv @ 74 NONAME
+	_ZNK21NmContactHistoryModel4dataERK11QModelIndexi @ 75 NONAME
+	_ZNK21NmContactHistoryModel8rowCountERK11QModelIndex @ 76 NONAME
+	_ZNK25NmContactHistoryModelItem10subEntriesEv @ 77 NONAME
+	_ZNK25NmContactHistoryModelItem12subItemCountEv @ 78 NONAME
+	_ZNK25NmContactHistoryModelItem9contactIdEv @ 79 NONAME
+	_ZNK25NmContactHistoryModelItem9subItemAtEi @ 80 NONAME
+	_ZNK8EmailMRU10entryCountEv @ 81 NONAME
+	_ZTI18NmUiEventsNotifier @ 82 NONAME
+	_ZTI21NmContactHistoryModel @ 83 NONAME
+	_ZTI25NmContactHistoryModelItem @ 84 NONAME
+	_ZTI8EmailMRU @ 85 NONAME
+	_ZTV18NmUiEventsNotifier @ 86 NONAME
+	_ZTV21NmContactHistoryModel @ 87 NONAME
+	_ZTV25NmContactHistoryModelItem @ 88 NONAME
+	_ZTV8EmailMRU @ 89 NONAME