Make sure we check the name AND address for an account

I think at some point name was address, but now we do keep both around
So check both when setting reply from address
Fixes b/6684819 Reply Populates the Wrong Email Address

Also, add a test case that covers this in a later cl

Change-Id: Iff03622a6a33548a32fdf491bf5fe5463e21d807
2 files changed