Only annotate if we have a message-id