diff -up dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf.default-settings dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf
--- dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf.default-settings	2010-12-30 10:42:54.000000000 +0100
+++ dovecot-2.0.15/doc/example-config/conf.d/10-mail.conf	2011-10-06 15:22:23.891599837 +0200
@@ -267,6 +267,7 @@
 # them simultaneously.
 #mbox_read_locks = fcntl
 #mbox_write_locks = dotlock fcntl
+mbox_write_locks = fcntl
 
 # Maximum time to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 5 mins
diff -up dovecot-2.0.15/doc/example-config/conf.d/10-master.conf.default-settings dovecot-2.0.15/doc/example-config/conf.d/10-master.conf
--- dovecot-2.0.15/doc/example-config/conf.d/10-master.conf.default-settings	2011-10-06 15:25:19.361965665 +0200
+++ dovecot-2.0.15/doc/example-config/conf.d/10-master.conf	2011-10-06 16:59:08.209863733 +0200
@@ -17,6 +17,7 @@
 service imap-login {
   inet_listener imap {
     #port = 143
+    address = localhost # allow plain imap only on localhost
   }
   inet_listener imaps {
     #port = 993
@@ -38,6 +39,7 @@ service imap-login {
 service pop3-login {
   inet_listener pop3 {
     #port = 110
+    address = localhost # allow plain imap only on localhost
   }
   inet_listener pop3s {
     #port = 995