X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-imap4.el;h=0a8c707f2f615ae10c04d2a6691f38472eab1d20;hb=cc2476c59df7c01510dff6fb30c8e981183f2ccc;hp=f59cddb3800c5125abcff2b44a29163d790a3957;hpb=9e39553b80115a949a7f04ddced4459a7797f8bd;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index f59cddb..0a8c707 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -53,17 +53,36 @@
 
 (defvar elmo-imap4-disuse-server-flag-mailbox-regexp "^#mh" ; UW imapd
   "Regexp to match IMAP4 mailbox names whose message flags on server should be ignored.
-(Except `\\Deleted' flag).")
+\(Except `\\Deleted' flag\).")
 
 (defvar elmo-imap4-overview-fetch-chop-length 200
-  "*Number of overviews to fetch in one request in imap4.")
+  "*Number of overviews to fetch in one request.")
+
+;; c.f. rfc2683 3.2.1.5 Long Command Lines
+;;
+;; "A client should limit the length of the command lines it generates
+;;  to approximately 1000 octets (including all quoted strings but not
+;;  including literals). If the client is unable to group things into
+;;  ranges so that the command line is within that length, it should
+;;  split the request into multiple commands. The client should use
+;;  literals instead of long quoted strings, in order to keep the command
+;;  length down.
+;;  For its part, a server should allow for a command line of at least
+;;  8000 octets. This provides plenty of leeway for accepting reasonable
+;;  length commands from clients. The server should send a BAD response
+;;  to a command that does not end within the server's maximum accepted
+;;  command length. "
+
+;; To limit command line length, chop number set.
+(defvar elmo-imap4-number-set-chop-length 1000
+  "*Number of messages to specify as a number-set argument for one request.")
 
 (defvar elmo-imap4-force-login nil
   "*Non-nil forces to try 'login' if there is no 'auth' capability in imapd.")
 
 (defvar elmo-imap4-use-select-to-update-status nil
   "*Some imapd have to send select command to update status.
-(ex. UW imapd 4.5-BETA?).  For these imapd, you must set this variable t.")
+\(ex. UW imapd 4.5-BETA?\).  For these imapd, you must set this variable t.")
 
 (defvar elmo-imap4-use-modified-utf7 nil
   "*Use mofidied UTF-7 (rfc2060) encoding for IMAP4 folder name.")
@@ -72,8 +91,10 @@
   "Use cache in imap4 folder.")
 
 (defvar elmo-imap4-extra-namespace-alist
-  '(("^{.*/nntp}.*$" . ".")) ; Default is for UW's remote nntp mailbox...
-  "Extra namespace alist.  A list of cons cell like: (REGEXP . DELIMITER).")
+  '(("^\\({.*/nntp}\\).*$" . ".")) ; Default is for UW's remote nntp mailbox...
+  "Extra namespace alist.
+A list of cons cell like: (REGEXP . DELIMITER).
+REGEXP should have a grouping for namespace prefix.")
 ;;
 ;;; internal variables
 ;;
@@ -171,14 +192,16 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
   (luna-define-internal-accessors 'mime-elmo-imap-location))
 
 ;;; Debug
-(defsubst elmo-imap4-debug (message &rest args)
-  (if elmo-imap4-debug
-      (with-current-buffer (get-buffer-create "*IMAP4 DEBUG*")
-	(goto-char (point-max))
-	(if elmo-imap4-debug-inhibit-logging
-	    (insert "NO LOGGING\n")
-	  (insert (apply 'format message args) "\n")))))
+(defmacro elmo-imap4-debug (message &rest args)
+  (` (if elmo-imap4-debug
+	 (elmo-imap4-debug-1 (, message) (,@ args)))))
 
+(defun elmo-imap4-debug-1 (message &rest args)
+  (with-current-buffer (get-buffer-create "*IMAP4 DEBUG*")
+    (goto-char (point-max))
+    (if elmo-imap4-debug-inhibit-logging
+	(insert "NO LOGGING\n")
+      (insert (apply 'format message args) "\n"))))
 
 (defsubst elmo-imap4-decode-folder-string (string)
   (if elmo-imap4-use-modified-utf7
@@ -204,6 +227,10 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
   "Returns non-nil if RESPONSE is an 'BYE' response."
   (` (assq 'bye (, response))))
 
+(defmacro elmo-imap4-response-garbage-p (response)
+  "Returns non-nil if RESPONSE is an 'garbage' response."
+  (` (assq 'garbage (, response))))
+
 (defmacro elmo-imap4-response-value (response symbol)
   "Get value of the SYMBOL from RESPONSE."
   (` (nth 1 (assq (, symbol) (, response)))))
@@ -233,9 +260,9 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 ;   "Send COMMAND to the SESSION and wait for response.
 ; Returns RESPONSE (parsed lisp object) of IMAP session."
 ;   (elmo-imap4-read-response session
-; 			    (elmo-imap4-send-command
-; 			     session
-; 			     command)))
+;			    (elmo-imap4-send-command
+;			     session
+;			     command)))
 
 (defun elmo-imap4-send-command-wait (session command)
   "Send COMMAND to the SESSION.
@@ -264,8 +291,11 @@ Returns a TAG string which is assigned to the COMMAND."
       (when (elmo-imap4-response-bye-p elmo-imap4-current-response)
 	(elmo-imap4-process-bye session))
       (setq elmo-imap4-current-response nil)
-      (if elmo-imap4-parsing
-	  (error "IMAP process is running. Please wait (or plug again.)"))
+      (when elmo-imap4-parsing
+	(message "Waiting for IMAP response...")
+	(accept-process-output (elmo-network-session-process-internal
+				session))
+	(message "Waiting for IMAP response...done"))
       (setq elmo-imap4-parsing t)
       (elmo-imap4-debug "<-(%s)- %s" tag command)
       (while (setq token (car command-args))
@@ -324,7 +354,14 @@ TAG is the tag of the command"
   (with-current-buffer (process-buffer
 			(elmo-network-session-process-internal session))
     (while (not (or (string= tag elmo-imap4-reached-tag)
-		    (elmo-imap4-response-bye-p elmo-imap4-current-response)))
+		    (elmo-imap4-response-bye-p elmo-imap4-current-response)
+		    (when (elmo-imap4-response-garbage-p
+			   elmo-imap4-current-response)
+		      (message "Garbage response: %s"
+			       (elmo-imap4-response-value
+				elmo-imap4-current-response
+				'garbage))
+		      t)))
       (when (memq (process-status
 		   (elmo-network-session-process-internal session))
 		  '(open run))
@@ -440,7 +477,7 @@ If response is not `OK' response, causes error with IMAP response text."
   (with-current-buffer (elmo-network-session-buffer session)
     (setq elmo-imap4-fetch-callback nil)
     (setq elmo-imap4-fetch-callback-data nil))
-  (elmo-imap4-send-command-wait session "check"))
+  (elmo-imap4-send-command session "check"))
 
 (defun elmo-imap4-atom-p (string)
   "Return t if STRING is an atom defined in rfc2060."
@@ -573,7 +610,7 @@ BUFFER must be a single-byte buffer."
 	(mapcar
 	 (lambda (entry)
 	   (if (and (eq 'list (car entry))
-		    (not (member "\\NoSelect" (nth 1 (nth 1 entry)))))
+		    (not (elmo-string-member-ignore-case "\\Noselect" (nth 1 (nth 1 entry)))))
 	       (car (nth 1 entry))))
 	 response)))
 
@@ -621,7 +658,12 @@ BUFFER must be a single-byte buffer."
 		    (elmo-imap4-folder-mailbox-internal folder)))))
 
 (defun elmo-imap4-get-session (folder &optional if-exists)
-  (elmo-network-get-session 'elmo-imap4-session "IMAP" folder if-exists))
+  (elmo-network-get-session 'elmo-imap4-session
+			    (concat
+			     (if (elmo-folder-biff-internal folder)
+				 "BIFF-")
+			     "IMAP")
+			    folder if-exists))
 
 (defun elmo-imap4-session-select-mailbox (session mailbox
 						  &optional force no-error)
@@ -657,9 +699,9 @@ Returns response value if selecting folder succeed. "
 		   (elmo-imap4-response-bye-p response))
 	      (elmo-imap4-process-bye session)
 	    (unless no-error
-	      (error (or
-		      (elmo-imap4-response-error-text response)
-		      (format "Select %s failed" mailbox)))))))
+	      (error "%s"
+		     (or (elmo-imap4-response-error-text response)
+			 (format "Select %s failed" mailbox)))))))
       (and result response))))
 
 (defun elmo-imap4-check-validity (spec validity-file)
@@ -688,43 +730,10 @@ Returns response value if selecting folder succeed. "
 		"search %s") flag))
      'search)))
 
-(static-cond
- ((fboundp 'float)
-  ;; Emacs can parse dot symbol.
-  (defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
-  (defvar elmo-imap4-rfc822-text "RFC822\.TEXT")
-  (defvar elmo-imap4-rfc822-header "RFC822\.HEADER")
-  (defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
-  (defvar elmo-imap4-header-fields "HEADER\.FIELDS")
-  (defmacro elmo-imap4-replace-dot-symbols ()) ;; noop
-  (defalias 'elmo-imap4-fetch-read 'read)
-  )
- (t
-  ;;; For Nemacs.
-  ;; Cannot parse dot symbol.
-  (defvar elmo-imap4-rfc822-size "RFC822_SIZE")
-  (defvar elmo-imap4-header-fields "HEADER_FIELDS")
-  (defvar elmo-imap4-rfc822-size "RFC822_SIZE")
-  (defvar elmo-imap4-rfc822-text "RFC822_TEXT")
-  (defvar elmo-imap4-rfc822-header "RFC822_HEADER")
-  (defvar elmo-imap4-header-fields "HEADER_FIELDS")
-  (defun elmo-imap4-fetch-read (buffer)
-    (with-current-buffer buffer
-      (let ((beg (point))
-	    token)
-	(when (re-search-forward "[[ ]" nil t)
-	  (goto-char (match-beginning 0))
-	  (setq token (buffer-substring beg (point)))
-	  (cond ((string= token "RFC822.SIZE")
-		 (intern elmo-imap4-rfc822-size))
-		((string= token "RFC822.HEADER")
-		 (intern elmo-imap4-rfc822-header))
-		((string= token "RFC822.TEXT")
-		 (intern elmo-imap4-rfc822-text))
-		((string= token "HEADER\.FIELDS")
-		 (intern elmo-imap4-header-fields))
-		(t (goto-char beg)
-		   (elmo-read (current-buffer))))))))))
+(defvar elmo-imap4-rfc822-size "RFC822\.SIZE")
+(defvar elmo-imap4-rfc822-text "RFC822\.TEXT")
+(defvar elmo-imap4-rfc822-header "RFC822\.HEADER")
+(defvar elmo-imap4-header-fields "HEADER\.FIELDS")
 
 (defun elmo-imap4-make-number-set-list (msg-list &optional chop-length)
   "Make RFC2060's message set specifier from MSG-LIST.
@@ -764,37 +773,42 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 
 ;;
 ;; app-data:
-;; cons of list
-;; 0: new-mark 1: already-mark 2: seen-mark 3: important-mark
-;; 4: seen-list
-;; and result of use-flag-p.
+;; cons of flag-table and result of use-flag-p.
 (defsubst elmo-imap4-fetch-callback-1-subr (entity flags app-data)
   "A msgdb entity callback function."
   (let* ((use-flag (cdr app-data))
 	 (app-data (car app-data))
-	 (seen (member (car entity) (nth 4 app-data)))
 	 mark)
-    (if (member "\\Flagged" flags)
-	(elmo-msgdb-global-mark-set (car entity) (nth 3 app-data)))
+    (if (elmo-string-member-ignore-case "\\Flagged" flags)
+	(elmo-msgdb-global-mark-set (car entity)
+				    elmo-msgdb-important-mark))
     (if (setq mark (elmo-msgdb-global-mark-get (car entity)))
-	(unless (member "\\Seen" flags)
+	(unless (elmo-string-member-ignore-case "\\Seen" flags)
 	  (setq elmo-imap4-seen-messages
 		(cons
 		 (elmo-msgdb-overview-entity-get-number entity)
 		 elmo-imap4-seen-messages)))
       (setq mark (or (if (elmo-file-cache-status
 			  (elmo-file-cache-get (car entity)))
-			 (if (or seen
-				 (and use-flag
-				      (member "\\Seen" flags)))
-			     nil
-			   (nth 1 app-data))
-		       (if (or seen
-			       (and use-flag
-				    (member "\\Seen" flags)))
-			   (if elmo-imap4-use-cache
-			       (nth 2 app-data))
-			 (nth 0 app-data))))))
+			 ;; cached.
+			 (if (and use-flag (member "\\Seen" flags))
+			     (if (elmo-string-member-ignore-case
+				  "\\Answered" flags)
+				 elmo-msgdb-answered-cached-mark
+			       nil)
+			   elmo-msgdb-unread-cached-mark)
+		       ;; uncached.
+		       (if (elmo-string-member-ignore-case "\\Answered" flags)
+			   elmo-msgdb-answered-uncached-mark
+			 (if (and use-flag
+				  (elmo-string-member-ignore-case
+				   "\\Seen" flags))
+			     (if (elmo-string-member-ignore-case
+				  "\\Answered" flags)
+				 elmo-msgdb-answered-uncached-mark
+			       (if elmo-imap4-use-cache
+				   elmo-msgdb-read-uncached-mark))
+			   elmo-msgdb-new-mark))))))
     (setq elmo-imap4-current-msgdb
 	  (elmo-msgdb-append
 	   elmo-imap4-current-msgdb
@@ -824,7 +838,7 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 
 (defun elmo-imap4-parse-capability (string)
   (if (string-match "^\\*\\(.*\\)$" string)
-      (elmo-read
+      (read
        (concat "(" (downcase (elmo-match-string 1 string)) ")"))))
 
 (defun elmo-imap4-clear-login (session)
@@ -900,7 +914,12 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 	    (signal 'elmo-open-error
 		    '(elmo-imap4-starttls-error)))
 	(elmo-imap4-send-command-wait session "starttls")
-	(starttls-negotiate process)))))
+	(starttls-negotiate process)
+	(elmo-imap4-session-set-capability-internal
+	 session
+	 (elmo-imap4-response-value
+	  (elmo-imap4-send-command-wait session "capability")
+	  'capability))))))
 
 (luna-define-method elmo-network-authenticate-session ((session
 							elmo-imap4-session))
@@ -1283,11 +1302,11 @@ Return nil if no complete line has arrived."
 (defun elmo-imap4-parse-response ()
   "Parse a IMAP command response."
   (let (token)
-    (case (setq token (elmo-read (current-buffer)))
+    (case (setq token (read (current-buffer)))
       (+ (progn
 	   (skip-chars-forward " ")
 	   (list 'continue-req (buffer-substring (point) (point-max)))))
-      (* (case (prog1 (setq token (elmo-read (current-buffer)))
+      (* (case (prog1 (setq token (read (current-buffer)))
 		 (elmo-imap4-forward))
 	   (OK         (elmo-imap4-parse-resp-text-code))
 	   (NO         (elmo-imap4-parse-resp-text-code))
@@ -1299,19 +1318,19 @@ Return nil if no complete line has arrived."
 	   (LSUB       (list 'lsub (elmo-imap4-parse-data-list)))
 	   (SEARCH     (list
 			'search
-			(elmo-read (concat "("
+			(read (concat "("
 				      (buffer-substring (point) (point-max))
 				      ")"))))
 	   (STATUS     (elmo-imap4-parse-status))
 	   ;; Added
 	   (NAMESPACE  (elmo-imap4-parse-namespace))
 	   (CAPABILITY (list 'capability
-			     (elmo-read
+			     (read
 			      (concat "(" (downcase (buffer-substring
 						     (point) (point-max)))
 				      ")"))))
 	   (ACL (elmo-imap4-parse-acl))
-	   (t       (case (prog1 (elmo-read (current-buffer))
+	   (t       (case (prog1 (read (current-buffer))
 			    (elmo-imap4-forward))
 		      (EXISTS  (list 'exists token))
 		      (RECENT  (list 'recent token))
@@ -1320,7 +1339,7 @@ Return nil if no complete line has arrived."
 		      (t       (list 'garbage (buffer-string)))))))
       (t (if (not (string-match elmo-imap4-seq-prefix (symbol-name token)))
 	     (list 'garbage (buffer-string))
-	   (case (prog1 (elmo-read (current-buffer))
+	   (case (prog1 (read (current-buffer))
 		   (elmo-imap4-forward))
 	     (OK  (progn
 		    (setq elmo-imap4-parsing nil)
@@ -1379,9 +1398,9 @@ Return nil if no complete line has arrived."
     (cond ((search-forward "PERMANENTFLAGS " nil t)
 	   (list 'permanentflags (elmo-imap4-parse-flag-list)))
 	  ((search-forward "UIDNEXT " nil t)
-	   (list 'uidnext (elmo-read (current-buffer))))
+	   (list 'uidnext (read (current-buffer))))
 	  ((search-forward "UNSEEN " nil t)
-	   (list 'unseen (elmo-read (current-buffer))))
+	   (list 'unseen (read (current-buffer))))
 	  ((looking-at "UIDVALIDITY \\([0-9]+\\)")
 	   (list 'uidvalidity (match-string 1)))
 	  ((search-forward "READ-ONLY" nil t)
@@ -1445,12 +1464,12 @@ Return nil if no complete line has arrived."
     (let (element list)
       (while (not (eq (char-after (point)) ?\)))
 	(elmo-imap4-forward)
-	(let ((token (elmo-imap4-fetch-read (current-buffer))))
+	(let ((token (read (current-buffer))))
 	  (elmo-imap4-forward)
 	  (setq element
 		(cond ((eq token 'UID)
 		       (list 'uid (condition-case nil
-				      (elmo-read (current-buffer))
+				      (read (current-buffer))
 				    (error nil))))
 		      ((eq token 'FLAGS)
 		       (list 'flags (elmo-imap4-parse-flag-list)))
@@ -1465,7 +1484,7 @@ Return nil if no complete line has arrived."
 		      ((eq token (intern elmo-imap4-rfc822-text))
 		       (list 'rfc822text (elmo-imap4-parse-nstring)))
 		      ((eq token (intern elmo-imap4-rfc822-size))
-		       (list 'rfc822size (elmo-read (current-buffer))))
+		       (list 'rfc822size (read (current-buffer))))
 		      ((eq token 'BODY)
 		       (if (eq (char-before) ?\[)
 			   (list
@@ -1495,24 +1514,25 @@ Return nil if no complete line has arrived."
       (while (not (eq (char-after (point)) ?\)))
 	(setq status
 	      (cons
-	       (let ((token (elmo-read (current-buffer))))
+	       (let ((token (read (current-buffer))))
 		 (cond ((eq token 'MESSAGES)
-			(list 'messages (elmo-read (current-buffer))))
+			(list 'messages (read (current-buffer))))
 		       ((eq token 'RECENT)
-			(list 'recent (elmo-read (current-buffer))))
+			(list 'recent (read (current-buffer))))
 		       ((eq token 'UIDNEXT)
-			(list 'uidnext (elmo-read (current-buffer))))
+			(list 'uidnext (read (current-buffer))))
 		       ((eq token 'UIDVALIDITY)
 			(and (looking-at " \\([0-9]+\\)")
 			     (prog1 (list 'uidvalidity (match-string 1))
 			       (goto-char (match-end 1)))))
 		       ((eq token 'UNSEEN)
-			(list 'unseen (elmo-read (current-buffer))))
+			(list 'unseen (read (current-buffer))))
 		       (t
 			(message
 			 "Unknown status data %s in mailbox %s ignored"
 			 token mailbox))))
-	       status))))
+	       status))
+	(skip-chars-forward " ")))
     (and elmo-imap4-status-callback
 	 (funcall elmo-imap4-status-callback
 		  status
@@ -1533,9 +1553,9 @@ Return nil if no complete line has arrived."
 	(nconc
 	 (copy-sequence elmo-imap4-extra-namespace-alist)
 	 (elmo-imap4-parse-namespace-subr
-	  (elmo-read (concat "(" (buffer-substring
-				  (point) (point-max))
-			     ")"))))))
+	  (read (concat "(" (buffer-substring
+			     (point) (point-max))
+			")"))))))
 
 (defun elmo-imap4-parse-namespace-subr (ns)
   (let (prefix delim namespace-alist default-delim)
@@ -1557,11 +1577,11 @@ Return nil if no complete line has arrived."
 			    (if (eq (length prefix) 0)
 				(progn (setq default-delim delim) nil)
 			      (cons
-			       (concat "^"
+			       (concat "^\\("
 				       (if (string= (downcase prefix) "inbox")
 					   "[Ii][Nn][Bb][Oo][Xx]"
 					 (regexp-quote prefix))
-				       ".*$")
+				       "\\).*$")
 			       delim)))
 			  (elmo-imap4-nth i ns))))))
     (if default-delim
@@ -1759,9 +1779,7 @@ Return nil if no complete line has arrived."
     (setq parse (elmo-parse-token name ":"))
     (elmo-imap4-folder-set-mailbox-internal folder
 					    (elmo-imap4-encode-folder-string
-					     (if (eq (length (car parse)) 0)
-						 elmo-imap4-default-mailbox
-					       (car parse))))
+					     (car parse)))
     ;; user
     (setq parse (elmo-parse-prefixed-element ?: (cdr parse) "/"))
     (elmo-net-folder-set-user-internal folder
@@ -1794,15 +1812,16 @@ Return nil if no complete line has arrived."
 	 (setq mailbox "inbox"))
      (if (eq (string-to-char mailbox) ?/)
 	 (setq mailbox (substring mailbox 1 (length mailbox))))
-     (expand-file-name
-      mailbox
+     ;; don't use expand-file-name (e.g. %~/something)
+     (concat
       (expand-file-name
        (or (elmo-net-folder-user-internal folder) "nobody")
        (expand-file-name (or (elmo-net-folder-server-internal folder)
 			     "nowhere")
 			 (expand-file-name
 			  "imap"
-			  elmo-msgdb-directory)))))))
+			  elmo-msgdb-directory)))
+      "/" mailbox))))
 
 (luna-define-method elmo-folder-status-plugged ((folder
 						 elmo-imap4-folder))
@@ -1834,13 +1853,17 @@ Return nil if no complete line has arrived."
 
 (luna-define-method elmo-folder-list-messages-plugged ((folder
 							elmo-imap4-folder)
-						       &optional nohide)
+						       &optional
+						       enable-killed)
   (elmo-imap4-list folder
-		   (let ((max (elmo-msgdb-max-of-killed
-			       (elmo-folder-killed-list-internal folder))))
-		     (if (or nohide
-			     (null (eq max 0)))
-			 (format "uid %d:*" (1+ max))
+		   (let ((killed
+			  (elmo-folder-killed-list-internal
+			   folder)))
+		     (if (and killed
+			      (eq (length killed) 1)
+			      (consp (car killed))
+			      (eq (car (car killed)) 1))
+			 (format "uid %d:*" (cdr (car killed)))
 		       "all"))))
 
 (luna-define-method elmo-folder-list-unreads-plugged
@@ -1851,6 +1874,16 @@ Return nil if no complete line has arrived."
   ((folder elmo-imap4-folder))
   (elmo-imap4-list folder "flagged"))
 
+(luna-define-method elmo-folder-list-answereds-plugged
+  ((folder elmo-imap4-folder))
+  (elmo-imap4-list folder "answered"))
+
+(defun elmo-imap4-folder-list-any-plugged (folder)
+  (elmo-imap4-list folder "or answered or unseen flagged"))
+
+(defun elmo-imap4-folder-list-digest-plugged (folder)
+  (elmo-imap4-list folder "or unseen flagged"))
+
 (luna-define-method elmo-folder-use-flag-p ((folder elmo-imap4-folder))
   (not (string-match elmo-imap4-disuse-server-flag-mailbox-regexp
 		     (elmo-imap4-folder-mailbox-internal folder))))
@@ -1860,20 +1893,29 @@ Return nil if no complete line has arrived."
   (let* ((root (elmo-imap4-folder-mailbox-internal folder))
 	 (session (elmo-imap4-get-session folder))
 	 (prefix (elmo-folder-prefix-internal folder))
-	 (delim (or
-		 (cdr
+	 (namespace-assoc
 		  (elmo-string-matched-assoc
 		   root
 		   (with-current-buffer (elmo-network-session-buffer session)
 		     elmo-imap4-server-namespace)))
+	 (delim (or (cdr namespace-assoc)
 		 elmo-imap4-default-hierarchy-delimiter))
+	 ;; Append delimiter when root with namespace.
+	 (root (if (and namespace-assoc
+			(match-end 1)
+			(string= (substring root (match-end 1))
+				 ""))
+		   (concat root delim)
+		 root))
 	 result append-serv type)
     (setq result (elmo-imap4-response-get-selectable-mailbox-list
 		  (elmo-imap4-send-command-wait
 		   session
 		   (list "list " (elmo-imap4-mailbox root) " *"))))
-    (unless (string= (elmo-net-folder-user-internal folder)
-		     elmo-imap4-default-user)
+    (when (or (not (string= (elmo-net-folder-user-internal folder)
+			    elmo-imap4-default-user))
+	      (not (eq (elmo-net-folder-auth-internal folder)
+		       (or elmo-imap4-default-authenticate-type 'clear))))
       (setq append-serv (concat ":" (elmo-net-folder-user-internal folder))))
     (unless (eq (elmo-net-folder-auth-internal folder)
 		(or elmo-imap4-default-authenticate-type 'clear))
@@ -1897,6 +1939,7 @@ Return nil if no complete line has arrived."
 				     type)))))
     (if one-level
 	(let ((re-delim (regexp-quote delim))
+	      (case-fold-search nil)
 	      folder ret has-child-p)
 	  ;; Append delimiter
 	  (when (and root
@@ -1947,21 +1990,31 @@ Return nil if no complete line has arrived."
        (elmo-imap4-folder-mailbox-internal folder)
        'force 'notify-bye))))
 
+(luna-define-method elmo-folder-creatable-p ((folder elmo-imap4-folder))
+  t)
+
 (luna-define-method elmo-folder-writable-p ((folder elmo-imap4-folder))
   t)
 
 (luna-define-method elmo-folder-delete ((folder elmo-imap4-folder))
-  (let ((session (elmo-imap4-get-session folder))
-	msgs)
-    (when (elmo-imap4-folder-mailbox-internal folder)
-      (when (setq msgs (elmo-folder-list-messages folder))
-	(elmo-folder-delete-messages folder msgs))
-      (elmo-imap4-send-command-wait session "close")
-      (elmo-imap4-send-command-wait
-       session
-       (list "delete "
-	     (elmo-imap4-mailbox
-	      (elmo-imap4-folder-mailbox-internal folder)))))))
+  (let ((msgs (and (elmo-folder-exists-p folder)
+		   (elmo-folder-list-messages folder))))
+    (when (yes-or-no-p (format "%sDelete msgdb and substance of \"%s\"? "
+			       (if (> (length msgs) 0)
+				   (format "%d msg(s) exists. " (length msgs))
+				 "")
+			       (elmo-folder-name-internal folder)))
+      (let ((session (elmo-imap4-get-session folder)))
+	(when (elmo-imap4-folder-mailbox-internal folder)
+	  (when msgs (elmo-folder-delete-messages folder msgs))
+	  (elmo-imap4-send-command-wait session "close")
+	  (elmo-imap4-send-command-wait
+	   session
+	   (list "delete "
+		 (elmo-imap4-mailbox
+		  (elmo-imap4-folder-mailbox-internal folder))))))
+      (elmo-msgdb-delete-path folder)
+      t)))
 
 (luna-define-method elmo-folder-rename-internal ((folder elmo-imap4-folder)
 						 new-folder)
@@ -1978,15 +2031,20 @@ Return nil if no complete line has arrived."
 	    (elmo-imap4-folder-mailbox-internal folder))
 	   " "
 	   (elmo-imap4-mailbox
-	    (elmo-imap4-folder-mailbox-internal new-folder))))))
+	    (elmo-imap4-folder-mailbox-internal new-folder))))
+    (elmo-imap4-session-set-current-mailbox-internal
+     session (elmo-imap4-folder-mailbox-internal new-folder))))
 
 (defun elmo-imap4-copy-messages (src-folder dst-folder numbers)
   (let ((session (elmo-imap4-get-session src-folder))
-	(set-list (elmo-imap4-make-number-set-list numbers)))
+	(set-list (elmo-imap4-make-number-set-list
+		   numbers
+		   elmo-imap4-number-set-chop-length))
+	succeeds)
     (elmo-imap4-session-select-mailbox session
 				       (elmo-imap4-folder-mailbox-internal
 					src-folder))
-    (when set-list
+    (while set-list
       (if (elmo-imap4-send-command-wait session
 					(list
 					 (format
@@ -1997,7 +2055,9 @@ Return nil if no complete line has arrived."
 					 (elmo-imap4-mailbox
 					  (elmo-imap4-folder-mailbox-internal
 					   dst-folder))))
-	  numbers))))
+	  (setq succeeds (append succeeds numbers)))
+      (setq set-list (cdr set-list)))
+    succeeds))
 
 (defun elmo-imap4-set-flag (folder numbers flag &optional remove)
   "Set flag on messages.
@@ -2006,30 +2066,40 @@ NUMBERS is the message numbers to be flagged.
 FLAG is the flag name.
 If optional argument REMOVE is non-nil, remove FLAG."
   (let ((session (elmo-imap4-get-session folder))
-	set-list)
+	response set-list)
     (elmo-imap4-session-select-mailbox session
 				       (elmo-imap4-folder-mailbox-internal
 					folder))
-    (setq set-list (elmo-imap4-make-number-set-list numbers))
-    (when set-list
+    (setq set-list (elmo-imap4-make-number-set-list
+		    numbers
+		    elmo-imap4-number-set-chop-length))
+    (while set-list
       (with-current-buffer (elmo-network-session-buffer session)
 	(setq elmo-imap4-fetch-callback nil)
 	(setq elmo-imap4-fetch-callback-data nil))
-      (elmo-imap4-send-command-wait
-       session
-       (format
-	(if elmo-imap4-use-uid
-	    "uid store %s %sflags.silent (%s)"
-	  "store %s %sflags.silent (%s)")
-	(cdr (car set-list))
-	(if remove "-" "+")
-	flag)))))
+      (unless (elmo-imap4-response-ok-p
+	       (elmo-imap4-send-command-wait
+		session
+		(format
+		 (if elmo-imap4-use-uid
+		     "uid store %s %sflags.silent (%s)"
+		   "store %s %sflags.silent (%s)")
+		 (cdr (car set-list))
+		 (if remove "-" "+")
+		 flag)))
+	(setq response 'fail))
+      (setq set-list (cdr set-list)))
+    (not (eq response 'fail))))
 
 (luna-define-method elmo-folder-delete-messages-plugged
   ((folder elmo-imap4-folder) numbers)
   (let ((session (elmo-imap4-get-session folder)))
-    (elmo-imap4-set-flag folder numbers "\\Deleted")
-    (elmo-imap4-send-command-wait session "expunge")))
+    (elmo-imap4-session-select-mailbox
+     session
+     (elmo-imap4-folder-mailbox-internal folder))
+    (unless (elmo-imap4-set-flag folder numbers "\\Deleted")
+      (error "Failed to set deleted flag"))
+    (elmo-imap4-send-command session "expunge")))
 
 (defmacro elmo-imap4-detect-search-charset (string)
   (` (with-temp-buffer
@@ -2038,8 +2108,12 @@ If optional argument REMOVE is non-nil, remove FLAG."
 
 (defun elmo-imap4-search-internal-primitive (folder session filter from-msgs)
   (let ((search-key (elmo-filter-key filter))
-	(imap-search-keys '("bcc" "body" "cc" "from" "subject" "to"))
-	charset)
+	(imap-search-keys '("bcc" "body" "cc" "from" "subject" "to"
+			    "larger" "smaller" "mark"))
+	(total 0)
+	(length (length from-msgs))
+	charset set-list end results)
+    (message "Searching...")
     (cond
      ((string= "last" search-key)
       (let ((numbers (or from-msgs (elmo-folder-list-messages folder))))
@@ -2053,70 +2127,110 @@ If optional argument REMOVE is non-nil, remove FLAG."
 			   numbers)))
 	(mapcar '(lambda (x) (delete x numbers)) rest)
 	numbers))
+     ((string= "flag" search-key)
+      (cond
+       ((string= "unread" (elmo-filter-value filter))
+	(elmo-folder-list-unreads folder))
+       ((string= "important" (elmo-filter-value filter))
+	(elmo-folder-list-importants folder))
+       ((string= "answered" (elmo-filter-value filter))
+	(elmo-folder-list-answereds folder))
+       ((string= "digest" (elmo-filter-value filter))
+	(elmo-imap4-folder-list-digest-plugged folder))
+       ((string= "any" (elmo-filter-value filter))
+	(elmo-imap4-folder-list-any-plugged folder))))
      ((or (string= "since" search-key)
 	  (string= "before" search-key))
-      (setq search-key (concat "sent" search-key))
-      (elmo-imap4-response-value
-       (elmo-imap4-send-command-wait session
-				     (format
-				      (if elmo-imap4-use-uid
-					  "uid search %s%s%s %s"
-					"search %s%s%s %s")
-				      (if from-msgs
-					  (concat
-					   (if elmo-imap4-use-uid "uid ")
-					   (cdr
-					    (car
-					     (elmo-imap4-make-number-set-list
-					      from-msgs)))
-					   " ")
-					"")
-				      (if (eq (elmo-filter-type filter)
-					      'unmatch)
-					  "not " "")
-				      search-key
-				      (elmo-date-get-description
-				       (elmo-date-get-datevec
-					(elmo-filter-value filter)))))
-       'search))
+      (setq search-key (concat "sent" search-key)
+	    set-list (elmo-imap4-make-number-set-list
+		      from-msgs
+		      elmo-imap4-number-set-chop-length)
+	    end nil)
+      (while (not end)
+	(setq results
+	      (append
+	       results
+	       (elmo-imap4-response-value
+		(elmo-imap4-send-command-wait
+		 session
+		 (format
+		  (if elmo-imap4-use-uid
+		      "uid search %s%s%s %s"
+		    "search %s%s%s %s")
+		  (if from-msgs
+		      (concat
+		       (if elmo-imap4-use-uid "uid ")
+		       (cdr (car set-list))
+		       " ")
+		    "")
+		  (if (eq (elmo-filter-type filter)
+			  'unmatch)
+		      "not " "")
+		  search-key
+		  (elmo-date-get-description
+		   (elmo-date-get-datevec
+		    (elmo-filter-value filter)))))
+		'search)))
+	(when (> length elmo-display-progress-threshold)
+	  (setq total (+ total (car (car set-list))))
+	  (elmo-display-progress
+	   'elmo-imap4-search "Searching..."
+	   (/ (* total 100) length)))
+	(setq set-list (cdr set-list)
+	      end (null set-list)))
+      results)
      (t
       (setq charset
 	    (if (eq (length (elmo-filter-value filter)) 0)
 		(setq charset 'us-ascii)
 	      (elmo-imap4-detect-search-charset
-	       (elmo-filter-value filter))))
-      (elmo-imap4-response-value
-       (elmo-imap4-send-command-wait session
-				     (list
-				      (if elmo-imap4-use-uid "uid ")
-				      "search "
-				      "CHARSET "
-				      (elmo-imap4-astring
-				       (symbol-name charset))
-				      " "
-				      (if from-msgs
-					  (concat
-					   (if elmo-imap4-use-uid "uid ")
-					   (cdr
-					    (car
-					     (elmo-imap4-make-number-set-list
-					      from-msgs)))
-					   " ")
-					"")
-				      (if (eq (elmo-filter-type filter)
-					      'unmatch)
-					  "not " "")
-				      (format "%s%s "
-					      (if (member
-						   (elmo-filter-key filter)
-						   imap-search-keys)
-						  ""
-						"header ")
-					      (elmo-filter-key filter))
-				      (elmo-imap4-astring
-				       (encode-mime-charset-string
-					(elmo-filter-value filter) charset))))
-       'search)))))
+	       (elmo-filter-value filter)))
+	    set-list (elmo-imap4-make-number-set-list
+		      from-msgs
+		      elmo-imap4-number-set-chop-length)
+	    end nil)
+      (while (not end)
+	(setq results
+	      (append
+	       results
+	       (elmo-imap4-response-value
+		(elmo-imap4-send-command-wait
+		 session
+		 (list
+		  (if elmo-imap4-use-uid "uid ")
+		  "search "
+		  "CHARSET "
+		  (elmo-imap4-astring
+		   (symbol-name charset))
+		  " "
+		  (if from-msgs
+		      (concat
+		       (if elmo-imap4-use-uid "uid ")
+		       (cdr (car set-list))
+		       " ")
+		    "")
+		  (if (eq (elmo-filter-type filter)
+			  'unmatch)
+		      "not " "")
+		  (format "%s%s "
+			  (if (member
+			       (elmo-filter-key filter)
+			       imap-search-keys)
+			      ""
+			    "header ")
+			  (elmo-filter-key filter))
+		  (elmo-imap4-astring
+		   (encode-mime-charset-string
+		    (elmo-filter-value filter) charset))))
+		'search)))
+	(when (> length elmo-display-progress-threshold)
+	  (setq total (+ total (car (car set-list))))
+	  (elmo-display-progress
+	   'elmo-imap4-search "Searching..."
+	   (/ (* total 100) length)))
+	(setq set-list (cdr set-list)
+	      end (null set-list)))
+      results))))
 
 (defun elmo-imap4-search-internal (folder session condition from-msgs)
   (let (result)
@@ -2140,17 +2254,19 @@ If optional argument REMOVE is non-nil, remove FLAG."
 			    folder session (nth 2 condition) from-msgs)))
 	    result (sort result '<))))))
 
-(luna-define-method elmo-folder-search ((folder elmo-imap4-folder)
-					condition &optional numbers)
-  (save-excursion
-    (let ((session (elmo-imap4-get-session folder)))
-      (elmo-imap4-session-select-mailbox
-       session
-       (elmo-imap4-folder-mailbox-internal folder))
-      (elmo-imap4-search-internal folder session condition numbers))))
+(luna-define-method elmo-folder-search :around ((folder elmo-imap4-folder)
+						condition &optional numbers)
+  (if (elmo-folder-plugged-p folder)
+      (save-excursion
+	(let ((session (elmo-imap4-get-session folder)))
+	  (elmo-imap4-session-select-mailbox
+	   session
+	   (elmo-imap4-folder-mailbox-internal folder))
+	  (elmo-imap4-search-internal folder session condition numbers)))
+    (luna-call-next-method)))
 
 (luna-define-method elmo-folder-msgdb-create-plugged
-  ((folder elmo-imap4-folder) numbers &rest args)
+  ((folder elmo-imap4-folder) numbers flag-table)
   (when numbers
     (let ((session (elmo-imap4-get-session folder))
 	  (headers
@@ -2160,6 +2276,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 	    elmo-msgdb-extra-fields))
 	  (total 0)
 	  (length (length numbers))
+	  print-length print-depth
 	  rfc2060 set-list)
       (setq rfc2060 (memq 'imap4rev1
 			  (elmo-imap4-session-capability-internal
@@ -2175,7 +2292,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 	(setq elmo-imap4-current-msgdb nil
 	      elmo-imap4-seen-messages nil
 	      elmo-imap4-fetch-callback 'elmo-imap4-fetch-callback-1
-	      elmo-imap4-fetch-callback-data (cons args
+	      elmo-imap4-fetch-callback-data (cons flag-table
 						   (elmo-folder-use-flag-p
 						    folder)))
 	(while set-list
@@ -2215,6 +2332,14 @@ If optional argument REMOVE is non-nil, remove FLAG."
   ((folder elmo-imap4-folder) numbers)
   (elmo-imap4-set-flag folder numbers "\\Seen"))
 
+(luna-define-method elmo-folder-unmark-answered-plugged
+  ((folder elmo-imap4-folder) numbers)
+  (elmo-imap4-set-flag folder numbers "\\Answered" 'remove))
+
+(luna-define-method elmo-folder-mark-as-answered-plugged
+  ((folder elmo-imap4-folder) numbers)
+  (elmo-imap4-set-flag folder numbers "\\Answered"))
+
 (luna-define-method elmo-message-use-cache-p ((folder elmo-imap4-folder)
 					      number)
   elmo-imap4-use-cache)
@@ -2240,12 +2365,15 @@ If optional argument REMOVE is non-nil, remove FLAG."
 
 (defsubst elmo-imap4-folder-diff-plugged (folder)
   (let ((session (elmo-imap4-get-session folder))
-	messages
-	response killed)
+	messages new unread response killed uidnext)
 ;;; (elmo-imap4-commit spec)
     (with-current-buffer (elmo-network-session-buffer session)
       (setq elmo-imap4-status-callback nil)
       (setq elmo-imap4-status-callback-data nil))
+    (if elmo-imap4-use-select-to-update-status
+	(elmo-imap4-session-select-mailbox
+	 session
+	 (elmo-imap4-folder-mailbox-internal folder)))
     (setq response
 	  (elmo-imap4-send-command-wait session
 					(list
@@ -2253,23 +2381,27 @@ If optional argument REMOVE is non-nil, remove FLAG."
 					 (elmo-imap4-mailbox
 					  (elmo-imap4-folder-mailbox-internal
 					   folder))
-					 " (recent unseen messages)")))
+					 " (recent unseen messages uidnext)")))
     (setq response (elmo-imap4-response-value response 'status))
     (setq messages (elmo-imap4-response-value response 'messages))
+    (setq uidnext (elmo-imap4-response-value response 'uidnext))
     (setq killed (elmo-msgdb-killed-list-load (elmo-folder-msgdb-path folder)))
-    (if killed
-	(setq messages (- messages
-			  (elmo-msgdb-killed-list-length
-			   killed))))
-    (list (elmo-imap4-response-value response 'recent)
-	  (elmo-imap4-response-value response 'unseen)
-	  messages)))
+    ;; 
+    (when killed
+      (when (and (consp (car killed))
+		 (eq (car (car killed)) 1))
+	(setq messages (- uidnext (cdr (car killed)) 1)))
+      (setq messages (- messages
+			(elmo-msgdb-killed-list-length (cdr killed)))))
+    (setq new (elmo-imap4-response-value response 'recent)
+	  unread (elmo-imap4-response-value response 'unseen))
+    (if (< unread new) (setq new unread))
+    (list new unread messages)))
 
 (luna-define-method elmo-folder-diff-plugged ((folder elmo-imap4-folder))
   (elmo-imap4-folder-diff-plugged folder))
 
-(luna-define-method elmo-folder-diff-async ((folder elmo-imap4-folder)
-					    &optional number-alist)
+(luna-define-method elmo-folder-diff-async ((folder elmo-imap4-folder))
   (setq elmo-imap4-server-diff-async-callback
 	elmo-folder-diff-async-callback)
   (setq elmo-imap4-server-diff-async-callback-data
@@ -2279,7 +2411,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 (luna-define-method elmo-folder-open :around ((folder elmo-imap4-folder)
 					      &optional load-msgdb)
   (if (elmo-folder-plugged-p folder)
-      (let (session mailbox msgdb response tag)
+      (let (session mailbox msgdb result response tag)
 	(condition-case err
 	    (progn
 	      (setq session (elmo-imap4-get-session folder)
@@ -2288,30 +2420,46 @@ If optional argument REMOVE is non-nil, remove FLAG."
 						 (list "select "
 						       (elmo-imap4-mailbox
 							mailbox))))
+	      (message "Selecting %s..."
+		       (elmo-folder-name-internal folder))
 	      (if load-msgdb
-		  (setq msgdb (elmo-msgdb-load folder)))
+		  (setq msgdb (elmo-msgdb-load folder 'silent)))
 	      (elmo-folder-set-killed-list-internal
 	       folder
 	       (elmo-msgdb-killed-list-load (elmo-folder-msgdb-path folder)))
-	      (setq response (elmo-imap4-read-response session tag)))
+	      (if (setq result (elmo-imap4-response-ok-p
+				(setq response
+				      (elmo-imap4-read-response session tag))))
+		  (progn
+		    (elmo-imap4-session-set-current-mailbox-internal
+		     session mailbox)
+		    (elmo-imap4-session-set-read-only-internal
+		     session
+		     (nth 1 (assq 'read-only (assq 'ok response)))))
+		(elmo-imap4-session-set-current-mailbox-internal session nil)
+		(if (elmo-imap4-response-bye-p response)
+		    (elmo-imap4-process-bye session)
+		  (error "%s"
+			 (or (elmo-imap4-response-error-text response)
+			     (format "Select %s failed" mailbox)))))
+	      (message "Selecting %s...done"
+		       (elmo-folder-name-internal folder))
+	      (elmo-folder-set-msgdb-internal
+	       folder msgdb))
 	  (quit
-	   (if response
+	   (if (elmo-imap4-response-ok-p response)
 	       (elmo-imap4-session-set-current-mailbox-internal
 		session mailbox)
 	     (and session
 		  (elmo-imap4-session-set-current-mailbox-internal
 		   session nil))))
 	  (error
-	   (if response
+	   (if (elmo-imap4-response-ok-p response)
 	       (elmo-imap4-session-set-current-mailbox-internal
 		session mailbox)
 	     (and session
 		  (elmo-imap4-session-set-current-mailbox-internal
-		   session nil)))))
-	(if load-msgdb
-	    (elmo-folder-set-msgdb-internal
-	     folder
-	     (or msgdb (elmo-msgdb-load folder)))))
+		   session nil))))))
     (luna-call-next-method)))
 
 ;; elmo-folder-open-internal: do nothing.
@@ -2363,7 +2511,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 				      (elmo-file-cache-path
 				       cache-file)))))))
 
-(luna-define-method elmo-folder-create ((folder elmo-imap4-folder))
+(luna-define-method elmo-folder-create-plugged ((folder elmo-imap4-folder))
   (elmo-imap4-send-command-wait
    (elmo-imap4-get-session folder)
    (list "create "
@@ -2371,7 +2519,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 	  (elmo-imap4-folder-mailbox-internal folder)))))
 
 (luna-define-method elmo-folder-append-buffer
-  ((folder elmo-imap4-folder) unread &optional number)
+  ((folder elmo-imap4-folder) &optional flag number)
   (if (elmo-folder-plugged-p folder)
       (let ((session (elmo-imap4-get-session folder))
 	    send-buffer result)
@@ -2387,13 +2535,16 @@ If optional argument REMOVE is non-nil, remove FLAG."
 		    "append "
 		    (elmo-imap4-mailbox (elmo-imap4-folder-mailbox-internal
 					 folder))
-		    (if unread " " " (\\Seen) ")
+		    (cond 
+		     ((eq flag 'read) " (\\Seen) ")
+		     ((eq flag 'answered) " (\\Answered)")
+		     (t " () "))
 		    (elmo-imap4-buffer-literal send-buffer))))
 	  (kill-buffer send-buffer))
 	result)
     ;; Unplugged
     (if elmo-enable-disconnected-operation
-	(elmo-folder-append-buffer-dop folder unread number)
+	(elmo-folder-append-buffer-dop folder flag number)
       (error "Unplugged"))))
 
 (eval-when-compile
@@ -2407,8 +2558,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 		     (elmo-net-folder-user-internal (, folder2)))))))
 
 (luna-define-method elmo-folder-append-messages :around
-  ((folder elmo-imap4-folder) src-folder numbers unread-marks
-   &optional same-number)
+  ((folder elmo-imap4-folder) src-folder numbers &optional same-number)
   (if (and (eq (elmo-folder-type-internal src-folder) 'imap4)
 	   (elmo-imap4-identical-system-p folder src-folder)
 	   (elmo-folder-plugged-p folder))
@@ -2458,14 +2608,15 @@ If optional argument REMOVE is non-nil, remove FLAG."
       (setq elmo-imap4-display-literal-progress nil))
     (unless elmo-inhibit-display-retrieval-progress
       (elmo-display-progress 'elmo-imap4-display-literal-progress
-			     "" 100)  ; remove progress bar.
-      (message "Retrieving...done."))
+			     "Retrieving..." 100)  ; remove progress bar.
+      (message "Retrieving...done"))
     (if (setq response (elmo-imap4-response-bodydetail-text
 			(elmo-imap4-response-value-all
 			 response 'fetch)))
 	(with-current-buffer outbuf
 	  (erase-buffer)
-	  (insert response)))))
+	  (insert response)
+	  t))))
 
 (luna-define-method elmo-message-fetch-plugged ((folder elmo-imap4-folder)
 						number strategy
@@ -2498,7 +2649,10 @@ If optional argument REMOVE is non-nil, remove FLAG."
       (goto-char (point-min))
       (std11-field-body (symbol-name field)))))
 
-
+(luna-define-method elmo-folder-search-requires-msgdb-p ((folder
+							  elmo-imap4-folder)
+							 condition)
+  nil)
 
 (require 'product)
 (product-provide (provide 'elmo-imap4) (require 'elmo-version))