Jason Tibbitts 1c7b0e
diff --git a/imap/conversations.c b/imap/conversations.c
Jason Tibbitts 1c7b0e
index 504c5db..2b151dc 100644
Jason Tibbitts 1c7b0e
--- a/imap/conversations.c
Jason Tibbitts 1c7b0e
+++ b/imap/conversations.c
Jason Tibbitts 1c7b0e
@@ -560,11 +560,14 @@ EXPORTED int conversations_get_msgid(struct conversations_state *state,
Jason Tibbitts 1c7b0e
                       &data, &datalen,
Jason Tibbitts 1c7b0e
                       &state->txn);
Jason Tibbitts 1c7b0e
 
Jason Tibbitts 1c7b0e
+    if (r == CYRUSDB_NOTFOUND)
Jason Tibbitts 1c7b0e
+        return 0; /* not an error, but nothing more to do */
Jason Tibbitts 1c7b0e
+
Jason Tibbitts 1c7b0e
     if (!r) r = _conversations_parse(data, datalen, cids, NULL);
Jason Tibbitts 1c7b0e
 
Jason Tibbitts 1c7b0e
     if (r) arrayu64_truncate(cids, 0);
Jason Tibbitts 1c7b0e
 
Jason Tibbitts 1c7b0e
-    return 0;
Jason Tibbitts 1c7b0e
+    return r;
Jason Tibbitts 1c7b0e
 }
Jason Tibbitts 1c7b0e
 
Jason Tibbitts 1c7b0e
 /*