Event Email Improvements

//Event Email Improvements