X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Findex.cc;h=78c18cf36d10898a8ea3aebcb1c8fe84fcff3df3;hp=da0e6cebd7c327ee3fdb35ffdf15110f89ce2fc0;hb=29f125212619ebca8621dd2106b412b22e1b6d22;hpb=610f0e09929a5f351f7c1c3850ac7e0d83ffe388

diff --git a/lib/index.cc b/lib/index.cc
index da0e6ceb..78c18cf3 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -440,7 +440,7 @@ _notmuch_message_index_file (notmuch_message_t *message,
     static bool mbox_warning = false;
 
     if (! initialized) {
-	g_mime_init (0);
+	g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
 	initialized = 1;
     }
 
@@ -484,12 +484,18 @@ mboxes is deprecated and may be removed in the future.\n", filename);
     }
 
     from = g_mime_message_get_sender (mime_message);
-    addresses = internet_address_list_parse_string (from);
 
-    _index_address_list (message, "from", addresses);
+    addresses = internet_address_list_parse_string (from);
+    if (addresses) {
+	_index_address_list (message, "from", addresses);
+	g_object_unref (addresses);
+    }
 
     addresses = g_mime_message_get_all_recipients (mime_message);
-    _index_address_list (message, "to", addresses);
+    if (addresses) {
+	_index_address_list (message, "to", addresses);
+	g_object_unref (addresses);
+    }
 
     subject = g_mime_message_get_subject (mime_message);
     _notmuch_message_gen_terms (message, "subject", subject);