CRM-13965 : improvement; CRM-13973 : done with all handling except for email receipt