--- courier-imap-4.3.1/imap/imapd-ssl.dist.in.p3	2008-04-28 00:44:35 +1100
+++ courier-imap-4.3.1/imap/imapd-ssl.dist.in	2008-04-28 00:44:35 +1100
@@ -41,23 +41,23 @@ SSLPORT=993
 #
 #  Address to listen on, can be set to a single IP address.
 #
-# SSLADDRESS=127.0.0.1
+# SSLADDRESS=0
 
-SSLADDRESS=0
+SSLADDRESS=127.0.0.1
 
 ##NAME: SSLPIDFILE:0
 #
 # That's the SSL IMAP port we'll listen on.
 # Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP.
 
-SSLPIDFILE=@piddir@/imapd-ssl.pid
+SSLPIDFILE=@piddir@/courier-imaps.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imaps init-script
 #
 
-SSLLOGGEROPTS="-name=imapd-ssl"
+SSLLOGGEROPTS=""
 
 ##NAME: IMAPDSSLSTART:0
 #
@@ -72,7 +72,7 @@ SSLLOGGEROPTS="-name=imapd-ssl"
 #
 #  Whether or not to start IMAP over SSL on simap port:
 
-IMAPDSSLSTART=NO
+IMAPDSSLSTART=YES
 
 ##NAME: IMAPDSTARTTLS:0
 #
@@ -102,7 +102,7 @@ IMAP_TLS_REQUIRED=0
 ##NAME: COURIERTLS:0
 #
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 # 
--- courier-imap-4.3.1/imap/imapd.cnf.gnutls.p3	2007-11-05 06:49:58 +1000
+++ courier-imap-4.3.1/imap/imapd.cnf.gnutls	2008-04-28 00:48:28 +1100
@@ -1,8 +1,7 @@
 organization = "Courier Mail Server"
 unit = "Automatically-generated IMAP SSL key"
-locality = "New York"
-state = "NY"
-country = US
+locality = "Net"
+country = RU
 cn = "localhost"
 serial = 001
 expiration_days = 365
--- courier-imap-4.3.1/imap/imapd.cnf.openssl.in.p3	2007-11-05 06:49:58 +1000
+++ courier-imap-4.3.1/imap/imapd.cnf.openssl.in	2008-04-28 00:48:36 +1100
@@ -1,5 +1,5 @@
 
-RANDFILE = @mydatadir@/imapd.rand
+RANDFILE = @localstatedir@/ssl/certs/imapd.rand
 
 [ req ]
 default_bits = 1024
@@ -9,9 +9,8 @@ x509_extensions = cert_type
 prompt = no
 
 [ req_dn ]
-C=US
-ST=NY
-L=New York
+C=RU
+L=Net
 O=Courier Mail Server
 OU=Automatically-generated IMAP SSL key
 CN=localhost
--- courier-imap-4.3.1/imap/imapd.dist.in.p3	2008-04-28 00:44:35 +1100
+++ courier-imap-4.3.1/imap/imapd.dist.in	2008-04-28 00:44:35 +1100
@@ -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
 #
@@ -75,10 +75,10 @@ TCPDOPTS="-nodnslookup -noidentlookup"
 
 ##NAME: LOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imapd init-script
 #
 
-LOGGEROPTS="-name=imapd"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #
@@ -214,7 +214,7 @@ IMAP_DISABLETHREADSORT=0
 # server.
 #
 
-IMAP_CHECK_ALL_FOLDERS=0
+IMAP_CHECK_ALL_FOLDERS=1
 
 ##NAME: IMAP_OBSOLETE_CLIENT:0
 #
@@ -262,7 +262,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
 #
@@ -321,7 +321,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
 #
@@ -334,7 +334,7 @@ IMAP_EMPTYTRASH=Trash:7
 # not affected.
 #
 
-IMAP_MOVE_EXPUNGE_TO_TRASH=0
+IMAP_MOVE_EXPUNGE_TO_TRASH=1
 
 
 ##NAME: OUTBOX:0
@@ -407,7 +407,7 @@ HEADERFROM=X-IMAP-Sender
 # The default setting is going to be NO, so you'll have to manually flip
 # it to yes.
 
-IMAPDSTART=NO
+IMAPDSTART=YES
 
 ##NAME: MAILDIRPATH:0
 #
--- courier-imap-4.3.1/imap/pop3d-ssl.dist.in.p3	2008-04-28 00:44:35 +1100
+++ courier-imap-4.3.1/imap/pop3d-ssl.dist.in	2008-04-28 00:44:35 +1100
@@ -41,27 +41,27 @@ SSLPORT=995
 #
 #  Address to listen on, can be set to a single IP address.
 #
-# SSLADDRESS=127.0.0.1
+# SSLADDRESS=0
 
-SSLADDRESS=0
+SSLADDRESS=127.0.0.1
 
 ##NAME: SSLPIDFILE:0
 #
 
-SSLPIDFILE=@piddir@/pop3d-ssl.pid
+SSLPIDFILE=@piddir@/courier-pop3s.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-pop3s init-script
 #
 
-SSLLOGGEROPTS="-name=pop3d-ssl"
+SSLLOGGEROPTS=""
 
 ##NAME: POP3DSSLSTART:0
 #
 #  Whether or not to start POP3 over SSL on spop3 port:
 
-POP3DSSLSTART=NO
+POP3DSSLSTART=YES
 
 ##NAME: POP3_STARTTLS:0
 #
@@ -87,7 +87,7 @@ POP3_TLS_REQUIRED=0
 # at your own risk.  Only the basic SSL/TLS functionality is known to be
 # working. Keep this in mind as you play with the following variables.
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 # 
--- courier-imap-4.3.1/imap/pop3d.cnf.gnutls.p3	2008-04-28 00:47:54 +1100
+++ courier-imap-4.3.1/imap/pop3d.cnf.gnutls	2008-04-28 00:48:45 +1100
@@ -1,8 +1,7 @@
 organization = "Courier Mail Server"
 unit = "Automatically-generated POP3 SSL key"
-locality = "New York"
-state = "NY"
-country = US
+locality = "Net"
+country = RU
 cn = "localhost"
 serial = 001
 expiration_days = 365
--- courier-imap-4.3.1/imap/pop3d.cnf.openssl.in.p3	2007-11-05 06:49:58 +1000
+++ courier-imap-4.3.1/imap/pop3d.cnf.openssl.in	2008-04-28 00:48:50 +1100
@@ -1,5 +1,5 @@
 
-RANDFILE = @mydatadir@/pop3d.rand
+RANDFILE = @localstatedir@/ssl/certs/pop3d.rand
 
 [ req ]
 default_bits = 1024
@@ -9,9 +9,8 @@ x509_extensions = cert_type
 prompt = no
 
 [ req_dn ]
-C=US
-ST=NY
-L=New York
+C=RU
+L=Net
 O=Courier Mail Server
 OU=Automatically-generated POP3 SSL key
 CN=localhost
--- courier-imap-4.3.1/imap/pop3d.dist.in.p3	2008-04-28 00:44:35 +1100
+++ courier-imap-4.3.1/imap/pop3d.dist.in	2008-04-28 00:44:35 +1100
@@ -13,7 +13,7 @@
 ##NAME: PIDFILE:0
 #
 
-PIDFILE=@piddir@/pop3d.pid
+PIDFILE=@piddir@/courier-pop3d.pid
 
 ##NAME: MAXDAEMONS:0
 #
@@ -93,7 +93,7 @@ PORT=110
 #
 # IP address to listen on.  0 means all IP addresses.
 
-ADDRESS=0
+ADDRESS=127.0.0.1
 
 ##NAME: TCPDOPTS:0
 #
@@ -104,10 +104,10 @@ TCPDOPTS="-nodnslookup -noidentlookup"
 
 ##NAME: LOGGEROPTS:0
 #
-# courierlogger(1) options.
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-pop3d init-script
 #
 
-LOGGEROPTS="-name=pop3d"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #
@@ -137,7 +137,7 @@ LOGGEROPTS="-name=pop3d"
 # with enough platforms so that people get annoyed with having to flip it to
 # YES every time.
 
-POP3DSTART=NO
+POP3DSTART=YES
 
 ##NAME: MAILDIRPATH:0
 #