Add counters to mail source events, remove more unwarranted delays
Fix typo