Adding encryption
Merge pull request #378 from ndomar/mailersystem_bugfix

Mailersystem bugfix