--- pine/reply.c.orig	Fri Aug 29 14:43:38 2003
+++ pine/reply.c	Fri Sep  5 01:44:21 2003
@@ -5183,7 +5183,10 @@
 char *
 generate_message_id()
 {
-    static short osec = 0, cnt = 0;
+    struct timeval tp;
+    struct timezone tzp;
+    static short osec = 0;
+    static char cnt;
     char        *id;
     time_t       now;
     struct tm   *now_x;
@@ -5191,14 +5194,11 @@
 
     now   = time((time_t *)0);
     now_x = localtime(&now);
-    id    = (char *)fs_get(128 * sizeof(char));
+    id    = (char *)fs_get(384 * sizeof(char));
 
-    if(now_x->tm_sec == osec)
-      cnt++;
-    else{
-	cnt = 0;
-	osec = now_x->tm_sec;
-    }
+    cnt = 'A';
+    if(gettimeofday(&tp, &tzp) == 0)
+	cnt += (time_t)tp.tv_usec % ('Z' - 'A');
 
     hostpart = F_ON(F_ROT13_MESSAGE_ID, ps_global)
 		 ? rot13(ps_global->hostname)
@@ -5207,8 +5207,8 @@
     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,
+    sprintf(id,"<%d%02d%02d%02d%02d%02d.%c%d@%s>",
+	    (now_x->tm_year) + 1900, now_x->tm_mon + 1,
 	    now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec, 
 	    cnt, getpid(), hostpart);