--- a/lib/vpwentry/vpwentry.h	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/vpwentry/vpwentry.h	Sun Jan 20 00:22:09 2008 +0100
@@ -15,10 +15,12 @@
   bool from_ver2_record(const mystring& text);
   bool from_old_record(const mystring& text);
   
+  void set_defaults(bool ctime_now, bool set_flags);
+
 public:
   mystring name;
   mystring pass;
-  mystring mailbox;
+  mystring directory;
   mystring forwards;
   mystring personal;
   unsigned hardquota;
@@ -27,11 +29,18 @@
   unsigned msgcount;
   unsigned ctime;
   unsigned expiry;
+  bool has_mailbox;
   bool is_mailbox_enabled;
   // keystrlist data;
   
+private:
   vpwentry();
-  vpwentry(const mystring&, const mystring&, const mystring&, const mystring&);
+
+public:
+  static vpwentry* new_from_record(const mystring& name, const mystring& text);
+  
+  vpwentry(const mystring&, const mystring&, const mystring&, const mystring&,
+	   bool);
   ~vpwentry();
 
   //mystring get(const mystring& var) const { return data.get(var); }
@@ -40,10 +49,8 @@
   //    return data.set(var, val);
   //  }
 
-  void set_defaults(bool ctime_now, bool set_flags);
+  bool authenticate(const mystring& phrase) const;
 
-  bool authenticate(const mystring& phrase) const;
-  
   bool from_record(const mystring& name, const mystring& text);
   mystring to_record() const;