whitelist for mail addresses (fixes #101)
Merge branch 'dev'

* dev:
  whitelist for mail addresses (fixes #101)