[geary: 2/2] Merge branch 'deceptive-warning' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 86bf9a36873587f6a0834a75fe55f8286c548df0
Merge: 7286808a bfe504fe
Author: Michael Gratton <mike vee net>
Date:   Sun Apr 28 04:14:01 2019 +0000

    Merge branch 'deceptive-warning' into 'mainline'
    
    Fix deceptive warning
    
    Closes #400
    
    See merge request GNOME/geary!225

 test/js/conversation-page-state-test.vala | 23 +++++++++++++++++++++++
 ui/conversation-web-view.js               | 12 ++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
---