From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Mon, 4 Oct 2010 16:51:00 +0000 (+0200)
Subject: Don't bug out on addresses without @ signs.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=5468e915c342bcc54b4aa87f69742ed61587a21c;hp=7d2141955565e59da5818166b22f66ddfdb194d2

Don't bug out on addresses without @ signs.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4ca1118f..f87f29172 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-idna-to-ascii-rhs-1): Don't bug out on addresses
+	without @ signs.
+
 2010-10-04  Michael Welsh Duggan  <md5i@md5i.com>  (tiny change)
 
 	* nnir.el (nnir-run-imap): Remove spurious space in search string.
diff --git a/lisp/message.el b/lisp/message.el
index 7c8c07e19..860e70ccb 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5780,7 +5780,9 @@ subscribed address (and not the additional To and Cc header contents)."
 		(mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) ""))
 			(mapcar 'downcase
 				(mapcar
-				 'cadr
+				 (lambda (elem)
+				   (or (cadr elem)
+				       ""))
 				 (mail-extract-address-components field t))))))
 	;; Note that `rhs' will be "" if the address does not have
 	;; the domain part, i.e., if it is a local user's address.