diff --git a/Rnwood.Smtp4dev/Server/Imap/ImapSearchTranslator.cs b/Rnwood.Smtp4dev/Server/Imap/ImapSearchTranslator.cs
index de1062fdc..fc231228c 100644
--- a/Rnwood.Smtp4dev/Server/Imap/ImapSearchTranslator.cs
+++ b/Rnwood.Smtp4dev/Server/Imap/ImapSearchTranslator.cs
@@ -26,10 +26,24 @@ public class ImapSearchTranslator
                 IMAP_Search_Key_Subject subject => HandleSubject(subject),
                 IMAP_Search_Key_Or or => HandleOr(or),
                 IMAP_Search_Key_All all => HandleAll(all),
+                IMAP_Search_Key_Draft => HandleNone(),
+                IMAP_Search_Key_Flagged => HandleNone(),
+                IMAP_Search_Key_Deleted => HandleNone(),
+                IMAP_Search_Key_Since since => HandleSince(since),
                 { } unknown => throw new ImapSearchCriteriaNotSupportedException($"The criteria '{unknown} is not supported'")
             };
         }
 
+        private Expression<Func<Message, bool>> HandleSince(IMAP_Search_Key_Since since)
+        {
+            return m => m.ReceivedDate >= since.Date;
+        }
+
+        private Expression<Func<Message, bool>> HandleNone()
+        {
+            return m => false;
+        }
+
         private Expression<Func<Message, bool>> HandleAll(IMAP_Search_Key_All all)
         {
             return m => true;