diff --git a/lib/mu-store-write.cc b/lib/mu-store-write.cc
index afa1f056..596f1811 100644
--- a/lib/mu-store-write.cc
+++ b/lib/mu-store-write.cc
@@ -645,7 +645,8 @@ each_contact_info (MuMsgContact *contact, MsgDoc *msgdoc)
 		 * freeing */
 		escaped = mu_str_xapian_escape (contact->address, FALSE,
 						msgdoc->_strchunk);
-		msgdoc->_doc->add_term (pfx + escaped);
+		msgdoc->_doc->add_term
+			(std::string  (pfx + escaped, 0, MuStore::MAX_TERM_LENGTH));
 		add_address_subfields (*msgdoc->_doc, contact->address, pfx,
 				       msgdoc->_strchunk);
 
diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c
index 9e7d6e8b..661deed6 100644
--- a/mu/tests/test-mu-query.c
+++ b/mu/tests/test-mu-query.c
@@ -216,7 +216,7 @@ test_mu_query_03 (void)
 		{ "subject:Re: Learning LISP; Scheme vs elisp.", 0},
 		{ "subject:\"Re: Learning LISP; Scheme vs elisp.\"", 1},
 		{ "to:help-gnu-emacs@gnu.org", 4},
-		{ "t:help-gnu-emacs", 0},
+		{ "t:help-gnu-emacs", 4},
 		{ "flag:flagged", 1}
 	};