Merge pull request #2 from paulmarsy/Encryption&Email-Refactor

Encryption&email refactor
Revert "Encryption&email refactor"
Merge pull request #3 from paulmarsy/revert-2-Encryption&Email-Refactor

Revert "Encryption&email refactor"
Merge