diff --git a/courier-imap/libs/imap/imapd.dist.in b/courier-imap/libs/imap/imapd.dist.in
index 57a6c6b..b6c1215 100644
--- a/courier-imap/libs/imap/imapd.dist.in
+++ b/courier-imap/libs/imap/imapd.dist.in
@@ -21,7 +21,7 @@
 #
 # ADDRESS=127.0.0.1
 
-ADDRESS=0
+ADDRESS=127.0.0.1
 
 ##NAME: PORT:1
 #
@@ -57,14 +57,14 @@ MAXDAEMONS=40
 #
 #  Maximum number of connections to accept from the same IP address
 
-MAXPERIP=4
+MAXPERIP=10
 
 ##NAME: PIDFILE:0
 #
 #  File where couriertcpd will save its process ID
 #
 
-PIDFILE=@piddir@/imapd.pid
+PIDFILE=@piddir@/courier-imapd.pid
 
 ##NAME: TCPDOPTS:0
 #
@@ -84,7 +84,7 @@ IMAPACCESSFILE=@sysconfdir@/imapaccess
 # courierlogger(1) options.
 #
 
-LOGGEROPTS="-name=imapd"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #
@@ -224,7 +224,7 @@ IMAP_DISABLETHREADSORT=0
 # server.
 #
 
-IMAP_CHECK_ALL_FOLDERS=0
+IMAP_CHECK_ALL_FOLDERS=1
 
 ##NAME: IMAP_OBSOLETE_CLIENT:0
 #
@@ -272,7 +272,7 @@ IMAP_ULIMITD=65536
 #
 # IMAP_USELOCKS=1 is strongly recommended when shared folders are used.
 
-IMAP_USELOCKS=1
+IMAP_USELOCKS=0
 
 ##NAME: IMAP_SHAREDINDEXFILE:0
 #
@@ -331,7 +331,7 @@ IMAP_TRASHFOLDERNAME=Trash
 # in a stat() of every file in each folder, at login and logout.
 #
 
-IMAP_EMPTYTRASH=Trash:7
+IMAP_EMPTYTRASH=Trash:30
 
 ##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0
 #
@@ -344,7 +344,7 @@ IMAP_EMPTYTRASH=Trash:7
 # not affected.
 #
 
-IMAP_MOVE_EXPUNGE_TO_TRASH=0
+IMAP_MOVE_EXPUNGE_TO_TRASH=1
 
 ##NAME: IMAP_LOG_DELETIONS:0
 #
diff --git a/courier-imap/libs/imap/pop3d.dist.in b/courier-imap/libs/imap/pop3d.dist.in
index 2be410c..2914436 100644
--- a/courier-imap/libs/imap/pop3d.dist.in
+++ b/courier-imap/libs/imap/pop3d.dist.in
@@ -13,7 +13,7 @@
 ##NAME: PIDFILE:0
 #
 
-PIDFILE=@piddir@/pop3d.pid
+PIDFILE=@piddir@/courier-pop3d.pid
 
 ##NAME: MAXDAEMONS:0
 #
@@ -26,7 +26,7 @@ MAXDAEMONS=40
 #
 #  Maximum number of connections to accept from the same IP address
 
-MAXPERIP=4
+MAXPERIP=10
 
 ##NAME: POP3AUTH:1
 #
@@ -93,7 +93,7 @@ PORT=110
 #
 # IP address to listen on.  0 means all IP addresses.
 
-ADDRESS=0
+ADDRESS=127.0.0.1
 
 ##NAME: AUTHSERVICE:0
 #
@@ -116,7 +116,7 @@ TCPDOPTS="-nodnslookup -noidentlookup"
 # courierlogger(1) options.
 #
 
-LOGGEROPTS="-name=pop3d"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #