addressed issues 547 and 647
removed old unused code.
Merge pull request #194 from globaleaks/fix/email_exceptions

addressed issues 547 and 647