Bug 1065930 - Email test_setup_* failing due to HTML changes

done