--- a/qtmobility/tests/auto/qmessage/tst_qmessage.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qmessage/tst_qmessage.cpp	Mon May 03 13:18:40 2010 +0300
@@ -109,6 +109,7 @@
     void testMessageAddress_data();
     void testMessageAddress();
     void testHeaderFields();
+    void testStandardFolder();
 
 private:
     QMessageAccountId testAccountId;
@@ -200,7 +201,7 @@
     QCOMPARE(msg.from() != QMessageAddress(), true);
     QCOMPARE(msg.isModified(), true);
 
-    addr = QMessageAddress(QMessageAddress::Xmpp, "bob@example.org");
+    addr = QMessageAddress(QMessageAddress::InstantMessage, "bob@example.org");
     msg.setFrom(addr);
     QCOMPARE(msg.from(), addr);
     QCOMPARE(msg.from() != QMessageAddress(), true);
@@ -310,7 +311,7 @@
     QCOMPARE(msg.isModified(), true);
 
     addresses = QMessageAddressList();
-    addresses.append(QMessageAddress(QMessageAddress::Xmpp, "charlie@example.org"));
+    addresses.append(QMessageAddress(QMessageAddress::InstantMessage, "charlie@example.org"));
     msg.setBcc(addresses);
     QCOMPARE(msg.bcc(), addresses);
 }
@@ -456,3 +457,8 @@
     QCOMPARE(msg.headerFieldValue("X-None").isEmpty(), true);
 }
 
+void tst_QMessage::testStandardFolder()
+{
+    QMessage msg;
+    QCOMPARE(msg.standardFolder(), QMessage::DraftsFolder);
+}