Merge of the folding-reimpl-branch.  Specific changes,

Update tests for email 2.5.
2 files changed