[email] More cleanup of sensitive data.
(cherry picked from commit ff42b338c2072172616c85971c591917c97465b3)