*** print.c.orig	Mon Oct 31 18:14:45 2005
--- print.c	Mon Oct 31 19:48:10 2005
***************
*** 257,262 ****
--- 257,263 ----
    int num = email->msgnum;
    int loc_cmp = (pos == PAGE_BOTTOM ? 3 : 4);
    char *ptr;
+   char *id= (pos == PAGE_TOP) ? "option2" : "option3";
  
  #ifdef HAVE_ICONV
    int tmplen;
***************
*** 271,278 ****
    
  
    if (set_mailcommand && set_hmail) {
!     fprintf(fp, "<li><a name=\"options2\" id=\"options2\"></a><dfn>%s</dfn>:", 
! 	    lang[MSG_MAIL_ACTIONS]);
      if ((email->msgid && email->msgid[0]) || (email->subject && email->subject[0])) {
  #ifdef HAVE_ICONV
        ptr = makemailcommand(set_replymsg_command, set_hmail, email->msgid, tmpptr);
--- 272,279 ----
    
  
    if (set_mailcommand && set_hmail) {
!     fprintf(fp, "<li><a name=\"%s\" id=\"%s\"></a><dfn>%s</dfn>:", 
! 	    id,id,lang[MSG_MAIL_ACTIONS]);
      if ((email->msgid && email->msgid[0]) || (email->subject && email->subject[0])) {
  #ifdef HAVE_ICONV
        ptr = makemailcommand(set_replymsg_command, set_hmail, email->msgid, tmpptr);
***************
*** 298,304 ****
      fprintf (fp, "<li>");
      /* add the anchor if we didn't do so in the above block */
      if (!(set_mailcommand && set_hmail))
!       fprintf (fp, "<a name=\"options2\" id=\"options2\"></a>");
      fprintf(fp, "<dfn>%s</dfn>:", lang[MSG_CONTEMPORARY_MSGS_SORTED]);
      if (show_index[dlev][DATE_INDEX])
        fprintf(fp, " [ <a href=\"%s#%d\" title=\"%s\">%s</a> ]", 
--- 299,305 ----
      fprintf (fp, "<li>");
      /* add the anchor if we didn't do so in the above block */
      if (!(set_mailcommand && set_hmail))
!       fprintf (fp, "<a name=\"%s\" id=\"%s\"></a>",id,id);
      fprintf(fp, "<dfn>%s</dfn>:", lang[MSG_CONTEMPORARY_MSGS_SORTED]);
      if (show_index[dlev][DATE_INDEX])
        fprintf(fp, " [ <a href=\"%s#%d\" title=\"%s\">%s</a> ]", 
***************
*** 328,334 ****
    
    if (set_custom_archives && *set_custom_archives)
      fprintf(fp, "<li><dfn>%s</dfn>: %s</li>\n", lang[MSG_OTHER_MAIL_ARCHIVES], set_custom_archives);
!   fprintf (fp,"</ul>\n");
  #ifdef HAVE_ICONV
    if(tmpptr)
      free(tmpptr);
--- 329,339 ----
    
    if (set_custom_archives && *set_custom_archives)
      fprintf(fp, "<li><dfn>%s</dfn>: %s</li>\n", lang[MSG_OTHER_MAIL_ARCHIVES], set_custom_archives);
! 
!   if (!(set_show_msg_links && set_show_msg_links != loc_cmp)
!       || (set_show_index_links && set_show_index_links != loc_cmp)){
!     fprintf (fp,"</ul>\n");
!   }
  #ifdef HAVE_ICONV
    if(tmpptr)
      free(tmpptr);