Add email for accepted and rejected deliveries
Fix conflict