fixes to email sending functionality
Merge branch 'icefaces18' of https://github.com/jintrone/XCoLab into icefaces18