Finish the email notification improvement