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

[Michael Gratton <mjog src gnome org>]

commit a815234d0ce1c843abd9b21d7ababd6ff67b3490
Merge: 42c98572 b94f360b
Author: Michael Gratton <mike vee net>
Date:   Wed Sep 12 10:31:14 2018 +0000

    Merge branch 'wip/730495-fix-inline-plain-text-paste-0.12' into 'geary-0.12'
    
    Wip/730495 fix inline plain text paste 0.12
    
    See merge request GNOME/geary!29

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