Bug 1065930 - Email test_setup_* failing due to HTML changes
Merge pull request #23951 from bebef1987/email_fix

Bug 1065930 - Email test_setup_* failing due to HTML changes