fix up eventid=>messageId