Consider removal records in QMailDisconnected ops2011W25

Specifically updatesOutstanding and rollBackUpdates.

NB#267055 Other mail account : messages deleted in device are not synced to server

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index c1ed9cc8..e12e4905 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Latest Changes
   * Fixes: NB#267768 messageserver segfaults @ QtMobility::QSystemAlignedTimerPrivate::error
   * Fixes: NB#265236 "Error occurred" shown frequently when syncing emails
   * Fixes: NB#268303 messageserver aborts with manual send receive of Google plugin account after SSU
+  * Fixes: NB#267055 - Other mail account : messages deleted in device are not synced to server
 
 201123
   * Fixes: NB#265223 Original message body shown empty in message view
diff --git a/src/libraries/qmfclient/qmaildisconnected.cpp b/src/libraries/qmfclient/qmaildisconnected.cpp
index 0faa17e7..abc1f17e 100644
--- a/src/libraries/qmfclient/qmaildisconnected.cpp
+++ b/src/libraries/qmfclient/qmaildisconnected.cpp
@@ -262,6 +262,9 @@ bool QMailDisconnected::updatesOutstanding(const QMailAccountId &mailAccountId)
     unimportantStatusKey &= QMailMessageKey::parentFolderId(QMailFolderId(QMailFolderFwd::LocalStorageFolderId), QMailDataComparator::NotEqual);
     if (QMailStore::instance()->countMessages(accountKey & unimportantStatusKey))
         return true;
+        
+    if (!QMailStore::instance()->messageRemovalRecords(mailAccountId).isEmpty())
+        return true;
     
     return false;
 }
@@ -350,6 +353,8 @@ void QMailDisconnected::rollBackUpdates(const QMailAccountId &mailAccountId)
         qWarning() << "Unable to rollback disconnected important->unimportant flagging for account:" << mailAccountId;
         return;
     }    
+
+    QMailStore::instance()->purgeMessageRemovalRecords(mailAccountId);
 }
 
 /*!