[geary: 2/2] Merge branch 'revert-ad984903' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 4095c5338366f0e9ffe687f1736a10d78a77f8f4
Merge: ad984903 00e78340
Author: Michael Gratton <mike vee net>
Date:   Sun Sep 23 02:33:46 2018 +0000

    Merge branch 'revert-ad984903' into 'master'
    
    Revert "Merge branch 'print-headers' into 'master'"
    
    See merge request GNOME/geary!46

 .../conversation-viewer/conversation-email.vala    |  3 ++
 .../conversation-viewer/conversation-message.vala  |  7 -----
 .../conversation-viewer/conversation-web-view.vala | 12 --------
 ui/conversation-web-view.css                       |  9 ------
 ui/conversation-web-view.js                        | 36 ----------------------
 5 files changed, 3 insertions(+), 64 deletions(-)
---