Bug 951516 - Intermittent of email tests

Try to fix intermittent of email tests