diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/messaging/qmessagemanager.cpp
--- a/qtmobility/src/messaging/qmessagemanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagemanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -179,6 +179,9 @@
     ids in the list returned.
     \a offset specifies how many ids to skip at the beginning of the list returned.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset) const
@@ -198,6 +201,9 @@
     ids in the list returned.
     \a offset specifies how many ids to skip at the beginning of the list returned.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const
@@ -227,6 +233,9 @@
     \a offset specifies how many ids to skip at the beginning of the list returned.
     \a matchFlags specifies the matching method to use.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QMessageSortOrder &sortOrder, uint limit, uint offset) const
@@ -248,6 +257,9 @@
     \a offset specifies how many ids to skip at the beginning of the list returned.
     \a matchFlags specifies the matching method to use.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const
@@ -360,6 +372,9 @@
     in QMessageFilter \a filter. If \a filter is empty the count of all 
     available messages is returned.
     
+    The performance of counting messages is currently significantly less than optimal 
+    for some filters on some platforms.
+    
     \sa error(), queryMessages()
 */
 int QMessageManager::countMessages(const QMessageFilter& filter) const
@@ -462,7 +477,12 @@
     
     To ensure the change is propagated to any affected external server
     QMessageService::exportUpdates() should be subsequently called.
-
+    
+    On the Maemo 5 (Fremantle) platform for SMS type messages this function is not yet 
+    supported.
+    
+    Using this function to explicitly set a size or date is not currently supported on some platforms.
+    
     \sa message(), updateMessage(), removeMessage(), QMessageService::exportUpdates()
 */
 bool QMessageManager::addMessage(QMessage *m)
@@ -482,6 +502,10 @@
 
     To ensure the change is propagated to any affected external server 
     QMessageService::exportUpdates() should be subsequently called.
+
+    Using this function to explicitly set a size or date is not currently supported on some platforms.
+    
+    On the Maemo 5 (Fremantle) platform this function is not yet supported.
     
     \sa addMessage(), removeMessage(), QMessageService::exportUpdates()
 */
@@ -556,6 +580,9 @@
     Signal that is emitted when the message identified by \a id is added to the message store.
     \a matchingFilterIds contains a set of values identifiying registered notification filters 
     that matched the message.
+    
+    Currently on the Maemo 5 (Fremantle) platform this signal is not reported for messages in the 
+    inbox when the inbox is open in modest.
 
     \sa messageRemoved(), messageUpdated(), registerNotificationFilter()
 */