Fix parsing of message host