Added a 'don't kill my email' check. Also, fixed tabs