Mail notifier & refactoring