Fixup email addons and options
Merge pull request #7 from ozten/master

Fixup email options and addons