... related to issue #786.

Also, don't check for a message-ID if the message-type does not match the
expected message type ("type mismatch").