Mail sender

Fix for  DF-706 and DF-705.