Added a few more Email based bugs.