diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87c86d142ef..dfacf7c2f72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* mail/mh-utils.el (mh-folder-hist): New var.
+	(mh-prompt-for-folder): Use it and pass `default' to completing-read.
+
 2001-04-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* hexl.el (hexl-scroll-up): If scrolling gets outside the hexl
diff --git a/lisp/mail/mh-utils.el b/lisp/mail/mh-utils.el
index 30605bb9311..c71e51656df 100644
--- a/lisp/mail/mh-utils.el
+++ b/lisp/mail/mh-utils.el
@@ -725,6 +725,7 @@ directory names."
   (setq mode-name mode-name-string)
   (force-mode-line-update t))
 
+(defvar mh-folder-hist nil)
 
 (defun mh-prompt-for-folder (prompt default can-create)
   ;; Prompt for a folder name with PROMPT.  Returns the folder's name as a
@@ -739,8 +740,8 @@ directory names."
 	 read-name folder-name)
     (if (null mh-folder-list)
 	(mh-set-folder-list))
-    (while (and (setq read-name (completing-read prompt mh-folder-list
-					    nil nil "+"))
+    (while (and (setq read-name (completing-read prompt mh-folder-list nil nil
+						 "+" 'mh-folder-hist default))
 		(equal read-name "")
 		(equal default "")))
     (cond ((or (equal read-name "") (equal read-name "+"))