Fixup for the message-id tracking feature