diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions
--- cyrus-imapd-2.3.1.orig/lib/imapoptions	2005-12-13 20:36:11.000000000 +0100
+++ cyrus-imapd-2.3.1/lib/imapoptions	2006-01-13 10:17:26.000000000 +0100
@@ -198,9 +198,12 @@
    grant the user the ability to delete a mailbox.  If a user has this
    right, they will automatically be given the new 'x' right. */
 
-{ "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
+{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
 /* The cyrusdb backend to use for the duplicate delivery suppression
-   and sieve. */
+   and sieve.
+.PP
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
+   \fIberkeley-nosync\fR for \fBduplicate_db\fR. */
 
 { "duplicatesuppression", 1, SWITCH }
 /* If enabled, lmtpd will suppress delivery of a message to a mailbox if
@@ -220,12 +223,15 @@
    result in greater responsiveness for the client, especially when
    expunging a large number of messages. */
 
-{ "flushseenstate", 0, SWITCH }
+{ "flushseenstate", 1, SWITCH }
 /* If enabled, changes to the seen state will be flushed to disk
    immediately, otherwise changes will be cached and flushed when the
    mailbox is closed.  This option may be used to fix the problem of
    previously read messages being marked as unread in Microsoft
-   Outlook, at the expense of a loss of performance/scalability. */
+   Outlook, at the expense of a loss of performance/scalability.
+.PP
+   Note: This Invoca RPM build uses \fI1\fR by default instead of
+   \fI0\fR for \fBflushseenstate\fR. */
 
 { "foolstupidclients", 0, SWITCH }
 /* If enabled, only list the personal namespace when a LIST "*" is performed.
@@ -735,8 +741,11 @@
 /* Unix domain socket that ptloader listens on.
    (defaults to configdir/ptclient/ptsock) */
 
-{ "ptscache_db", "berkeley", STRINGLIST("berkeley", "skiplist") }
-/* The cyrusdb backend to use for the pts cache. */
+{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "skiplist") }
+/* The cyrusdb backend to use for the pts cache.
+.PP
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
+   \fIberkeley\fR for \fBptscache_db\fR. */
 
 { "ptscache_timeout", 10800, INT }
 /* The timeout (in seconds) for the PTS cache database when using the
@@ -813,9 +822,12 @@
 { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist") }
 /* The cyrusdb backend to use for the seen state. */
 
-{ "sendmail", "/usr/lib/sendmail", STRING }
+{ "sendmail", "/usr/sbin/sendmail", STRING }
 /* The pathname of the sendmail executable.  Sieve invokes sendmail
-   for sending rejections, redirects and vacation responses. */
+   for sending rejections, redirects and vacation responses.
+.PP
+   Note: This Invoca RPM build uses \fI/usr/sbin/sendmail\fR by default
+   instead of \fI/usr/lib/sendmail\fR for \fBsendmail\fR. */
 
 { "servername", NULL, STRING }
 /* This is the hostname visible in the greeting messages of the POP,
@@ -842,9 +854,12 @@
 /* Maximum number of sieve scripts any user may have, enforced at
    submission by timsieved(8). */
    
-{ "sievedir", "/usr/sieve", STRING }
+{ "sievedir", "/var/lib/imap/sieve", STRING }
 /* If sieveusehomedir is false, this directory is searched for Sieve
-   scripts. */
+   scripts.
+.PP
+   Note: This Invoca RPM build uses \fI/var/lib/imap/sieve\fR by default
+   instead of \fI/usr/sieve\fR for \fBsievedir\fR. */
 
 { "sievenotifier", NULL, STRING }
 /* Notifyd(8) method to use for "SIEVE" notifications.  If not set, "SIEVE"
@@ -934,8 +949,11 @@
    have filenames with the hashed value of the certificate (see
    openssl(XXX)). */
 
-{ "tlscache_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
-/* The cyrusdb backend to use for the TLS cache. */
+{ "tlscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "skiplist") }
+/* The cyrusdb backend to use for the TLS cache.
+.PP
+   Note: This Invoca RPM build uses \fIskiplist\fR by default instead of
+   \fIberkeley-nosync\fR for \fBtlscache_db\fR. */
 
 { "tls_cert_file", NULL, STRING }
 /* File containing the certificate presented for server authentication