--- evolution-2.9.1/mail/em-account-editor.c	2006-10-29 12:05:15.000000000 +0200
+++ evolution-2.9.1/mail/em-account-editor.c	2006-10-29 11:47:48.000000000 +0200
@@ -1665,8 +1665,11 @@
 	}
 	if (url->user)
 		gtk_entry_set_text(service->username, url->user);
+	if (service->pathentry && url->protocol 
+	    && (!strcmp(url->protocol, "maildir") || !strcmp(url->protocol, "mh")))
+		gtk_file_chooser_set_action (GTK_FILE_CHOOSER (service->pathentry), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 	if (service->pathentry && url->path)
-		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->path), url->path);
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (service->pathentry), url->path);
 
 	tmp = camel_url_get_param(url, "use_ssl");
 	if (tmp == NULL)
