Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging:
  Fix to crash

1 files changed, 11 insertions, 0 deletions

diff --git a/src/messaging/qfsengine_symbian.cpp b/src/messaging/qfsengine_symbian.cpp
index f5517ff3cb..66eb25e358 100644
--- a/src/messaging/qfsengine_symbian.cpp
+++ b/src/messaging/qfsengine_symbian.cpp
@@ -2564,6 +2564,17 @@ void CFSEngine::retrieveMessageContentHeaders(QMessage& message) const
 {
     MessageCache::instance()->lock();
     QMessage* msgPtr = MessageCache::instance()->messageObject(message.id().toString());
+    if (msgPtr == NULL) {
+        MessageCache::instance()->unlock();
+        msgPtr = new QMessage();
+        if (this->message(msgPtr, message.id())) {
+            MessageCache::instance()->insertObject(msgPtr);
+        } else {
+            delete msgPtr;
+            return; // Just giving up. Should we throw std::bad_alloc here?
+        }
+        MessageCache::instance()->lock();
+    }
 
     QMessageContentContainerPrivate* pContainer = QMessagePrivate::containerImplementation(*msgPtr);
     pContainer->_contentRetrieved = true;