Make sure all metadata is transferred for cache2011W23_2

I've also reorganized it to the same order as QMMMetaData
so that it's easier to verify nothing is missing

2 files changed, 12 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index f1f79ce1..57f2b283 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ Latest Changes
 ---------------
 
 201123
+  * Fixes: NB#265223 Original message body shown empty in message view
   * Fixes: NB#259331 New mails not shown immediately
   * Fixes: NB#264055 Message body region gets blank after forwarding it from device
   * Fixes: NB#259082 Sync never stops
diff --git a/src/libraries/qmfclient/qmailstore.cpp b/src/libraries/qmfclient/qmailstore.cpp
index e8f079c2..852a1740 100644
--- a/src/libraries/qmfclient/qmailstore.cpp
+++ b/src/libraries/qmfclient/qmailstore.cpp
@@ -1388,24 +1388,28 @@ QMailMessageMetaData QMailStore::dataToTransfer(const QMailMessageMetaData* mess
     QMailMessageMetaData metaData;
     // init all the fields except custom fields
     metaData.setId(message->id());
+    metaData.setParentFolderId(message->parentFolderId());
+    metaData.setMessageType(message->messageType());
     metaData.setFrom(message->from());
-    metaData.setTo(message->to());
     metaData.setSubject(message->subject());
-    metaData.setStatus(message->status());
     metaData.setDate(message->date());
-    metaData.setParentAccountId(message->parentAccountId());
-    metaData.setParentFolderId(message->parentFolderId());
     metaData.setReceivedDate(message->receivedDate());
+    metaData.setTo(message->to());
+    metaData.setStatus(message->status());
+    metaData.setParentAccountId(message->parentAccountId());
     metaData.setServerUid(message->serverUid());
-    metaData.setPreviousParentFolderId(message->previousParentFolderId());
     metaData.setSize(message->size());
     metaData.setContent(message->content());
+    metaData.setPreviousParentFolderId(message->previousParentFolderId());
+    metaData.setContentScheme(message->contentScheme());
     metaData.setContentIdentifier(message->contentIdentifier());
+    metaData.setInResponseTo(message->inResponseTo());
     metaData.setResponseType(message->responseType());
+    metaData.setPreview(message->preview());
+    metaData.setCopyServerUid(message->copyServerUid());
     metaData.setRestoreFolderId(message->restoreFolderId());
+    metaData.setListId(message->listId());
     metaData.setRfcId(message->rfcId());
-    metaData.setCopyServerUid(message->copyServerUid());
-    metaData.setPreview(message->preview());
     metaData.setParentThreadId(message->parentThreadId());
     metaData.setUnmodified();