CRM-15578 - Fix inconsistent generation of recipient list