--- gnus-art.el~	2009-06-01 11:45:19 +0000
+++ gnus-art.el	2009-07-23 12:15:49 +0000
@@ -4270,7 +4270,7 @@
   "s" gnus-article-show-summary
   "\C-c\C-m" gnus-article-mail
   "?" gnus-article-describe-briefly
-  "e" gnus-summary-edit-article
+  "e" gnus-article-read-summary-keys
   "<" beginning-of-buffer
   ">" end-of-buffer
   "\C-c\C-i" gnus-info-find-node
@@ -6374,8 +6374,13 @@
 		 (select-window win))))
 	(setq in-buffer (current-buffer))
 	;; We disable the pick minor mode commands.
-	(if (and (setq func (let (gnus-pick-mode)
-			      (lookup-key (current-local-map) keys)))
+	(if (and (let ((maps (current-minor-mode-maps))
+		       gnus-pick-mode)
+		   (while maps
+		     (when (setq func (lookup-key (pop maps) keys))
+		       (setq maps nil)))
+		   (or func
+		       (setq func (lookup-key (current-local-map) keys))))
 		 (functionp func)
 		 (condition-case code
 		     (progn