[geary/gnome-3-38: 2/2] Merge branch 'cherry-pick-d3badeda' into 'gnome-3-38'

[Michael Gratton <mjog src gnome org>]

commit 74b84ff4f39451304dd9c0885e4516a980224f9b
Merge: 354460721 a456c4b2c
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 4 08:06:00 2020 +0000

    Merge branch 'cherry-pick-d3badeda' into 'gnome-3-38'
    
    Merge branch 'mjog/1004-missing-labels' into 'gnome-3-38'
    
    See merge request GNOME/geary!595

 src/client/application/application-folder-context.vala | 7 ++++++-
 src/client/application/application-main-window.vala    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
---