1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 63757511013..0d32fbe23fe 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -75,7 +75,11 @@ Return a modified address list."
                (forward-char -1)
                (skip-chars-backward " \t")
                (delete-region (point)
-                              (save-excursion (forward-sexp 1) (point))))
+                              (save-excursion
+                                (condition-case ()
+                                    (forward-sexp 1)
+                                  (error (goto-char (point-max))))
+                                  (point))))
              (setq address (buffer-string))
              (erase-buffer))
          ;; Strip non-nested comments an easier way.