improved o/c parsing of message