[geary: 4/4] Merge branch 'wip/18-primary-email-leak' into 'master'

[Michael Gratton <mjog src gnome org>]

commit ddf4ffcaf0f96ffd2613ed02e311e9c3168726c3
Merge: 257fac51 428e8030
Author: Michael Gratton <mike vee net>
Date:   Thu Jul 5 05:32:05 2018 +0000

    Merge branch 'wip/18-primary-email-leak' into 'master'
    
    Don't leak primary email when sender is an alt address
    
    Closes #18
    
    See merge request GNOME/geary!21

 src/engine/imap-db/outbox/smtp-outbox-folder.vala | 32 +++++++++++++++++++----
 src/engine/smtp/smtp-client-session.vala          | 11 ++++----
 src/engine/smtp/smtp-request.vala                 |  4 +--
 3 files changed, 35 insertions(+), 12 deletions(-)
---