Fixed notification and mail stuffff