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

[Michael Gratton <mjog src gnome org>]

commit 3a92f460a4b5b9fc1e5da99c006ec4c78a1a8c9b
Merge: d75e08533 5c94414fb
Author: Michael Gratton <mike vee net>
Date:   Sun Feb 7 03:54:48 2021 +0000

    Merge branch 'cherry-pick-a21982ae' into 'gnome-3-38'
    
    Merge branch 'mjog/draft-errors' into 'gnome-3-38'
    
    See merge request GNOME/geary!617

 .../application/application-plugin-manager.vala    | 14 +---
 src/client/composer/composer-widget.vala           | 96 +++++++++++++++-------
 src/engine/app/app-draft-manager.vala              | 13 ++-
 src/engine/imap/api/imap-folder-session.vala       |  4 +-
 4 files changed, 79 insertions(+), 48 deletions(-)
---