X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-msgdb.el;h=7364c5cee4a176616724f02672039be89cff80f7;hb=40f5de1a09510d7a28ecc0bef4fea09b5845511f;hp=6eda5f8f0e88c34644c81f0e12f164741822414e;hpb=520aaf660f2053b94632fcc904deb3843c3c35ad;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 6eda5f8..7364c5c 100644
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -768,12 +768,16 @@ header separator."
     seen-list))
 
 (defun elmo-msgdb-get-message-id-from-buffer ()
-  (or (elmo-field-body "message-id")
+  (let ((msgid (elmo-field-body "message-id")))
+    (if msgid
+	(if (string-match "<\\(.+\\)>$" msgid)
+	    msgid
+	  (concat "<" msgid ">")) ; Invaild message-id.
       ;; no message-id, so put dummy msgid.
       (concat "<" (timezone-make-date-sortable
 		   (elmo-field-body "date"))
 	      (nth 1 (eword-extract-address-components
-		      (or (elmo-field-body "from") "nobody"))) ">")))
+		      (or (elmo-field-body "from") "nobody"))) ">"))))
 
 (defsubst elmo-msgdb-create-overview-from-buffer (number &optional size time)
   "Create overview entity from current buffer.