--- imap/lmtpengine.c.dist	Wed Jun  5 20:32:15 2002
+++ imap/lmtpengine.c	Sun Jun 23 02:15:51 2002
@@ -440,7 +440,7 @@
 	if (!*p++) return 0;
     }
     else {
-	while (*p && *p != '@' && *p != '>') {
+	while (*p && /* *p != '@' && */ *p != '>') {
 	    if (*p == '\\') {
 		if (!*++p) return 0;
 	    }
@@ -461,7 +461,7 @@
 	    if (*p++ != ']') return 0;
 	}
 	else {
-	    while (isalnum((int) *p) || *p == '.' || *p == '-') p++;
+	    while (isalnum((int) *p) || *p == '.' || *p == '-' || *p == '_') p++;
 	}
     }
     
@@ -942,7 +942,7 @@
 	}
     }
     else {
-	while (*addr != '@' && *addr != '>') {
+	while (/* *addr != '@' && */ *addr != '>') {
 	    if (*addr == '\\') addr++;
 	    *dest++ = *addr++;
 	}