--- ../vpopmail-5.3.20-orig/vdelivermail.c	Fri Jun  6 14:56:02 2003
+++ vdelivermail.c	Sat Jul 12 15:34:39 2003
@@ -970,7 +970,10 @@
 
     if(!last) return "";
 
-    for( pnt = last + (strlen(DOMAINS_DIR)+2); (*pnt && *pnt != '/' && j < 255); ++pnt, ++j ) {
+    /* http://www.mail-archive.com/vchkpw@inter7.com/msg12401.html */
+    pnt = last + strlen(DOMAINS_DIR) + 2;
+    while( *(pnt+1) == '/' ) pnt+=2;
+    for( ; (*pnt && *pnt != '/' && j < 255); ++pnt, ++j ) {
       email[j] = *pnt;
     }