merge buttonise-links patch to master

diff --combined emacs/notmuch-show.el
index f2487abf5ccf983eae438c01cc06e388dc1fa693,e7d16f81da5fd6fcab37cbb6b85d77fed62b9143..643dee6ecb928b393bf1c821aca90e0ad36b3811
--- 1/emacs/notmuch-show.el
--- 2/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@@ -1174,13 -1174,15 +1174,15 @@@ This also turns id:\"<message id>\"-par
  buttons for a corresponding notmuch search."
    (goto-address-fontify-region start end)
    (save-excursion
-     (let (links)
-       (goto-char start)
-       (while (re-search-forward notmuch-id-regexp end t)
+     (let (links
+         (beg-line (progn (goto-char start) (line-beginning-position)))
+         (end-line (progn (goto-char end) (line-end-position))))
+       (goto-char beg-line)
+       (while (re-search-forward notmuch-id-regexp end-line t)
        (push (list (match-beginning 0) (match-end 0)
                    (match-string-no-properties 0)) links))
-       (goto-char start)
-       (while (re-search-forward notmuch-mid-regexp end t)
+       (goto-char beg-line)
+       (while (re-search-forward notmuch-mid-regexp end-line t)
        (let* ((mid-cid (match-string-no-properties 1))
               (mid (save-match-data
                      (string-match "^[^/]*" mid-cid)
@@@ -1431,7 -1433,6 +1433,7 @@@ reset based on the original query.
      (define-key map "V" 'notmuch-show-view-raw-message)
      (define-key map "c" 'notmuch-show-stash-map)
      (define-key map "h" 'notmuch-show-toggle-visibility-headers)
 +    (define-key map "k" 'notmuch-tag-jump)
      (define-key map "*" 'notmuch-show-tag-all)
      (define-key map "-" 'notmuch-show-remove-tag)
      (define-key map "+" 'notmuch-show-add-tag)