See the upgrade notes at http://wiki2.dovecot.org/Upgrading/2.1 - you will probably need to merge updates to 10-mail.conf.