More fixing of message_should_include