Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.121
diff -u -p -r1.121 app_voicemail.c
--- app_voicemail.c	30 Jun 2004 17:49:42 -0000	1.121
+++ app_voicemail.c	30 Jun 2004 18:13:06 -0000
@@ -834,8 +834,10 @@ static int sendmail(char *srcemail, stru
 	struct tm tm;
 	struct vm_zone *the_zone = NULL;
 
-	if (vmu && (strchr(vmu->email, '@') == NULL)) {
-		ast_log(LOG_WARNING, "Invalid e-mail address %s.  E-mail will not be sent.\n", vmu->email);
+	if (vmu && !ast_strlen_zero(vmu->email)) {
+		ast_log(LOG_WARNING,
+			"Missing e-mail address for mailbox [%s].  E-mail will not be sent.\n",
+			vmu->mailbox);
 		return(0);
 	}