diff --git a/lib/message/mu-fields.cc b/lib/message/mu-fields.cc
index 31e690c1..d114a1c8 100644
--- a/lib/message/mu-fields.cc
+++ b/lib/message/mu-fields.cc
@@ -94,14 +94,13 @@ validate_field_flags()
 		/* - A field has at most one of Indexable, HasTerms, IsXapianBoolean and
 		   IsContact. */
 		size_t flagnum{};
+
 		if (field.is_indexable_term())
 			++flagnum;
 		if (field.is_boolean_term())
 			++flagnum;
 		if (field.is_normal_term())
 			++flagnum;
-		if (field.is_contact())
-			++flagnum;
 
 		if (flagnum > 1) {
 			//g_warning("invalid field %*s", STR_V(field.name));
diff --git a/lib/message/mu-fields.hh b/lib/message/mu-fields.hh
index 8df17e55..22b486b5 100644
--- a/lib/message/mu-fields.hh
+++ b/lib/message/mu-fields.hh
@@ -225,7 +225,9 @@ static constexpr std::array<Field, Field::id_size()>
 		'h',
 		Field::Flag::Contact |
 		Field::Flag::Value |
-		Field::Flag::IncludeInSexp
+		Field::Flag::IncludeInSexp |
+		Field::Flag::IndexableTerm,
+
 	    },
 	    {
 		Field::Id::BodyText,
@@ -245,7 +247,8 @@ static constexpr std::array<Field, Field::id_size()>
 		'c',
 		Field::Flag::Contact |
 		Field::Flag::Value |
-		Field::Flag::IncludeInSexp
+		Field::Flag::IncludeInSexp |
+		Field::Flag::IndexableTerm,
 	    },
 
 	    {
@@ -308,7 +311,8 @@ static constexpr std::array<Field, Field::id_size()>
 		'f',
 		Field::Flag::Contact |
 		Field::Flag::Value |
-		Field::Flag::IncludeInSexp
+		Field::Flag::IncludeInSexp |
+		Field::Flag::IndexableTerm,
 	    },
 	    {
 		Field::Id::Maildir,
@@ -436,7 +440,8 @@ static constexpr std::array<Field, Field::id_size()>
 		't',
 		Field::Flag::Contact |
 		Field::Flag::Value |
-		Field::Flag::IncludeInSexp
+		Field::Flag::IncludeInSexp |
+		Field::Flag::IndexableTerm,
 	    },
 
 	    /* internal */