send() returns now true on sucess, removeMessage added, qmessagingService::queryMessa() has still some problems together with modest

1 files changed, 5 insertions, 5 deletions

diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp
index 57ad1fb82d..af955787cf 100644
--- a/src/messaging/qmessagestore_maemo.cpp
+++ b/src/messaging/qmessagestore_maemo.cpp
@@ -244,8 +244,7 @@ bool QMessageStore::removeMessage(const QMessageId& id, QMessageManager::Removal
     if (id.toString().startsWith("MO_")) {
         return ModestEngine::instance()->removeMessage(id, option);
     }
-
-    return false;
+    return EventLoggerEngine::instance()->deleteMessage(id);
 }
 
 bool QMessageStore::removeMessages(const QMessageFilter& filter, QMessageManager::RemovalOption option)
@@ -256,10 +255,11 @@ bool QMessageStore::removeMessages(const QMessageFilter& filter, QMessageManager
         if (ids[i].toString().startsWith("MO_")) {
             if (!ModestEngine::instance()->removeMessage(ids[i], option)) {
                 return false;
-            }
-        }
+            } 
+	} else 
+	  if(!EventLoggerEngine::instance()->deleteMessage(ids[i]))
+	    return false;
     }
-
     return true;
 }