--- a/INSTALL	Fri Jan 28 11:03:11 2011 +0000
+++ b/INSTALL	Tue Feb 01 16:57:09 2011 +0000
@@ -116,7 +116,7 @@
     connect = host=localhost dbname=mailsys user=dovecot password=$Dovecot_PASS
     default_pass_scheme = PLAIN
     password_query = SELECT "user", password FROM dovecot_password WHERE "user"='%Lu' AND %Ls
-    user_query = SELECT home, uid, gid, 'maildir:'||mail AS mail FROM dovecot_user WHERE userid = '%Lu'
+    user_query = SELECT home, uid, gid, mail FROM dovecot_user WHERE userid = '%Lu'
 
 Provide a root SETUID copy of Dovecot's deliver agent for Postfix
 
@@ -136,7 +136,7 @@
 
     # Add Dovecot's deliver agent
     dovecot   unix  -       n       n       -       -       pipe
-      flags=DRhu user=nobody argv=/usr/local/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
+      flags=DORhu user=nobody argv=/usr/local/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}