ensure latest mail patches are included