diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3736562e15..2ea415ac34 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -834,6 +834,11 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *m
 	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);
+		return(0);
+	}
+
 	if (!strcmp(format, "wav49"))
 		format = "WAV";
 	ast_log(LOG_DEBUG, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, attach_voicemail);