--- a/lisp/vm/vm-thread.el	Mon Aug 13 08:49:44 2007 +0200
+++ b/lisp/vm/vm-thread.el	Mon Aug 13 08:50:05 2007 +0200
@@ -122,8 +122,7 @@
 	(setq loop-sym (intern (symbol-name id-sym) vm-thread-loop-obarray))
 	(if (boundp loop-sym)
 	    ;; loop detected, bail...
-	    (setq done t
-		  thread-list (cdr thread-list))
+	    (setq done t)
 	  (set loop-sym t)
 	  (if (and (boundp id-sym) (symbol-value id-sym))
 	      (progn
@@ -212,12 +211,12 @@
       (vm-set-parent-of
        m
        (or (let (references)
-	     (setq references (vm-get-header-contents m "References:"))
+	     (setq references (vm-get-header-contents m "References:" " "))
 	     (and references
 		  (car (vm-last
 			(vm-parse references "[^<]*\\(<[^>]+>\\)")))))
 	   (let (in-reply-to)
-	     (setq in-reply-to (vm-get-header-contents m "In-Reply-To:"))
+	     (setq in-reply-to (vm-get-header-contents m "In-Reply-To:" " "))
 	     (and in-reply-to
 		  (car (vm-parse in-reply-to "[^<]*\\(<[^>]+>\\)"))))))))