Browser and Email Fixes (2)