Merge remote-tracking branch 'origin/master'

diff --cc uip/spost.c
index b5fac1273907fa208aaaddd011a0cc7d1eae8cc3,ee70385e862840d5385fa902e98ee27ad810eddb..4d0b48a04c8955b34f14db5d966b4c261c783acf
--- 1/uip/spost.c
--- 2/uip/spost.c
+++ b/uip/spost.c
@@@ -421,9 -410,12 +418,11 @@@ putfmt(char *name, char *str, FILE *out
        */
  
        if (hdr->set & MFRM) {
 -
                struct mailname *mp = NULL;
+               struct mailname *my = NULL;
+               unsigned int fromcnt = 0;
  
 -              /* This is need because the addresse parser hold global state */
 +              /* needed because the address parser holds global state */
                ismymbox(NULL);
  
                while ((cp = getname(str)) != NULL) {