*** pine/newmail.c.orig	Mon Sep 25 15:07:01 2000
--- pine/newmail.c	Tue Sep 26 15:34:24 2000
***************
*** 342,348 ****
  					   e->from->personal, NULL),
  		   ps_global->ttyo->screen_cols);
  	else
! 	  sprintf(from + ((number > 1L) ? 18 : 6), "%s%s%s", 
  		  e->from->mailbox,
  		  e->from->host ? "@" : "",
  		  e->from->host ? e->from->host : "");
--- 342,349 ----
  					   e->from->personal, NULL),
  		   ps_global->ttyo->screen_cols);
  	else
! 	  snprintf(from + ((number > 1L) ? 18 : 6), sizeof(from) - strlen(from),
!                   "%s%s%s", 
  		  e->from->mailbox,
  		  e->from->host ? "@" : "",
  		  e->from->host ? e->from->host : "");