[geary/gnome-3-34: 2/2] Merge branch 'cherry-pick-647ef90c' into 'gnome-3-34'

[Michael Gratton <mjog src gnome org>]

commit 793f2f3e3a887de6c5bc86926eb1f189244a4398
Merge: 2220b3ac f0b3d679
Author: Michael Gratton <mike vee net>
Date:   Sat Nov 23 04:33:57 2019 +0000

    Merge branch 'cherry-pick-647ef90c' into 'gnome-3-34'
    
    Merge branch 'mjog/589-attachment-keyword-check' into 'gnome-3-34'
    
    See merge request GNOME/geary!335

 src/client/composer/composer-widget.vala |  19 ++++-
 test/js/composer-page-state-test.vala    | 137 +++++++++++++++++++++----------
 ui/composer-web-view.js                  | 123 ++++++++++++++-------------
 3 files changed, 174 insertions(+), 105 deletions(-)
---