lib: index the content-type of the parts of encrypted messages

[notmuch] / lib / index.cc

diff --git a/lib/index.cc b/lib/index.cc
index 0beaae62f048c37001e699351df030705e2341d9..ceb444df60bfdd7ad8bb36487599321a70dd6a9e 100644 (file)
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -409,7 +409,14 @@ _index_mime_part (notmuch_message_t *message,
                }
            }
            if (GMIME_IS_MULTIPART_ENCRYPTED (multipart)) {
-               /* Don't index encrypted parts. */
+               /* Don't index encrypted parts, but index their content type. */
+               _index_content_type (message,
+                                    g_mime_multipart_get_part (multipart, i));
+               if ((i != GMIME_MULTIPART_ENCRYPTED_VERSION) &&
+                   (i != GMIME_MULTIPART_ENCRYPTED_CONTENT)) {
+                   _notmuch_database_log (_notmuch_message_database (message),
+                                          "Warning: Unexpected extra parts of multipart/encrypted.\n");
+               }
                continue;
            }
            _index_mime_part (message,