Added a few more Email based bugs.
Merge pull request #24 from Mdonmounts/defect-add

Added a few more Email based bugs.