Tokenize messages to prevent message parsing issues