Merge branch 'mhshow-fixup'

diff --combined uip/mhn.c
index 3fd2d39c30886a172de4a6a9695876c806094bf8,a2733ad20691a18d7526d4275b29edf1e2248e82..7363688f32501681a6e06a5d0fb9418c2b02b99e
--- 1/uip/mhn.c
--- 2/uip/mhn.c
+++ b/uip/mhn.c
@@@ -119,9 -119,6 +119,6 @@@ int part_ok (CT, int)
  int type_ok (CT, int);
  void flush_errors (void);
  
- /* mhshowsbr.c */
- void show_all_messages (CT *);
- 
  /* mhstoresbr.c */
  typedef struct mhstoreinfo *mhstoreinfo_t;
  mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
@@@ -545,14 -542,6 +542,14 @@@ do_cache
        mhstoreinfo_free (info);
      }
  
 +    /* If reading from a folder, do some updating */
 +    if (mp) {
 +      context_replace (pfolder, folder);/* update current folder  */
 +      seq_setcur (mp, mp->hghsel);      /* update current message */
 +      seq_save (mp);                    /* synchronize sequences  */
 +      context_save ();                  /* save the context file  */
 +    }
 +
      /*
       * Cache the message content
       */
@@@ -563,7 -552,7 +560,7 @@@
       * Show the message content
       */
      if (showsw)
-       show_all_messages (cts);
+       show_all_messages (cts, 0, 0, 0, NULL);
  
      /* Now free all the structures for the content */
      for (ctp = cts; *ctp; ctp++)
@@@ -572,6 -561,14 +569,6 @@@
      free (cts);
      cts = NULL;
  
 -    /* If reading from a folder, do some updating */
 -    if (mp) {
 -      context_replace (pfolder, folder);/* update current folder  */
 -      seq_setcur (mp, mp->hghsel);      /* update current message */
 -      seq_save (mp);                    /* synchronize sequences  */
 -      context_save ();                  /* save the context file  */
 -    }
 -
      done (0);
      return 1;
  }