diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/messaging/qmessageaccountid_win.cpp --- a/qtmobility/src/messaging/qmessageaccountid_win.cpp Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/messaging/qmessageaccountid_win.cpp Fri May 14 16:41:33 2010 +0300 @@ -90,7 +90,7 @@ QMessageAccountId::QMessageAccountId(const QString& id) : d_ptr(new QMessageAccountIdPrivate(this)) { - QDataStream idStream(QByteArray::fromBase64(id.toLatin1())); + QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1())); idStream >> d_ptr->_storeRecordKey; } @@ -134,7 +134,7 @@ QDataStream encodedIdStream(&encodedId, QIODevice::WriteOnly); encodedIdStream << d_ptr->_storeRecordKey; - return encodedId.toBase64(); + return WinHelpers::addIdPrefix(encodedId.toBase64()); } bool QMessageAccountId::isValid() const