diff -crN pine4.63/pine/reply.c pine4.63-privacy/pine/reply.c
*** pine4.63/pine/reply.c	Thu Apr 28 10:22:03 2005
--- pine4.63-privacy/pine/reply.c	Fri Apr 29 11:52:47 2005
***************
*** 372,378 ****
      env = pine_mail_fetchstructure(pine_state->mail_stream, seq[times], NULL);
  
      if(role){
! 	q_status_message1(SM_ORDER, 3, 4,
  			  "Replying using role \"%.200s\"", role->nick);
  
  	/* override fcc gotten in reply_seed */
--- 372,378 ----
      env = pine_mail_fetchstructure(pine_state->mail_stream, seq[times], NULL);
  
      if(role){
! 	q_status_message1(SM_ORDER, 0, 1,
  			  "Replying using role \"%.200s\"", role->nick);
  
  	/* override fcc gotten in reply_seed */
***************
*** 3748,3754 ****
      }
  
      if(role)
!       q_status_message1(SM_ORDER, 3, 4,
  			"Forwarding using role \"%.200s\"", role->nick);
  
      if(role && role->template){
--- 3748,3754 ----
      }
  
      if(role)
!       q_status_message1(SM_ORDER, 0, 1,
  			"Forwarding using role \"%.200s\"", role->nick);
  
      if(role && role->template){
***************
*** 4433,4439 ****
  	}
  
  	if(role)
! 	  q_status_message1(SM_ORDER, 3, 4, "Composing using role \"%.200s\"",
  			    role->nick);
  
  	sig = detoken(role, NULL, 2, 0, 1, NULL, NULL);
--- 4433,4439 ----
  	}
  
  	if(role)
! 	  q_status_message1(SM_ORDER, 0, 1, "Composing using role \"%.200s\"",
  			    role->nick);
  
  	sig = detoken(role, NULL, 2, 0, 1, NULL, NULL);
***************
*** 5456,5465 ****
      if(!hostpart)
        hostpart = cpystr("huh");
  
!     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(), hostpart);
  
      if(hostpart)
        fs_give((void **) &hostpart);
--- 5456,5465 ----
      if(!hostpart)
        hostpart = cpystr("huh");
  
!     sprintf(id,"<%02d%02d%02d%02d%02d%02d%X.%d@somehost.domainz.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);
  
      if(hostpart)
        fs_give((void **) &hostpart);
diff -crN pine4.63/pine/send.c pine4.63-privacy/pine/send.c
*** pine4.63/pine/send.c	Mon Mar 21 12:14:41 2005
--- pine4.63-privacy/pine/send.c	Fri Apr 29 11:53:27 2005
***************
*** 4351,4358 ****
--- 4351,4361 ----
  	 * 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
***************
*** 10232,10240 ****
  {
      char **p;
      static char *forbidden_headers[] = {
- 	"sender",
- 	"x-sender",
- 	"x-x-sender",
  	"date",
  	"received",
  	"message-id",
--- 10235,10240 ----