Added mail_user support
Merge branch 'master' of github.com:jbevemyr/idrott