Changes to support Debian Wheezy and Dovecot 2