Merge branch 'master' into comment-cachecomment-cache

2 files changed, 12 insertions, 11 deletions

diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el
index a3e53cfe793..fd793a28309 100644
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@ -192,6 +192,17 @@ the Content-Transfer-Encoding header of a mail."
       (ietf-drums-init string)
       (while (not (eobp))
 	(setq c (char-after))
+        ;; If we have an uneven number of quote characters,
+        ;; `forward-sexp' will fail.  In these cases, just delete the
+        ;; final of these quote characters.
+        (when (and (eq c ?\")
+                   (not
+                    (save-excursion
+                      (ignore-errors
+                        (forward-sexp 1)
+                        t))))
+          (delete-char 1)
+          (setq c (char-after)))
 	(cond
 	 ((or (eq c ? )
 	      (eq c ?\t))
diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el
index 2a8160921a6..bcbdc17631d 100644
--- a/lisp/mail/rfc2047.el
+++ b/lisp/mail/rfc2047.el
@@ -281,17 +281,7 @@ Should be called narrowed to the head of the message."
 			(encode-coding-region
 			 (point-min) (point-max)
 			 (mm-charset-to-coding-system
-			  (car message-posting-charset))))
-		  ;; No encoding necessary, but folding is nice
-		  (when nil
-		    (rfc2047-fold-region
-		     (save-excursion
-		       (goto-char (point-min))
-		       (skip-chars-forward "^:")
-		       (when (looking-at ": ")
-			 (forward-char 2))
-		       (point))
-		     (point-max))))
+			  (car message-posting-charset)))))
 	      ;; We found something that may perhaps be encoded.
 	      (re-search-forward "^[^:]+: *" nil t)
 	      (cond