Ref T13343. This makes "Password Reset" email a little more consistent with other modern types of email. My expectation is that this patch has no functional changes, just organizes code a little more consistently.
The new setRecipientAddress() mechanism deals with the case where the user types a secondary (but still verified) address.