Improved e-mail notifications