Fixed mail notification, closes #930