Merge #18584: make doctest examples in email documentation pass.