diff -r cfcbf08528c4 -r 2b40d63a9c3d qtmobility/src/messaging/qmessageid_qmf.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/messaging/qmessageid_qmf.cpp	Fri Apr 16 15:51:22 2010 +0300
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qmessageid.h"
+#include "qmfhelpers_p.h"
+
+#include <qmailid.h>
+
+
+QTM_BEGIN_NAMESPACE
+
+class QMessageIdPrivate
+{
+public:
+    QMailMessageId _id;
+};
+
+QMessageId::QMessageId()
+    : d_ptr(0)
+{
+}
+
+QMessageId::QMessageId(const QMessageId& other)
+    : d_ptr(0)
+{
+    this->operator=(other);
+}
+
+QMessageId::QMessageId(const QString& id)
+    : d_ptr(0)
+{
+    QMailMessageId mid(id.toULongLong());
+    if (mid.isValid()) {
+        d_ptr = new QMessageIdPrivate;
+        d_ptr->_id = mid;
+    }
+}
+
+QMessageId::~QMessageId()
+{
+    delete d_ptr;
+}
+
+QMessageId& QMessageId::operator=(const QMessageId& other)
+{
+    if (&other != this) {
+        if (other.isValid()) {
+            if (!d_ptr) {
+                d_ptr = new QMessageIdPrivate;
+            }
+            d_ptr->_id = other.d_ptr->_id;
+        } else {
+            delete d_ptr;
+            d_ptr = 0;
+        }
+    }
+
+    return *this;
+}
+
+bool QMessageId::operator==(const QMessageId& other) const
+{
+    if (isValid()) {
+        return (other.isValid() ? (d_ptr->_id == other.d_ptr->_id) : false);
+    } else {
+        return !other.isValid();
+    }
+}
+
+bool QMessageId::operator<(const QMessageId& other) const
+{
+    if (isValid() && other.isValid())
+        return (d_ptr->_id < other.d_ptr->_id);
+
+    if (isValid()) {
+        return false; // other is invalid, valid > invalid
+    } else if (other.isValid()) {
+        return true; // invalid < valid
+    }
+    return false; // both invalid
+}
+
+QString QMessageId::toString() const
+{
+    return (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+}
+
+bool QMessageId::isValid() const
+{
+    return (d_ptr && d_ptr->_id.isValid());
+}
+
+uint qHash(const QMessageId &id)
+{
+    return qHash(QmfHelpers::convert(id));
+}
+
+
+QTM_END_NAMESPACE