remove expectation that subject and message id will always be present