Fix message_id bug for correcting feedback from ap 5