(Issue 960) Synchronize e-mail scheduling with activity delivery and email collection
Merge pull request #960 from mrvisser/issue-960

Intermittent test failure: Email scheduling is not synchronized in tests