* mu4e-view.el: make sure we're applying marks to the messages where

viewing (while in view mode)

emacs/mu4e-view.el

@@ -642,13 +642,17 @@ number them so they can be opened using `mu4e-view-go-to-url'."
 
 
 (defmacro mu4e~view-in-headers-context (&rest body)
-  "Evaluate BODY in the current headers buffer."
+  "Evaluate BODY in the current headers buffer, with moved to the
+current message."
   `(progn
      (unless '(buffer-live-p mu4e~view-headers-buffer)
        (error "no headers buffer available."))
-     (with-current-buffer mu4e~view-headers-buffer
-       ,@body)))
-
+     (let* ((docid (mu4e-field-at-point :docid)))
+       (with-current-buffer mu4e~view-headers-buffer
+	 (if (and docid (mu4e~headers-goto-docid docid))
+	   ,@body
+	   (error "Cannot find corresponding message in headers
+	     buffer."))))))
 
 (defun mu4e-view-headers-next(&optional n)
   "Move point to the next message header in the headers buffer