[geary/gnome-3-34: 2/2] Merge branch 'cherry-pick-3e7a9dac' into 'gnome-3-34'

[Michael Gratton <mjog src gnome org>]

commit 8a0d490cff04ee94047a3b091742c32f5c01735d
Merge: 93d2adcf 8f429def
Author: Michael Gratton <mike vee net>
Date:   Sat Nov 23 04:28:24 2019 +0000

    Merge branch 'cherry-pick-3e7a9dac' into 'gnome-3-34'
    
    Merge branch 'mjog/550-always-show-images-not-saved' into 'gnome-3-34'
    
    See merge request GNOME/geary!347

 src/client/application/application-contact.vala    | 34 +++++++---
 .../conversation-viewer/conversation-message.vala  |  6 +-
 src/engine/api/geary-contact.vala                  | 10 ++-
 src/engine/common/common-contact-harvester.vala    | 76 ++++++++++++++++------
 src/engine/common/common-contact-store-impl.vala   | 31 ++-------
 .../common/common-contact-harvester-test.vala      | 20 +++---
 .../common/common-contact-store-impl-test.vala     | 18 ++++-
 7 files changed, 126 insertions(+), 69 deletions(-)
---