diff --git a/notmuch-address b/notmuch-address
new file mode 100755
index 0000000..7a8eeeb
--- /dev/null
+++ b/notmuch-address
@@ -0,0 +1,3 @@
+#!/bin/sh
+which lbdbq >/dev/null || exit
+lbdbq "$1" | sed '1d;s/\(.*\)\t(null).*/\1/;s/\(.*\)\t\(.*\)\t.*/\2 <\1>/'
diff --git a/notmuch-config.el b/notmuch-config.el
index 57af1f0..7bcc3d3 100644
--- a/notmuch-config.el
+++ b/notmuch-config.el
@@ -18,3 +18,6 @@
       mail-envelope-from 'header
       message-sendmail-f-is-evil nil
       message-sendmail-envelope-from 'header)
+
+(setq notmuch-address-command "~/etc/notmuch-address")
+(notmuch-address-message-insinuate)