--- a/qtmobility/src/messaging/qmessageaccountid_win.cpp	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_win.cpp	Thu May 27 13:42:11 2010 +0300
@@ -42,6 +42,7 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <MAPIUtil.h>
+#include <messagingutil_p.h>
 
 QTM_BEGIN_NAMESPACE
 
@@ -90,7 +91,7 @@
 QMessageAccountId::QMessageAccountId(const QString& id)
     : d_ptr(new QMessageAccountIdPrivate(this))
 {
-	QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1()));
+    QDataStream idStream(QByteArray::fromBase64(MessagingUtil::stripIdPrefix(id).toLatin1()));
     idStream >> d_ptr->_storeRecordKey;
 }
 
@@ -128,13 +129,13 @@
 QString QMessageAccountId::toString() const
 {
     if (!isValid())
-        return QString();
+        return MessagingUtil::addIdPrefix(QString());
 
     QByteArray encodedId;
     QDataStream encodedIdStream(&encodedId, QIODevice::WriteOnly);
     encodedIdStream << d_ptr->_storeRecordKey;
 
-	return WinHelpers::addIdPrefix(encodedId.toBase64());
+    return MessagingUtil::addIdPrefix(encodedId.toBase64());
 }
 
 bool QMessageAccountId::isValid() const