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

[Michael Gratton <mjog src gnome org>]

commit f51b79f56668cc500690d8bab48945d1569a266b
Merge: 9404d1e4 eadcbc9b
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 25 04:05:36 2020 +0000

    Merge branch 'cherry-pick-abd6d2c0' into 'gnome-3-36'
    
    Merge branch 'mjog/search-delete-broken' into 'gnome-3-36'
    
    See merge request GNOME/geary!430

 src/client/application/application-controller.vala | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
---