[geary: 2/2] Merge branch 'wip/730495-fix-inline-plain-text-paste' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 0b57e5b490afad85cc788a57efdec3b1085426ac
Merge: ceea747a ae6aed8a
Author: Michael Gratton <mike vee net>
Date:   Fri Jul 27 00:03:26 2018 +0000

    Merge branch 'wip/730495-fix-inline-plain-text-paste' into 'master'
    
    Fix rich text being pasted by Ctrl+V in plain text embedded composers
    
    See merge request GNOME/geary!28

 src/client/components/main-window.vala | 38 +++++++++++++++++++++++-----------
 ui/main-window.ui                      |  1 -
 2 files changed, 26 insertions(+), 13 deletions(-)
---