Some fixes to email, to pass Session - may not be required