Prefer a private email address to the public request address
Only include private details if an email is being sent directly to a requestor
Only allow a private response if there is a direct email address
Merge branch 'issues/218-better-email-handling'