[continued from previous message]

static struct string * expval_in_reply_to P_((struct hdr_menu_item *h,
struct mailing_headers *headers,
charset_t hdr_charset));
! static int hdrproc_in_reply_to P_((struct hdr_menu_item * h,
! struct mailing_headers * headers,
! struct hdrmenu_context * cnt,
! enum free_only_t free_only,
! struct mailer_info * mailer_info,
! charset_t hdr_charset,
! struct AliasView * aview,
! struct menu_context * page,
! struct menu_context * prompt_area,
! struct header_rec * parent_message));

/* User defined header ---------------------------------------------------- */

! static void inpval_userhdr P_((struct hdr_menu_item * h,
! struct mailing_headers * headers,
! struct hdrmenu_context * cnt,
! charset_t hdr_charset));
static struct string * expval_userhdr P_((struct hdr_menu_item *h,
struct mailing_headers *headers,
charset_t hdr_charset));
! static int hdrproc_userhdr P_((struct hdr_menu_item * h,
! struct mailing_headers * headers,
! struct hdrmenu_context * cnt,
! enum free_only_t free_only,
! struct mailer_info * mailer_info,
! charset_t hdr_charset,
! struct AliasView * aview,
! struct menu_context * page,
! struct menu_context * prompt_area,
! struct header_rec * parent_message));

/*
* Definition of all the header editing menu fields.
*/
struct hdr_menu_item hmenu_item_list[] = {
! { 't', "T)o", 2,
! HF_DISP_3ROW|HF_APPENDENTRY|HF_ADD_COMMA|
! HF_ONPRE_SENDMENU|HF_ONPRE_BOUNCEMENU|
! HF_USE_EXP_ADDRESS,
inpval_to, expval_to, hdrproc_to },
! { 'c', "C)c", 5,
! HF_DISP_3ROW|HF_APPENDENTRY|HF_ADD_COMMA|HF_ONPRE_SENDMENU|
! HF_USE_EXP_ADDRESS,
inpval_cc, expval_cc, hdrproc_cc },
! { 'b', "B)cc", 8, HF_DISP_2ROW|HF_APPENDENTRY|
! HF_ADD_COMMA|HF_ONPRE_SENDMENU|
! HF_USE_EXP_ADDRESS,
inpval_bcc, expval_bcc, hdrproc_bcc },
{ 's', "S)ubject", 10, HF_DISP_2ROW|HF_ONPRE_SENDMENU,
inpval_subject, expval_subject, hdrproc_subject },
! { 'r', "R)eply-to", 12, HF_DISP_1ROW|HF_USE_EXP_ADDRESS,
inpval_reply_to, expval_reply_to, hdrproc_reply_to },
{ 'a', "A)ction", 13, HF_DISP_LEFT,
inpval_action, expval_action, hdrproc_action },
***************
*** 422,428 ****

{ 'u', NULL, 17, HF_DISP_1ROW|HF_PROMPT_USR,
inpval_userhdr, expval_userhdr, hdrproc_userhdr },
! { 'f', "F)rom", -1, 0,
inpval_from, expval_from, hdrproc_from },
{ -1, NULL, -1, -1, NULL, NULL, NULL },
};
--- 524,530 ----

{ 'u', NULL, 17, HF_DISP_1ROW|HF_PROMPT_USR,
inpval_userhdr, expval_userhdr, hdrproc_userhdr },
! { 'f', "F)rom", -1, HF_USE_EXP_ADDRESS,
inpval_from, expval_from, hdrproc_from },
{ -1, NULL, -1, -1, NULL, NULL, NULL },
};
***************
*** 472,488 ****
1 if found
REDRAW_MARK is redraw required
*/
! int presend_action(headers,mailer_info,c,hdr_charset,aview,page,
prompt_area, parent_message,show_prehdr_mode)
! struct mailing_headers *headers;
! struct mailer_info *mailer_info;
! int c;
! charset_t hdr_charset;
! struct AliasView *aview;
! struct menu_context *page;
! struct menu_context *prompt_area;
! struct header_rec *parent_message;
! enum show_presend_mode show_prehdr_mode;
{
struct hdr_menu_item *h;
int LINES, COLUMNS;
--- 574,592 ----
1 if found
REDRAW_MARK is redraw required
*/
! int presend_action(headers,mail