1 files changed, 9 insertions, 2 deletions

diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index d5c212d..304a0e8 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -331,12 +331,19 @@ KAsync::Job<QVector<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbo
 
 KAsync::Job<QVector<qint64>> ImapServerProxy::fetchUids(const QString &mailbox)
 {
-    return select(mailbox).then<QVector<qint64>>(search(KIMAP2::Term(KIMAP2::Term::Uid, KIMAP2::ImapSet(1, 0))));
+    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));
 }
 
 KAsync::Job<QVector<qint64>> ImapServerProxy::fetchUidsSince(const QString &mailbox, const QDate &since)
 {
-    return select(mailbox).then<QVector<qint64>>(search(KIMAP2::Term(KIMAP2::Term::Since, since)));
+    auto sinceTerm = KIMAP2::Term(KIMAP2::Term::Since, since);
+    auto notDeleted = KIMAP2::Term(KIMAP2::Term::Deleted);
+    notDeleted.setNegated(true);
+    auto term = KIMAP2::Term(KIMAP2::Term::And, QVector<KIMAP2::Term>() << sinceTerm << notDeleted);
+    return select(mailbox).then<QVector<qint64>>(search(term));
 }
 
 KAsync::Job<void> ImapServerProxy::list(KIMAP2::ListJob::Option option, const std::function<void(const KIMAP2::MailBoxDescriptor &mailboxes, const QList<QByteArray> &flags)> &callback)