[geary] Enable GMime.FILTER_HTML_CONVERT_ADDRESSES

[Robert Schroll <rschroll src gnome org>]

commit 770234cf05399f4fa4f7ad37e73c4eb927c057af
Author: Robert Schroll <rschroll gmail com>
Date:   Wed Oct 15 17:10:45 2014 -0400

    Enable GMime.FILTER_HTML_CONVERT_ADDRESSES
    
    GMime version bumped, since this was broken pretty badly before 2.6.14.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=713430

 debian/control                        |    4 ++--
 src/CMakeLists.txt                    |    2 +-
 src/engine/rfc822/rfc822-message.vala |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/debian/control b/debian/control
index 5780c39..9383736 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8),
  libwebkitgtk-3.0-dev (>= 1.10.0),
  libxml2-dev (>= 2.7.8),
  libsecret-1-dev (>= 0.11),
- libgmime-2.6-dev (>= 2.6.0),
+ libgmime-2.6-dev (>= 2.6.14),
  valac,
  cmake (>= 2.8.0),
  libsqlite3-dev (>= 3.7.4),
@@ -36,7 +36,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libwebkitgtk-3.0-0 (>= 1.10.0),
  libxml2 (>= 2.7.8),
  libsqlite3-0 (>= 3.7.4),
- libgmime-2.6-0 (>= 2.6.0),
+ libgmime-2.6-0 (>= 2.6.14),
  libsecret-1-0 (>= 0.11),
  libmessaging-menu0 (>= 12.10.2),
  libunity9 (>= 5.12.0),
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4f1edf..5579bcb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -529,7 +529,7 @@ pkg_check_modules(DEPS REQUIRED
     libnotify>=0.7.5
     libcanberra>=0.28
     sqlite3>=3.7.4
-    gmime-2.6>=2.6.0
+    gmime-2.6>=2.6.14
     libsecret-1>=0.11
     libxml-2.0>=2.7.8
     gcr-3>=3.10.1
diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala
index 7d02de8..1d5daec 100644
--- a/src/engine/rfc822/rfc822-message.vala
+++ b/src/engine/rfc822/rfc822-message.vala
@@ -849,7 +849,8 @@ public class Geary.RFC822.Message : BaseObject {
                 stream_filter.add(new Geary.RFC822.FilterPlain());
             // HTML filter does stupid stuff to \r, so get rid of them.
             stream_filter.add(new GMime.FilterCRLF(false, false));
-            stream_filter.add(new GMime.FilterHTML(GMime.FILTER_HTML_CONVERT_URLS, 0));
+            stream_filter.add(new GMime.FilterHTML(
+                GMime.FILTER_HTML_CONVERT_URLS | GMime.FILTER_HTML_CONVERT_ADDRESSES, 0));
             stream_filter.add(new Geary.RFC822.FilterBlockquotes());
         }