Issue #1685698 by Alan D.: Added email field support for diff.