--- a/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -161,21 +161,17 @@
             }
         } else if (filter._comparatorType == QMessageFolderFilterPrivate::Inclusion) {
             QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(filter._comparatorValue));
-            if (filter._ids.count() > 0) { // QMessageIdList
-                if (cmp == QMessageDataComparator::Includes) {
-                    if (filter._ids.contains(messageFolder.id())) {
-                        retVal = true;
-                    }
-                } else { // Excludes
-                    if (!filter._ids.contains(messageFolder.id())) {
-                        retVal = true;
-                    }
+            if (cmp == QMessageDataComparator::Includes) {
+                if (filter._ids.isEmpty()) {
+                    retVal = false;
+                } else if (filter._ids.contains(messageFolder.id())) {
+                    retVal = true;
                 }
-            } else { // QMessageFilter
-                if (cmp == QMessageDataComparator::Includes) {
-                    // Not supported
-                } else { // Excludes
-                                        // Not supported
+            } else { // Excludes
+                if (filter._ids.isEmpty()) {
+                    retVal = true;
+                } if (!filter._ids.contains(messageFolder.id())) {
+                    retVal = true;
                 }
             }
         }