Merge pull request #20058 from larssandergreen/re-use-mailing