--- rfc2047.el~	2005-02-18 07:31:04 +0000
+++ rfc2047.el	2005-02-18 08:40:05 +0000
@@ -830,9 +830,19 @@
 	    ;; things essentially must not be there.
 	    (while (re-search-forward "[\n\r]+" nil t)
 	      (replace-match " "))
-	    (when rfc2047-quote-decoded-words-containing-tspecials
-	      ;; Quote decoded words if there are special characters
-	      ;; which might violate RFC2822.
+	    ;; Quote decoded words if there are special characters
+	    ;; which might violate RFC2822.
+	    (when (and rfc2047-quote-decoded-words-containing-tspecials
+		       (let ((regexp (car (rassq
+					   'address-mime
+					   rfc2047-header-encoding-alist))))
+			 (when regexp
+			   (save-restriction
+			     (widen)
+			     (beginning-of-line)
+			     (while (and (memq (char-after) '(?  ?\t))
+					 (zerop (forward-line -1))))
+			     (looking-at regexp)))))
 	      (let (quoted)
 		(goto-char e)
 		(skip-chars-forward " \t")