#1978 #1979 - added email sending