moved checkbox to mail settings
Merge remote-tracking branch 'origin/feature/mail_notification' into feature/mail_notification