diff --git a/apps/email_common.h b/apps/email_common.h
index b8aa1b9..9d3f304 100644
--- a/apps/email_common.h
+++ b/apps/email_common.h
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#define PROGNAME "emai//er v2.1.8"
+#define PROGNAME "emai//er v2.1.9"
 
 // Configuration params from EMAIL.CFG
 char cfg_server[40];         // IP of POP3 server
diff --git a/apps/rebuild.c b/apps/rebuild.c
index c887258..d88a0f6 100644
--- a/apps/rebuild.c
+++ b/apps/rebuild.c
@@ -163,6 +163,9 @@ void repair_mailbox(void) {
   }
   fclose(fp);
 
+  maxemailnum = 0;
+  minemailnum = 65535;
+
   printf("** Scanning directory %s\n", dirname);
 
   while (d = readdir(dp)) {