2 files changed, 23 insertions, 17 deletions

diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index 4c95606..ad21910 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -524,6 +524,7 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_)
 {
     auto query = query_;
     auto baseFilters = query.getBaseFilters();
+    //Resolve any subqueries we have
     for (const auto &k : baseFilters.keys()) {
         const auto comparator = baseFilters.value(k);
         if (comparator.value.canConvert<Query>()) {
@@ -534,26 +535,26 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_)
     }
     query.setBaseFilters(baseFilters);
 
-    FilterBase::Ptr baseSet;
-    QSet<QByteArray> remainingFilters = query.getBaseFilters().keys().toSet();
     QByteArray appliedSorting;
-    if (!query.ids().isEmpty()) {
-        mSource = Source::Ptr::create(query.ids().toVector(), this);
-        baseSet = mSource;
-    } else {
-        QSet<QByteArray> appliedFilters;
-
-        auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting);
-        remainingFilters = remainingFilters - appliedFilters;
-
-        // We do a full scan if there were no indexes available to create the initial set.
-        if (appliedFilters.isEmpty()) {
-            mSource = Source::Ptr::create(mStore.fullScan(mType), this);
+
+    //Determine initial set
+    mSource = [&]() {
+        if (!query.ids().isEmpty()) {
+            //We have a set of ids as a starting point
+            return Source::Ptr::create(query.ids().toVector(), this);
         } else {
-            mSource = Source::Ptr::create(resultSet, this);
+            QSet<QByteArray> appliedFilters;
+            auto resultSet = mStore.indexLookup(mType, query, appliedFilters, appliedSorting);
+            if (!appliedFilters.isEmpty()) {
+                //We have an index lookup as starting point
+                return Source::Ptr::create(resultSet, this);
+            }
+            // We do a full scan if there were no indexes available to create the initial set (this is going to be expensive for large sets).
+            return Source::Ptr::create(mStore.fullScan(mType), this);
         }
-        baseSet = mSource;
-    }
+    }();
+
+    FilterBase::Ptr baseSet = mSource;
     if (!query.getBaseFilters().isEmpty()) {
         auto filter = Filter::Ptr::create(baseSet, this);
         //For incremental queries the remaining filters are not sufficient
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index 1401fc8..68f7af7 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -46,6 +46,11 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
         if (!parentThread.isEmpty()) {
             auto childThreadId = thread.first();
             auto parentThreadId = parentThread.first();
+            //Can happen if the message is already available locally.
+            if (childThreadId == parentThreadId) {
+                //Nothing to do
+                return;
+            }
             SinkTrace() << "Merging child thread: " << childThreadId << " into parent thread: " << parentThreadId;
 
             //Ensure this mail ends up in the correct thread