(/=) MessageParsing

(/=) Improve message parsing