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

[Michael Gratton <mjog src gnome org>]

commit 3cb214b200df0cd944fdd357b139d285e01c3680
Merge: 93d42895 d6dc600e
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 25 04:04:19 2020 +0000

    Merge branch 'cherry-pick-8dfa2624' into 'gnome-3-36'
    
    Merge branch 'mjog/758-missing-message-id' into 'gnome-3-36'
    
    See merge request GNOME/geary!458

 src/engine/rfc822/rfc822-message.vala | 20 +++++++++------
 test/engine/rfc822-message-test.vala  | 48 +++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 8 deletions(-)
---