diff --git a/org-contacts.el b/org-contacts.el
index 63ba005..9b08d67 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -418,8 +418,7 @@ This adds `org-contacts-gnus-check-mail-address' and
   "Retrieve the content of the `From' header of an email.
 Works from wl-summary-mode and mime-view-mode - that is while viewing email.
 Depends on Wanderlust been loaded."
-  (save-excursion
-    (set-buffer (org-capture-get :original-buffer))
+  (with-current-buffer (org-capture-get :original-buffer)
     (cond
      ((eq major-mode 'wl-summary-mode) (when wl-summary-buffer-elmo-folder
                                          (elmo-message-field