reverting previous message header changes to fix momo bug