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

[Michael Gratton <mjog src gnome org>]

commit 4289509a3bbf597e533756e1f2f74ed4f4c7ceed
Merge: 6d32ca6e 9ac029c6
Author: Michael Gratton <mike vee net>
Date:   Tue Mar 17 05:10:42 2020 +0000

    Merge branch 'cherry-pick-0e269a35' into 'gnome-3-36'
    
    Merge branch 'fix-725' into 'gnome-3-36'
    
    See merge request GNOME/geary!438

 src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala | 6 +++---
 src/engine/rfc822/rfc822-gmime-filter-flowed.vala      | 4 ++--
 src/engine/rfc822/rfc822-gmime-filter-plain.vala       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---