issue #21836: Email refinements