diff --git a/contrib/notmuch-pick/README b/contrib/notmuch-pick/README
deleted file mode 100644
index 42008245..00000000
--- a/contrib/notmuch-pick/README
+++ /dev/null
@@ -1,43 +0,0 @@
-NOTMUCH PICK
-
-Notmuch pick is an experimental threaded message view for the emacs
-interface. Each message is one line in the results and the thread
-structure is shown using UTF-8 box drawing characters (similar to
-Mutt's threaded view). It comes between search and show in terms of
-amount of output and can be useful for viewing both single threads and
-multiple threads.
-
-INSTALL
-
-Just copy the notmuch-pick.el file somewhere into emacs's load-path.
-
-Then after the "(require 'notmuch)" line in your .emacs file add
-the line "(require 'notmuch-pick nil t)". This will load notmuch-pick on
-your next emacs start.
-
-TEST
-
-Just execute run-tests.sh and it should all work (it does require that
-notmuch has already been built).
-
-USING PICK
-
-The main key entries to notmuch pick are
-
-'z' enter a query to view using notmuch pick (works in hello, search,
-    show and pick itself).
-'Z' view the current query in pick (works from search and show)
-'M-RET' view the selected thread in pick (works in search mode)
-
-Once in pick mode, keybindings are mostly in line with the rest of
-notmuch and are all viewable with '?' as usual.
-
-CUSTOMISING PICK
-
-Pick has several customisation variables. The most significant is the
-first notmuch-pick-show-out which determines the behaviour when
-selecting a message (with RET) in the pick view. By default pick uses
-a split window showing the single message in the bottom pane. However,
-if this option is set then it views the whole thread in the complete
-window jumping to the selected message in the thread. In either case
-M-RET selects the other option.
diff --git a/contrib/notmuch-pick/TODO b/contrib/notmuch-pick/TODO
deleted file mode 100644
index 8474e30d..00000000
--- a/contrib/notmuch-pick/TODO
+++ /dev/null
@@ -1,29 +0,0 @@
-TODO FOR NOTMUCH-PICK
-
-(These are the things I can think of: to be added to as problems get
-reported or found!)
-
-Things that need fixing before acceptance to mainline
-
-- Review lisp to make idiomatic.
-- Unify functions with search or show where appropriate.
-- Work out a fall-back if the font does not contain box graphic characters.
-- Add extra functionality?
-
-- Remove debugging information.
-
-- Add tests (I have some but I am not sure how to add them if pick is
-  in contrib).
-
-Bugs:
-
-- The display flickers while pick is running. I have no idea why.
-
-Other todo items
-
-- c i, c f for stashing ids etc.
-
-- Perhaps the author should be "To: ???" if the message is from the user.
-
-- Is there some nice way to do use the expand citation buttons of
-  notmuch-show when using the split-pane mode?
diff --git a/contrib/notmuch-pick/run-tests.sh b/contrib/notmuch-pick/run-tests.sh
deleted file mode 100755
index 1767949c..00000000
--- a/contrib/notmuch-pick/run-tests.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-fail() {
-    echo ERROR $1
-    exit 1
-}
-
-TESTS="emacs-tree"
-TESTFILES="$TESTS tree.expected-output"
-
-export PICK_DIR="`cd \`dirname "$0"\` && pwd`"
-PICK_TEST_DIR="$PICK_DIR/test"
-
-
-for f in $TESTFILES
-do
-    test -f "$PICK_TEST_DIR/$f" || test -d "$PICK_TEST_DIR/$f" || fail "$PICK_TEST_DIR/$f does not exist"
-done
-
-cd "$PICK_DIR/../../test"
-
-test -x ../notmuch || fail "`cd .. && pwd`/notmuch has not been built"
-
-for f in $TESTFILES
-do
-    if test -f "$f"
-    then
-	fail "$f exists"
-    fi
-done
-
-trap "rm -f $TESTFILES" 0
-
-for f in $TESTFILES
-do
-    ln -s "$PICK_TEST_DIR/$f" .
-done
-
-#don't exec -- traps would not run.
-for f in $TESTS
-do
-    echo $f
-    ./$f
-done