--- fvwm-2.2.4/extras/FvwmTaskBar/Goodies.c.jtl	Tue Nov 30 08:58:15 1999
+++ fvwm-2.2.4/extras/FvwmTaskBar/Goodies.c	Thu Apr 27 01:48:28 2000
@@ -62,11 +62,12 @@
 				Clength+10)==0) {
     BellVolume = atoi(&tline[Clength+11]);
   } else if(strncasecmp(tline,CatString3(Module, "Mailbox",""),
-				Clength+11)==0) {
-    if (strncasecmp(&tline[Clength+11], "None", 4) == 0) {
+				Clength+7)==0) {
+    if (strncasecmp(&tline[Clength+8], "None", 4) == 0) {
       NoMailCheck = True;
     } else {
       UpdateString(&mailpath, &tline[Clength+8]);
+      mailpath[strlen(mailpath)-1] = 0;
     }
   } else if(strncasecmp(tline,CatString3(Module, "ClockFormat",""),
 			  Clength+11)==0) {
--- fvwm-2.2.4/extras/FvwmTaskBar/FvwmTaskBar.c.jtl	Mon Nov 29 09:04:01 1999
+++ fvwm-2.2.4/extras/FvwmTaskBar/FvwmTaskBar.c	Thu Apr 27 01:08:46 2000
@@ -775,6 +775,8 @@
 
     switch(Event.type) {
       case ButtonRelease:
+        StartButtonUpdate(NULL, BUTTON_UP);
+        redraw = 0;
         num = WhichButton(&buttons, Event.xbutton.x, Event.xbutton.y);
         if (num != -1) {
           ButReleased = ButPressed; /* Avoid race fvwm pipe */
@@ -804,7 +806,7 @@
             y = win_y - ScreenHeight;
           }
           sprintf(tmp,"Popup %s %d %d", StartPopup, x, y);
-          SendFvwmPipe(tmp, ItemID(&windows, num));
+          SendFvwmPipe(tmp, None);
         } else if (MouseInMail(Event.xbutton.x, Event.xbutton.y)) {
            HandleMailClick(Event);
 	} else {