Add $message_exim_id as a synonym for $message_id, which will now be