diff -r 30113bfbe723 -r b3afb9f1e801 lib/vpwentry/from_old.cc
--- a/lib/vpwentry/from_old.cc	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/vpwentry/from_old.cc	Sun Jan 20 00:22:09 2008 +0100
@@ -28,13 +28,15 @@
   pass = text.sub(1, end-passptr);
   ++end;
   if(*end == '.' || *end == '/') {
-    mailbox = end;
+    has_mailbox = true;
+    directory = end;
     forwards = 0;
   }
   else {
     if(*end == '&')
       ++end;
-    mailbox = 0;
+    has_mailbox = false;
+    directory = 0;
     forwards = end;
     forwards = forwards.subst(',', '\0');
   }