Added escaping to messages