diff --git a/imap/mailbox.c b/imap/mailbox.c
index 41875f3729..9d10b572e3 100644
--- a/imap/mailbox.c
+++ b/imap/mailbox.c
@@ -4387,9 +4387,6 @@ EXPORTED int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *modseqp)
     conv_status_t status = CONV_STATUS_INIT;
     int r;
 
-    if (modseqp)
-        *modseqp = 0;
-
     struct conversations_state *cstate = mailbox_get_cstate(mailbox);
     if (!cstate) return 0;
 
diff --git a/imap/mailbox.h b/imap/mailbox.h
index 76191668ae..f1cad71d53 100644
--- a/imap/mailbox.h
+++ b/imap/mailbox.h
@@ -748,7 +748,7 @@ extern int mailbox_cid_rename(struct mailbox *mailbox,
                               conversation_id_t from_cid,
                               conversation_id_t to_cid);
 extern int mailbox_add_conversations(struct mailbox *mailbox, int silent);
-extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
+__attribute__((nonnull)) int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
 extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force);
 #define mailbox_has_conversations(m) mailbox_has_conversations_full(m, 0)
 extern int mailbox_has_conversations_full(struct mailbox *mailbox, int allow_deleted);