convert to using the message-id which is MUCH more useful