4 files changed, 12 insertions, 7 deletions

diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 7ff4ea4..6607578 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -285,10 +285,11 @@ public:
         //This will also pull in any new messages in subsequent runs.
         .then([=] {
             auto job = [&] {
-                SinkLogCtx(mLogCtx) << "Fetching messages since: " << dateFilter;
                 if (dateFilter.isValid()) {
+                    SinkLogCtx(mLogCtx) << "Fetching messages since: " << dateFilter;
                     return imap->fetchUidsSince(imap->mailboxFromFolder(folder), dateFilter);
                 } else {
+                    SinkLogCtx(mLogCtx) << "Fetching messages.";
                     return imap->fetchUids(imap->mailboxFromFolder(folder));
                 }
             }();
@@ -394,12 +395,15 @@ public:
 
     Sink::QueryBase applyMailDefaults(const Sink::QueryBase &query)
     {
-        auto defaultDateFilter = QDate::currentDate().addDays(0 - mDaysToSync);
-        auto queryWithDefaults = query;
-        if (!queryWithDefaults.hasFilter<ApplicationDomain::Mail::Date>()) {
-            queryWithDefaults.filter(ApplicationDomain::Mail::Date::name, QVariant::fromValue(defaultDateFilter));
+        if (mDaysToSync > 0) {
+            auto defaultDateFilter = QDate::currentDate().addDays(0 - mDaysToSync);
+            auto queryWithDefaults = query;
+            if (!queryWithDefaults.hasFilter<ApplicationDomain::Mail::Date>()) {
+                queryWithDefaults.filter(ApplicationDomain::Mail::Date::name, QVariant::fromValue(defaultDateFilter));
+            }
+            return queryWithDefaults;
         }
-        return queryWithDefaults;
+        return query;
     }
 
     QList<Synchronizer::SyncRequest> getSyncRequests(const Sink::QueryBase &query) Q_DECL_OVERRIDE
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 2dd2d46..8a791a2 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -393,7 +393,6 @@ KAsync::Job<QVector<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbo
 
 KAsync::Job<QVector<qint64>> ImapServerProxy::fetchUids(const QString &mailbox)
 {
-    auto term = KIMAP2::Term(KIMAP2::Term::Uid, KIMAP2::ImapSet(1, 0));
     auto notDeleted = KIMAP2::Term(KIMAP2::Term::Deleted);
     notDeleted.setNegated(true);
     return select(mailbox).then<QVector<qint64>>(search(notDeleted));
diff --git a/examples/imapresource/tests/imapmailsynctest.cpp b/examples/imapresource/tests/imapmailsynctest.cpp
index cdb85dd..3e975b8 100644
--- a/examples/imapresource/tests/imapmailsynctest.cpp
+++ b/examples/imapresource/tests/imapmailsynctest.cpp
@@ -58,6 +58,7 @@ protected:
         resource.setProperty("server", "localhost");
         resource.setProperty("port", 143);
         resource.setProperty("username", "doe");
+        resource.setProperty("daysToSync", 0);
         Sink::SecretStore::instance().insert(resource.identifier(), "doe");
         return resource;
     }
diff --git a/examples/imapresource/tests/imapmailtest.cpp b/examples/imapresource/tests/imapmailtest.cpp
index 6616811..e1dee0d 100644
--- a/examples/imapresource/tests/imapmailtest.cpp
+++ b/examples/imapresource/tests/imapmailtest.cpp
@@ -38,6 +38,7 @@ protected:
         resource.setProperty("server", "localhost");
         resource.setProperty("port", 143);
         resource.setProperty("username", "doe");
+        resource.setProperty("daysToSync", 0);
         Sink::SecretStore::instance().insert(resource.identifier(), "doe");
         return resource;
     }