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

[Michael Gratton <mjog src gnome org>]

commit 11c260dba11cb5137d28d33a5ea2228be1a3983a
Merge: e724ab3f 2e44d0d7
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 25 21:39:32 2020 +0000

    Merge branch 'cherry-pick-f2709096' into 'gnome-3-36'
    
    Merge branch 'mjog/671-focus-message-body-reply' into 'gnome-3-36'
    
    See merge request GNOME/geary!464

 src/client/composer/composer-widget.vala           | 15 ++--
 .../conversation-viewer/conversation-list-box.vala | 93 ++++++++++++++--------
 2 files changed, 71 insertions(+), 37 deletions(-)
---