--- a/qtmobility/src/messaging/qmessage_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -97,7 +97,7 @@
         }
     }
 
-    return QMessage::DraftsFolder;
+    return QMessage::InboxFolder;
 }
 
 QMessage QMessagePrivate::convert(const QMailMessage &message)
@@ -294,6 +294,8 @@
 
 QMessage::StandardFolder QMessage::standardFolder() const
 {
+    if (!d_ptr->_message.parentFolderId().isValid())
+        return QMessage::DraftsFolder;
     return QMessagePrivate::standardFolder(convert(d_ptr->_message.parentFolderId()));
 }