--- a/qtmobility/tests/auto/support/support_symbian.cpp	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/tests/auto/support/support_symbian.cpp	Thu May 27 13:42:11 2010 +0300
@@ -45,6 +45,7 @@
 #include <qmessageid.h>
 #include <qmessagemanager.h>
 #include <qmessage_symbian_p.h>
+#include <messagingutil_p.h>
 
 #include <QDebug>
 
@@ -94,6 +95,9 @@
 }
 
 QTM_BEGIN_NAMESPACE
+
+using namespace MessagingUtil;
+
 class MapiSession
 {
 public:
@@ -338,7 +342,7 @@
     CleanupStack::PopAndDestroy(pImIAPPreferences);
     CleanupStack::PopAndDestroy(pEmailAccounts);
 
-    return QMessageAccountId(QString::number(popAccount.iPopService));
+    return QMessageAccountId(addIdPrefix(QString::number(popAccount.iPopService)));
 }
 
 QMessageAccountId createPopAndSmtpAccount(const TDesC& accountName, const TDesC& fromAddress)
@@ -461,7 +465,7 @@
     CleanupStack::PopAndDestroy(pImIAPPreferences);
     CleanupStack::PopAndDestroy(pEmailAccounts);
 
-    return QMessageAccountId(QString::number(imapAccount.iImapService));
+    return QMessageAccountId(addIdPrefix(QString::number(imapAccount.iImapService)));
 }
 
 QMessageAccountId createImapAndSmtpAccount(const TDesC& accountName, const TDesC& fromAddress)
@@ -516,7 +520,7 @@
     serviceEntryIdString = nullString.left(8-serviceEntryIdString.length()) + serviceEntryIdString;
     QString folderIdString = QString::number(folderId);
     folderIdString = nullString.left(8-folderIdString.length()) + folderIdString;
-    return serviceEntryIdString+folderIdString;
+    return addIdPrefix(serviceEntryIdString+folderIdString);
 }
 
 QMessageFolderId addFolder(const Parameters &params)