Here is the diff diff that I should have included in the previous email

Sorry about that!

Mark

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 3b86a5a..37dc161 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -198,7 +198,7 @@ open (if the message pane is closed it does nothing)."
      (interactive)
      (when (window-live-p notmuch-pick-message-window)
        (with-selected-window notmuch-pick-message-window
-	 (funcall #',func)))))
+	 (call-interactively #',func)))))
 
 (defun notmuch-pick-button-activate (&optional button)
   "Activate BUTTON or button at point
@@ -218,7 +218,7 @@ FUNC."
       ,(concat "(Close message pane and) " (documentation func t))
      (interactive)
      (notmuch-pick-close-message-window)
-     (funcall #',func)))
+     (call-interactively #',func)))
 
 (defvar notmuch-pick-mode-map
   (let ((map (make-sparse-keymap)))