Move message ID from headers to properties