Try to fix mail notification #20