[geary/gnome-3-32: 2/2] Merge branch 'cherry-pick-ffb3b8fb' into 'gnome-3-32'

[Michael Gratton <mjog src gnome org>]

commit c25f8cace2cdc3b8cf2e5db6ee688b266ccb6796
Merge: 63d6bb67 6cb54365
Author: Michael Gratton <mike vee net>
Date:   Wed Jul 17 07:37:33 2019 +0000

    Merge branch 'cherry-pick-ffb3b8fb' into 'gnome-3-32'
    
    Merge branch 'wip/366-remove-folders' into 'gnome-3-32'
    
    See merge request GNOME/geary!256

 src/client/application/geary-controller.vala            | 6 ++++--
 src/engine/imap-engine/imap-engine-generic-account.vala | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---