volunteer fixes and other email related fixes