diff --git a/lib/mu-msg-fields.c b/lib/mu-msg-fields.c
index 3cdbd477..daf3c2fe 100644
--- a/lib/mu-msg-fields.c
+++ b/lib/mu-msg-fields.c
@@ -67,8 +67,6 @@ struct _MuMsgField {
 	const char        _xprefix;  /* the Xapian-prefix  */
 	FieldFlags        _flags;    /* the flags that tells us
 				      * what to do */
-
-
 };
 typedef struct _MuMsgField MuMsgField;
 
@@ -324,7 +322,8 @@ gboolean
 mu_msg_field_xapian_index  (MuMsgFieldId id)
 {
 	g_return_val_if_fail (mu_msg_field_id_is_valid(id),FALSE);
-	return mu_msg_field(id)->_flags & FLAG_XAPIAN_INDEX ? TRUE: FALSE;
+	return mu_msg_field(id)->_flags &
+		(FLAG_XAPIAN_INDEX | FLAG_XAPIAN_CONTACT) ? TRUE: FALSE;
 }
 
 gboolean
diff --git a/lib/mu-msg-fields.h b/lib/mu-msg-fields.h
index 96bd2769..08bfe608 100644
--- a/lib/mu-msg-fields.h
+++ b/lib/mu-msg-fields.h
@@ -192,7 +192,7 @@ gboolean mu_msg_field_is_cacheable (MuMsgFieldId id) G_GNUC_PURE;
 
 /**
  * is the field Xapian-indexable? That is, should this field be
- * indexed in the in the Xapian database, so we can use the all the
+ * indexed in the Xapian database, so we can use the all the
  * phrasing, stemming etc. magic
  *
  * @param id a MuMsgFieldId