diff --git a/lib/Makefile.am b/lib/Makefile.am
index e9cfdd7e..5aca0c4d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -87,18 +87,7 @@ libmu_la_SOURCES=                                       \
         mu-xapian.cc                                    \
         mu-xapian.hh                                    \
         mu-maildir.cc                                   \
-        mu-maildir.hh                                   \
-        mu-msg-crypto.cc                                \
-        mu-msg-doc.cc                                   \
-        mu-msg-doc.hh                                   \
-        mu-msg-file.cc                                  \
-        mu-msg-file.hh                                  \
-        mu-msg-part.cc                                  \
-        mu-msg-part.hh                                  \
-	mu-msg-priv.hh                                  \
-	mu-msg-sexp.cc                                  \
-	mu-msg.cc                                       \
-	mu-msg.hh
+        mu-maildir.hh
 
 libmu_la_LIBADD=                                        \
         $(XAPIAN_LIBS)                                  \
diff --git a/lib/message/Makefile.am b/lib/message/Makefile.am
index 1a99cea2..c6cf8161 100644
--- a/lib/message/Makefile.am
+++ b/lib/message/Makefile.am
@@ -29,7 +29,6 @@ libmu_message_la_SOURCES=	\
         mu-message.hh		\
         mu-message-part.cc	\
         mu-message-part.hh	\
-	mu-message-sexp.cc	\
         mu-contact.hh		\
         mu-contact.cc		\
         mu-document.cc		\
diff --git a/mu/Makefile.am b/mu/Makefile.am
index cadc9a59..e9f6f6ec 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -48,6 +48,7 @@ mu_SOURCES=                                                     \
 	mu-cmd-index.cc                                         \
 	mu-cmd-server.cc                                        \
 	mu-cmd-script.cc                                        \
+	mu-cmd-fields.cc                                        \
 	mu-cmd.cc                                               \
 	mu-cmd.hh
 
diff --git a/toys/Makefile.am b/toys/Makefile.am
index 57679861..7c84ce91 100644
--- a/toys/Makefile.am
+++ b/toys/Makefile.am
@@ -20,5 +20,5 @@ SUBDIRS=
 
 # for mug2 and msg2pdf, we need webkit
 if BUILD_GUI
-SUBDIRS += mug # msg2pdf
+#SUBDIRS += mug # msg2pdf
 endif