Feeley email updates

@ryanfeeley - I manually merged what I could from PR #3938 and then manually edited the rest. How is this looking for you?