--- a/qtmobility/tests/auto/support/support_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/tests/auto/support/support_symbian.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -342,7 +342,7 @@
     CleanupStack::PopAndDestroy(pImIAPPreferences);
     CleanupStack::PopAndDestroy(pEmailAccounts);
 
-    return QMessageAccountId(addIdPrefix(QString::number(popAccount.iPopService)));
+    return QMessageAccountId(addIdPrefix(QString::number(popAccount.iPopService), SymbianHelpers::EngineTypeMTM));
 }
 
 QMessageAccountId createPopAndSmtpAccount(const TDesC& accountName, const TDesC& fromAddress)
@@ -458,14 +458,20 @@
     pImSmtpSettings->SetReplyToAddressL(fromAddress);
     pImSmtpSettings->SetReceiptAddressL(fromAddress);
     pImSmtpSettings->SetPort(25);
-    pEmailAccounts->CreateSmtpAccountL(imapAccount, *pImSmtpSettings, *pImIAPPreferences, EFalse);
+    TSmtpAccount smtpAccount = pEmailAccounts->CreateSmtpAccountL(imapAccount, *pImSmtpSettings, *pImIAPPreferences, EFalse);
+    
+    TSmtpAccount defaultAccount;
+    if (pEmailAccounts->DefaultSmtpAccountL(defaultAccount) == KErrNotFound)
+        {
+        pEmailAccounts->SetDefaultSmtpAccountL(smtpAccount);
+        }
 
     CleanupStack::PopAndDestroy(pImSmtpSettings);
     CleanupStack::PopAndDestroy(pImap4Settings);
     CleanupStack::PopAndDestroy(pImIAPPreferences);
     CleanupStack::PopAndDestroy(pEmailAccounts);
 
-    return QMessageAccountId(addIdPrefix(QString::number(imapAccount.iImapService)));
+    return QMessageAccountId(addIdPrefix(QString::number(imapAccount.iImapService), SymbianHelpers::EngineTypeMTM));
 }
 
 QMessageAccountId createImapAndSmtpAccount(const TDesC& accountName, const TDesC& fromAddress)
@@ -520,7 +526,7 @@
     serviceEntryIdString = nullString.left(8-serviceEntryIdString.length()) + serviceEntryIdString;
     QString folderIdString = QString::number(folderId);
     folderIdString = nullString.left(8-folderIdString.length()) + folderIdString;
-    return addIdPrefix(serviceEntryIdString+folderIdString);
+    return addIdPrefix(serviceEntryIdString+folderIdString, SymbianHelpers::EngineTypeMTM);
 }
 
 QMessageFolderId addFolder(const Parameters &params)