--- a/qtmobility/src/messaging/qmessageservice_win.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_win.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -856,6 +856,14 @@
         return false;
     }
 
+	if(!id.isValid())
+	{
+		qWarning() << "Invalid QMessageId";
+		d_ptr->_error = QMessageManager::InvalidId;
+		d_ptr->setFinished(true);
+		return false;
+	}
+
     d_ptr->_error = QMessageManager::NoError;
     d_ptr->setFinished(true);
 
@@ -864,7 +872,6 @@
 
 bool QMessageService::retrieveBody(const QMessageId& id)
 {
-
     if(d_ptr->_active) {
         qWarning() << "Service is currently busy";
         return false;