Use :from for From header when both :from and :sender keys are present

When both :from and :sender are present in a message, :from should be used for the "From:" header.