Fix QMailMessageMetaData::receivedDate().

Doc was buggy, and so was pop plugin setting of this field.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index b0645f57..08a972f2 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -7119,7 +7119,8 @@ void QMailMessageMetaData::setDate(const QMailTimeStamp &timeStamp)
 }
 
 /*!
-    Returns the timestamp placed in the message during reception by the messageserver, if present;
+    Returns the timestamp when the message was recieved by the remote server, if known;
+    otherwise returns the timestamp contained in the origination date header field of the message, if present; 
     otherwise returns an empty timestamp.
 */
 QMailTimeStamp QMailMessageMetaData::receivedDate() const
@@ -7128,7 +7129,7 @@ QMailTimeStamp QMailMessageMetaData::receivedDate() const
 }
 
 /*!
-    Sets the timestamp indicating the time of message reception by the messageserver to \a timeStamp.
+    Sets the timestamp indicating the time of message reception by the remote server to \a timeStamp.
 */
 void QMailMessageMetaData::setReceivedDate(const QMailTimeStamp &timeStamp)
 {
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index d2771270..a7b9199d 100644
--- a/src/plugins/messageservices/pop/popclient.cpp
+++ b/src/plugins/messageservices/pop/popclient.cpp
@@ -1100,7 +1100,7 @@ void PopClient::createMail()
     } else {
         mail->setStatus(QMailMessage::Incoming, true);
         mail->setStatus(QMailMessage::New, true);
-        mail->setReceivedDate(QMailTimeStamp::currentDateTime());
+        mail->setReceivedDate(mail->date());
     }
     mail->setCustomField( "qmf-detached-filename", detachedFile );