--- config/conf.pl.orig	Mon Nov 15 23:22:46 2004
+++ config/conf.pl	Tue Nov 23 14:57:15 2004
@@ -1099,6 +1099,7 @@
     print "    uw         = University of Washington's IMAP server\n";
     print "    exchange   = Microsoft Exchange IMAP server\n";
     print "    courier    = Courier IMAP server\n";
+    print "    dovecot    = Dovecot IMAP server\n";
     print "    macosx     = Mac OS X Mailserver\n";
     print "    other      = Not one of the above servers\n";
     print "[$WHT$imap_server_type$NRM]: $WHT";
@@ -1432,6 +1433,8 @@
         # add the trailing delimiter only if we know what the server is.
         if (($imap_server_type eq 'cyrus' and
                   $optional_delimiter eq 'detect') or
+                 ($imap_server_type eq 'dovecot' and
+                  $optional_delimiter eq 'detect') or
                  ($imap_server_type eq 'courier' and
                   $optional_delimiter eq 'detect')) {
            $new_default_folder_prefix =~ s/\.*$/\./;
@@ -3004,6 +3007,7 @@
         print "    uw         = University of Washington's IMAP server\n";
         print "    exchange   = Microsoft Exchange IMAP server\n";
         print "    courier    = Courier IMAP server\n";
+        print "    dovecot    = Dovecot IMAP server\n";
         print "    macosx     = Mac OS X Mailserver\n";
         print "    quit       = Do not change anything\n";
         print "Command >> ";
@@ -3059,6 +3063,20 @@
             $draft_folder                   = "Drafts";
             $show_prefix_option             = false;
             $default_sub_of_inbox           = false;
+            $show_contain_subfolders_option = false;
+            $optional_delimiter             = ".";
+            $disp_default_folder_prefix     = $default_folder_prefix;
+            $delete_folder                  = true;
+            
+            $continue = 1;
+        } elsif ( $server eq "dovecot" ) {
+            $imap_server_type               = "dovecot";
+            $default_folder_prefix          = "";
+            $trash_folder                   = "Trash";
+            $sent_folder                    = "Sent";
+            $draft_folder                   = "Drafts";
+            $show_prefix_option             = true;
+            $default_sub_of_inbox           = true;
             $show_contain_subfolders_option = false;
             $optional_delimiter             = ".";
             $disp_default_folder_prefix     = $default_folder_prefix;