Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3662
diff -u -p -r1.3662 ChangeLog
--- mail/ChangeLog	27 Jul 2005 07:40:15 -0000	1.3662
+++ mail/ChangeLog	28 Jul 2005 02:20:37 -0000
@@ -1,3 +1,9 @@
+2005-07-28  Not Zed  <NotZed@Ximian.com>
+
+	** See bug #311440.
+
+	* em-utils.c (em_utils_in_addressbook): handle NULL address.
+
 2005-07-27  Not Zed  <NotZed@Ximian.com>
 
 	* mail-send-recv.c (get_folders): hack to make it honour the
Index: mail/em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.62
diff -u -p -r1.62 em-utils.c
--- mail/em-utils.c	25 Jul 2005 04:23:41 -0000	1.62
+++ mail/em-utils.c	28 Jul 2005 02:20:38 -0000
@@ -1871,7 +1871,8 @@ em_utils_in_addressbook(CamelInternetAdd
 	time_t now;
 
 	/* TODO: check all addresses? */
-	if (!camel_internet_address_get(iaddr, 0, NULL, &addr))
+	if (iaddr == NULL
+	    || !camel_internet_address_get(iaddr, 0, NULL, &addr))
 		return FALSE;
 
 	pthread_mutex_lock(&emu_addr_lock);
