[geary/gnome-3-34: 4/4] Merge branch 'cherry-pick-737bdba1' into 'gnome-3-34'

[Michael Gratton <mjog src gnome org>]

commit 828a2a185ba8daf6e9f1a54748a1f1b5629434a3
Merge: 55ef01b6 25fa056a
Author: Michael Gratton <mike vee net>
Date:   Sat Nov 23 04:30:06 2019 +0000

    Merge branch 'cherry-pick-737bdba1' into 'gnome-3-34'
    
    Merge branch 'mjog/571-imap-fetch-space-workaround-redux' into 'gnome-3-34'
    
    See merge request GNOME/geary!348

 bindings/vapi/gmime-2.6.vapi                 |   2 +-
 src/client/composer/composer-widget.vala     |   6 +-
 src/engine/imap/api/imap-folder-session.vala | 211 ++++++++++++++++++---------
 src/engine/rfc822/rfc822-message-data.vala   |  26 ++--
 test/engine/rfc822-message-data-test.vala    |  22 +++
 5 files changed, 176 insertions(+), 91 deletions(-)
---