CRM-15578 - Fix recipients. Improve API.