Cover some more cases related to message IDs