diff --git a/src/Makefile.am b/src/Makefile.am
index a788ee87..06c1b6b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,8 +56,8 @@ libmu_la_SOURCES=			\
 	mu-cmd.h			\
 	mu-config.c			\
 	mu-config.h			\
-	mu-contacts.h			\
 	mu-contacts.c			\
+	mu-contacts.h			\
 	mu-index.c			\
 	mu-index.h			\
 	mu-log.c			\
@@ -81,8 +81,6 @@ libmu_la_SOURCES=			\
 	mu-msg-prio.c			\
 	mu-msg-prio.h			\
 	mu-msg-priv.h			\
-	mu-msg-threader.c		\
-	mu-msg-threader.h		\
 	mu-msg.c			\
 	mu-msg.h			\
 	mu-msg.h			\
@@ -95,6 +93,10 @@ libmu_la_SOURCES=			\
 	mu-str-normalize.c		\
 	mu-str.c			\
 	mu-str.h			\
+	mu-threader-utils.c		\
+	mu-threader-utils.h		\
+	mu-threader.c			\
+	mu-threader.h			\
 	mu-util-db.cc			\
 	mu-util.c			\
 	mu-util.h
diff --git a/src/mu-cmd-find.c b/src/mu-cmd-find.c
index 5009693f..b622403a 100644
--- a/src/mu-cmd-find.c
+++ b/src/mu-cmd-find.c
@@ -42,7 +42,7 @@
 
 #include "mu-util.h"
 #include "mu-cmd.h"
-#include "mu-msg-threader.h"
+#include "mu-threader.h"
 
 enum _OutputFormat {
 	FORMAT_JSON,
diff --git a/src/mu-msg-file.c b/src/mu-msg-file.c
index f74b7e78..7b406313 100644
--- a/src/mu-msg-file.c
+++ b/src/mu-msg-file.c
@@ -663,7 +663,7 @@ get_body (MuMsgFile *self, gboolean want_html)
 
 
 
-gboolean
+static gboolean
 contains (GSList *lst, const char *str)
 {
 	for (; lst; lst = g_slist_next(lst))
diff --git a/src/mu-msg-iter.cc b/src/mu-msg-iter.cc
index 55564af5..12b84c3d 100644
--- a/src/mu-msg-iter.cc
+++ b/src/mu-msg-iter.cc
@@ -29,8 +29,7 @@
 #include "mu-util.h"
 #include "mu-msg.h"
 #include "mu-msg-iter.h"
-#include "mu-msg-threader.h"
-
+#include "mu-threader.h"
 
 /* just a guess... */
 #define MAX_FETCH_SIZE 10000
@@ -58,7 +57,7 @@ struct _MuMsgIter {
 
 		if (threads && !_matches.empty()) { 
 			_matches.fetch();
-			_threadhash = mu_msg_threader_calculate
+			_threadhash = mu_threader_calculate
 				(this, _matches.size());
 			ThreadKeyMaker keymaker(_threadhash);
 			enq.set_sort_by_key (&keymaker, false);
diff --git a/toys/mug2/mug-msg-list-view.c b/toys/mug2/mug-msg-list-view.c
index 84901649..48da3c24 100644
--- a/toys/mug2/mug-msg-list-view.c
+++ b/toys/mug2/mug-msg-list-view.c
@@ -21,7 +21,7 @@
 #include "mug-msg-list-view.h"
 #include "mu-query.h"
 #include "mu-str.h"
-#include "mu-msg-threader.h"
+#include "mu-threader.h"
 
 /* 'private'/'protected' functions */
 static void mug_msg_list_view_class_init (MugMsgListViewClass * klass);