*** mail-source.el.orig	Wed Dec  1 20:32:17 1999
--- mail-source.el	Wed Dec  1 20:34:16 1999
***************
*** 192,200 ****
  	 default value keyword)
      (while (setq default (pop defaults))
        (set (mail-source-strip-keyword (setq keyword (car default)))
! 	   (if (setq value (plist-get source keyword))
  	       (mail-source-value value)
! 	     (if (setq value (plist-get defaults-1 keyword))
  		 (mail-source-value value)
  	       (mail-source-value (cadr default))))))))
  
--- 192,202 ----
  	 default value keyword)
      (while (setq default (pop defaults))
        (set (mail-source-strip-keyword (setq keyword (car default)))
! 	   (if (and (valid-plist-p keyword)
! 		    (setq value (plist-get source keyword)))
  	       (mail-source-value value)
! 	     (if (and (valid-plist-p keyword)
! 		      (setq value (plist-get defaults-1 keyword)))
  		 (mail-source-value value)
  	       (mail-source-value (cadr default))))))))