--- a/qtmobility/src/messaging/qmessagecontentcontainer_maemo_p.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_maemo_p.h	Mon May 03 13:18:40 2010 +0300
@@ -72,13 +72,13 @@
     QList<QMessageContentContainer> _attachments;
     QMultiMap<QByteArray, QString>  _header;
     
-    long int _containingMessageId;
-    unsigned int _attachmentId;
+    QString _containingMessageId;
+    QString _attachmentId;
     
     QMessageContentContainerPrivate(QMessageContentContainer *contentContainer)
             :
             q_ptr(contentContainer), _message(0), _available(false), _size(0),
-            _containingMessageId(0), _attachmentId(0)
+            _attachmentId(0)
 
     {
     }
@@ -124,7 +124,7 @@
     
     static QByteArray attachmentFilename(const QMessageContentContainer& container);
     
-    static QMessageContentContainer from(long int messageId, unsigned int attachmentId, QByteArray &name,
+    static QMessageContentContainer from(QString &messageId, QString &attachmentId, QByteArray &name,
                                          QByteArray &mimeType, QByteArray &mimeSubType, int size);
     
     static QMessageContentContainerPrivate* implementation(const QMessageContentContainer &container);