Vast update to email version 2.  This could surely use proofreading.
10 files changed