[geary: 4/5] Merge branch 'wip/778720-soup-avatar-crash'. Fixes Bug 778720.

[Michael Gratton <mjog src gnome org>]

commit b2f0ecab1b7b52965e98245e88f4dfadf9153bac
Merge: 923db7c bbbded8
Author: Michael James Gratton <mike vee net>
Date:   Tue Dec 5 15:06:00 2017 +1100

    Merge branch 'wip/778720-soup-avatar-crash'. Fixes Bug 778720.

 src/client/application/geary-controller.vala       |    2 +
 .../conversation-viewer/conversation-email.vala    |    8 +-
 .../conversation-viewer/conversation-list-box.vala |  119 +++++++++++++++++++-
 .../conversation-viewer/conversation-message.vala  |   59 +++--------
 .../conversation-viewer/conversation-viewer.vala   |    7 +-
 5 files changed, 138 insertions(+), 57 deletions(-)
---