diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/messaging/qmessageid_win.cpp --- a/qtmobility/src/messaging/qmessageid_win.cpp Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/messaging/qmessageid_win.cpp Fri May 14 16:41:33 2010 +0300 @@ -180,7 +180,7 @@ QMessageId::QMessageId(const QString& id) : d_ptr(new QMessageIdPrivate(this)) { - QDataStream idStream(QByteArray::fromBase64(id.toLatin1())); + QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1())); #ifdef _WIN32_WCE idStream >> d_ptr->_entryId; @@ -290,7 +290,7 @@ encodedIdStream << d_ptr->_folderRecordKey; encodedIdStream << d_ptr->_storeRecordKey; - return encodedId.toBase64(); + return WinHelpers::addIdPrefix(encodedId.toBase64()); } bool QMessageId::isValid() const