Set both servers to db
Digest email clean up
More digest mail cleanup.  Closes gh-1