allow max ten retries in email workers
merge origin into Shawn's master branch