--- ../ebbs-3.1.1/netmail.c	Sat Mar 15 18:46:42 1997
+++ netmail.c	Tue Apr  6 03:48:18 1999
@@ -30,7 +30,7 @@
 char *addr;
 {
   if (*addr == '\0') return 0;   /* blank */
-  if (*addr == '-') return 0;    /* cannot begin with '-' */
+  if (*addr == '-' || *addr == '+') return 0;  /* cannot begin with + or - */
   while (*addr) {
     if (!isalnum(*addr) && strchr(".%!@:;-_+[]", *addr) == NULL)
       return 0;
@@ -103,6 +103,8 @@
   }
 
   if ((address = lookup_mailer(addrbuf, mailer)) == NULL) return S_BADADDRESS;
+
+  if (!is_valid_address(address)) return S_BADADDRESS;
 
   if ((fp = fopen(server.tempfile, "w")) == NULL) return S_SYSERR;
 
--- ../ebbs-3.1.1/complete.c	Sat Mar 15 18:46:40 1997
+++ complete.c	Fri Feb  5 04:28:18 1999
@@ -218,7 +218,7 @@
 	  move(y,x) ;
 	  continue ;
 	}
-	if(count < datasize) {
+	if(count < datasize-1) {
           morelist = NULL;
 	  *temp++ = ch ;
 	  count++ ;