diff --git a/THANKS b/THANKS
index 04184501..5c2228c1 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Michel Alexandre Salim <salimma@fedoraproject.org>
 Anirudh Sanjeev <skyronic@gmail.com>
 Jakub Steiner <jimmac@gmail.com>
 Wolfgang Steitz <wolfer7@web.de>
+Jakob Unterwurzacher <jakobunt@gmail.com>
 Colin Walters <walters@verbum.org>
 Alexander Wilms <alexander.wilms@zoho.com>
 
diff --git a/src/engine/rfc822/rfc822.vala b/src/engine/rfc822/rfc822.vala
index 714107fb..2a5d93df 100644
--- a/src/engine/rfc822/rfc822.vala
+++ b/src/engine/rfc822/rfc822.vala
@@ -12,7 +12,7 @@ internal void init() {
     if (init_count++ != 0)
         return;
     
-    GMime.init(0);
+    GMime.init(GMime.ENABLE_RFC2047_WORKAROUNDS);
 }
 
 }