diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 5396cd19..2d0bfc28 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -412,6 +412,7 @@ gen_terms_part (Xapian::TermGenerator term_gen,
     GMimeStream *stream;
     GMimeDataWrapper *wrapper;
     GByteArray *byte_array;
+    GMimeContentDisposition *disposition;
     char *body;
 
     if (GMIME_IS_MULTIPART (part)) {
@@ -438,6 +439,13 @@ gen_terms_part (Xapian::TermGenerator term_gen,
 	return;
     }
 
+    disposition = g_mime_object_get_content_disposition (GMIME_OBJECT (part));
+    if (disposition &&
+	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    {
+	add_term (term_gen.get_document (), "label", "attachment");
+    }
+
     byte_array = g_byte_array_new ();
 
     stream = g_mime_stream_mem_new_with_byte_array (byte_array);