diff --git a/mu/mu-cmd-find.c b/mu/mu-cmd-find.c
index 18a08474..c2ea351a 100644
--- a/mu/mu-cmd-find.c
+++ b/mu/mu-cmd-find.c
@@ -129,6 +129,8 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,  GError **err)
 		qflags |= MU_QUERY_FLAG_SKIP_DUPS;
 	if (opts->include_related)
 		qflags |= MU_QUERY_FLAG_INCLUDE_RELATED;
+	if (opts->threads)
+		qflags |= MU_QUERY_FLAG_THREADS;
 
 	iter = mu_query_run (xapian, query, sortid, -1, qflags, err);
 	return iter;
diff --git a/mu/mu-cmd-server.c b/mu/mu-cmd-server.c
index 8ed4027f..cbf3124c 100644
--- a/mu/mu-cmd-server.c
+++ b/mu/mu-cmd-server.c
@@ -876,6 +876,10 @@ get_find_params (GSList *args, MuMsgFieldId *sortfield,
 		*qflags |= MU_QUERY_FLAG_SKIP_DUPS;
 	if (get_bool_from_args (args, "include-related", TRUE, NULL))
 		*qflags |= MU_QUERY_FLAG_INCLUDE_RELATED;
+	if (get_bool_from_args (args, "include-related", TRUE, NULL))
+		*qflags |= MU_QUERY_FLAG_INCLUDE_RELATED;
+	if (get_bool_from_args (args, "threads", TRUE, NULL))
+		*qflags |= MU_QUERY_FLAG_THREADS;
 
 	return MU_OK;
 }
diff --git a/toys/mug/mug-msg-list-view.c b/toys/mug/mug-msg-list-view.c
index 69fc4e82..d738eb3f 100644
--- a/toys/mug/mug-msg-list-view.c
+++ b/toys/mug/mug-msg-list-view.c
@@ -343,9 +343,11 @@ run_query (const char *xpath, const char *query, MugMsgListView * self)
 	}
 	mu_store_unref (store);
 
-	qflags = MU_QUERY_FLAG_DESCENDING         |
-		 MU_QUERY_FLAG_SKIP_UNREADABLE    |
-		 MU_QUERY_FLAG_SKIP_DUPS;
+	qflags =
+		MU_QUERY_FLAG_DESCENDING         |
+		MU_QUERY_FLAG_SKIP_UNREADABLE    |
+		MU_QUERY_FLAG_SKIP_DUPS          |
+		MU_QUERY_FLAG_THREADS;
 
 	iter = mu_query_run (xapian, query, MU_MSG_FIELD_ID_DATE,
 			     -1, qflags, &err);