Added distinction when parsing a message for click events.