diff -iw -C 3 -P -r pine4.50/pine/reply.c pine4.50-privacy/pine/reply.c
*** pine4.50/pine/reply.c	Fri Oct 11 10:44:55 2002
--- pine4.50-privacy/pine/reply.c	Mon Dec  2 07:29:45 2002
***************
*** 5106,5115 ****
  	cnt = 0;
  	osec = now_x->tm_sec;
      }
!     sprintf(id,"<Pine.%.4s.%.20s.%02d%02d%02d%02d%02d%02d%X.%d@%.50s>",
! 	    SYSTYPE, pine_version, (now_x->tm_year) % 100, now_x->tm_mon + 1,
  	    now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec, 
! 	    cnt, getpid(), ps_global->hostname);
  
      return(id);
  }
--- 5106,5115 ----
  	cnt = 0;
  	osec = now_x->tm_sec;
      }
!     sprintf(id,"<%02d%02d%02d%02d%02d%02d%X.%d@somehost.domain.com>",
! 	    (now_x->tm_year) % 100, now_x->tm_mon + 1,
  	    now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec, 
! 	    cnt);
  
      return(id);
  }
diff -iw -C 3 -P -r pine4.50/pine/send.c pine4.50-privacy/pine/send.c
*** pine4.50/pine/send.c	Wed Nov 20 14:51:49 2002
--- pine4.50-privacy/pine/send.c	Mon Dec  2 07:31:54 2002
***************
*** 4055,4062 ****
--- 4055,4064 ----
  	 * Don't ever believe the sender that is there.
  	 * If From doesn't look quite right, generate our own sender.
  	 */
+ 	/*
  	if(outgoing->sender)
  	  mail_free_address(&outgoing->sender);
+ 	*/
  
  	/*
  	 * If the LHS of the address doesn't match, or the RHS
***************
*** 4065,4070 ****
--- 4067,4074 ----
  	 *
  	 * Don't add a personal_name since the user can change that.
  	 */
+ 
+ 	/*
  	if(!outgoing->from
  	   || !outgoing->from->mailbox
  	   || strucmp(outgoing->from->mailbox, ps_global->VAR_USER_ID) != 0
***************
*** 4076,4081 ****
--- 4080,4086 ----
  	    outgoing->sender->mailbox = cpystr(ps_global->VAR_USER_ID);
  	    outgoing->sender->host    = cpystr(ps_global->hostname);
  	}
+ 	*/
  
          /*----- Message is edited, now decide what to do with it ----*/
  	if(editor_result & (COMP_SUSPEND | COMP_GOTHUP | COMP_CANCEL)){
***************
*** 9576,9584 ****
  {
      char **p;
      static char *forbidden_headers[] = {
- 	"sender",
- 	"x-sender",
- 	"x-x-sender",
  	"date",
  	"received",
  	"message-id",
--- 9581,9586 ----