More cleanup for email page