Changing mail to be delivered after model save and fixing notification