--- a/dovecot-example.conf	Mon Jul 02 17:35:31 2007 +0300
+++ b/dovecot-example.conf	Mon Jul 02 17:52:05 2007 +0300
@@ -334,13 +334,6 @@
 # new users aren't allowed to log in.
 #max_mail_processes = 1024
 
-# Maximum number of connections allowed for a user. The limits are enforced
-# separately for IMAP and POP3 connections, so you can move this setting
-# inside protocol {} to have separate settings for them. NOTE: The user names
-# are compared case-sensitively, so make sure your userdb returns usernames
-# always using the same casing so users can't bypass this limit!
-#mail_max_user_connections = 10
-
 # Set max. process size in megabytes. Most of the memory goes to mmap()ing
 # files, so it shouldn't harm much even if this limit is set pretty high.
 #mail_process_size = 256
@@ -530,6 +523,10 @@
   # "Too long argument" or "IMAP command line too large" errors often.
   #imap_max_line_length = 65536
 
+  # Maximum number of POP3 connections allowed for a user from each IP address.
+  # NOTE: The username is compared compared case-sensitively.
+  #mail_max_userip_connections = 10
+
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
   #mail_plugins = 
@@ -637,6 +634,10 @@
   #  %s - mailbox size in bytes (before deletion)
   #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s
 
+  # Maximum number of IMAP connections allowed for a user from each IP address.
+  # NOTE: The username is compared compared case-sensitively.
+  #mail_max_userip_connections = 3
+
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
   #mail_plugins =