Refactor mail sending code
Refactor mail sending code

jniebuhr/WatchPeopleCode,eleweek/WatchPeopleCode,paked/WPC-fix,paked/WPC-fix,jniebuhr/WatchPeopleCode,WatchPeopleCode/WatchPeopleCode,WatchPeopleCode/WatchPeopleCode,gkbrk/WatchPeopleCode,WatchPeopleCode/WatchPeopleCode,WatchPeopleCode/WatchPeopleCode,jniebuhr/WatchPeopleCode,eleweek/WatchPeopleCode,jniebuhr/WatchPeopleCode,gkbrk/WatchPeopleCode,eleweek/WatchPeopleCode,gkbrk/WatchPeopleCode,gkbrk/WatchPeopleCode,eleweek/WatchPeopleCode