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

[Michael Gratton <mjog src gnome org>]

commit d3e6d7b7db1ddb0dc2a31c189edab6a1964f0109
Merge: ed0adfa4b 2de149aae
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 4 08:06:24 2020 +0000

    Merge branch 'cherry-pick-d89ee326' into 'gnome-3-38'
    
    Merge branch 'mjog/composer-fixes' into 'gnome-3-38'
    
    See merge request GNOME/geary!589

 src/client/application/application-main-window.vala |  2 +-
 src/client/composer/composer-widget.vala            | 19 +++++++++++--------
 test/client/composer/composer-widget-test.vala      | 10 ++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)
---