[geary/gnome-3-36: 2/2] Merge branch 'cherry-pick-850d7f1c' into 'gnome-3-36'

[Michael Gratton <mjog src gnome org>]

commit db3eef5066dfc71cb1a04aa5e8b9e589f64e4e74
Merge: d95d7615 4bbd5766
Author: Michael Gratton <mike vee net>
Date:   Sun Mar 29 06:49:23 2020 +0000

    Merge branch 'cherry-pick-850d7f1c' into 'gnome-3-36'
    
    Merge branch 'mjog/771-html-not-wrapped-on-send' into 'gnome-3-36'
    
    See merge request GNOME/geary!469

 src/engine/rfc822/rfc822-message.vala | 26 +++++++--------
 src/engine/rfc822/rfc822-utils.vala   | 10 +++---
 test/engine/rfc822-message-test.vala  | 61 +++++++++++++++++++++++++++++++++--
 test/engine/rfc822-utils-test.vala    | 31 ++++++++++++++++++
 4 files changed, 106 insertions(+), 22 deletions(-)
---