Cleaning up my e-mail problems