diff --git a/Makefile.am b/Makefile.am
index 05b44d6e6..64fd65351 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,12 +30,12 @@ guile=
 endif
 
 if BUILD_MU4E
-emacs=emacs
+mu4e=mu4e
 else
-emacs=
+mu4e=
 endif
 
-SUBDIRS=m4 man lib $(widgets) $(guile) mu $(emacs) contrib toys
+SUBDIRS=m4 man lib $(widgets) $(guile) mu $(mu4e) contrib toys
 
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/TODO b/TODO
index 5db3c5e57..dc25800ee 100644
--- a/TODO
+++ b/TODO
@@ -36,9 +36,13 @@
   - make the mu4e-bookmarks format similar to the other ones
   - refresh current query after update?
   - fix mu4e-mark-set to work from the view buffer as well
-
+  - add sort buttons to header labels (and do the sorting)
+  - open links to mails through headers-mode somehow (i.e..,
+    mu4e-view-message-with-msgid)
+    
 
 ** Done (0.8.9.6)
+
   - opening urls is too eager (now use M-RET for opening url at point, not just
     RET, which conflicted with using RET for scrolling)
   - document quoting of queries
diff --git a/configure.ac b/configure.ac
index 34a2c888a..745b333e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,9 +310,9 @@ mu/tests/Makefile
 lib/Makefile
 lib/tests/Makefile
 widgets/Makefile
-emacs/Makefile
-emacs/mu4e-meta.el
-emacs/version.texi
+mu4e/Makefile
+mu4e/mu4e-meta.el
+mu4e/version.texi
 guile/Makefile
 guile/mu/Makefile
 guile/examples/Makefile
diff --git a/emacs/Makefile.am b/mu4e/Makefile.am
similarity index 100%
rename from emacs/Makefile.am
rename to mu4e/Makefile.am
diff --git a/emacs/TODO b/mu4e/TODO
similarity index 100%
rename from emacs/TODO
rename to mu4e/TODO
diff --git a/emacs/fdl.texi b/mu4e/fdl.texi
similarity index 100%
rename from emacs/fdl.texi
rename to mu4e/fdl.texi
diff --git a/emacs/mu4e-about.org b/mu4e/mu4e-about.org
similarity index 100%
rename from emacs/mu4e-about.org
rename to mu4e/mu4e-about.org
diff --git a/emacs/mu4e-actions.el b/mu4e/mu4e-actions.el
similarity index 100%
rename from emacs/mu4e-actions.el
rename to mu4e/mu4e-actions.el
diff --git a/emacs/mu4e-compose.el b/mu4e/mu4e-compose.el
similarity index 100%
rename from emacs/mu4e-compose.el
rename to mu4e/mu4e-compose.el
diff --git a/emacs/mu4e-headers.el b/mu4e/mu4e-headers.el
similarity index 100%
rename from emacs/mu4e-headers.el
rename to mu4e/mu4e-headers.el
diff --git a/emacs/mu4e-main.el b/mu4e/mu4e-main.el
similarity index 100%
rename from emacs/mu4e-main.el
rename to mu4e/mu4e-main.el
diff --git a/emacs/mu4e-mark.el b/mu4e/mu4e-mark.el
similarity index 100%
rename from emacs/mu4e-mark.el
rename to mu4e/mu4e-mark.el
diff --git a/emacs/mu4e-meta.el.in b/mu4e/mu4e-meta.el.in
similarity index 100%
rename from emacs/mu4e-meta.el.in
rename to mu4e/mu4e-meta.el.in
diff --git a/emacs/mu4e-proc.el b/mu4e/mu4e-proc.el
similarity index 100%
rename from emacs/mu4e-proc.el
rename to mu4e/mu4e-proc.el
diff --git a/emacs/mu4e-speedbar.el b/mu4e/mu4e-speedbar.el
similarity index 100%
rename from emacs/mu4e-speedbar.el
rename to mu4e/mu4e-speedbar.el
diff --git a/emacs/mu4e-utils.el b/mu4e/mu4e-utils.el
similarity index 100%
rename from emacs/mu4e-utils.el
rename to mu4e/mu4e-utils.el
diff --git a/emacs/mu4e-vars.el b/mu4e/mu4e-vars.el
similarity index 100%
rename from emacs/mu4e-vars.el
rename to mu4e/mu4e-vars.el
diff --git a/emacs/mu4e-view.el b/mu4e/mu4e-view.el
similarity index 100%
rename from emacs/mu4e-view.el
rename to mu4e/mu4e-view.el
diff --git a/emacs/mu4e.el b/mu4e/mu4e.el
similarity index 100%
rename from emacs/mu4e.el
rename to mu4e/mu4e.el
diff --git a/emacs/mu4e.org b/mu4e/mu4e.org
similarity index 100%
rename from emacs/mu4e.org
rename to mu4e/mu4e.org
diff --git a/emacs/mu4e.texi b/mu4e/mu4e.texi
similarity index 100%
rename from emacs/mu4e.texi
rename to mu4e/mu4e.texi
diff --git a/emacs/org-mu4e.el b/mu4e/org-mu4e.el
similarity index 100%
rename from emacs/org-mu4e.el
rename to mu4e/org-mu4e.el
diff --git a/emacs/version.texi.in b/mu4e/version.texi.in
similarity index 100%
rename from emacs/version.texi.in
rename to mu4e/version.texi.in