diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index eb225569..9ff7d320 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1163,9 +1163,7 @@ function image_setup_utils {
     chroot "$rootdir" apt-get -yq remove postfix
     chroot "$rootdir" apt-get -yq install exim4 exim4-daemon-heavy sasl2-bin swaks libnet-ssleay-perl procmail
     chroot "$rootdir" apt-get -yq install spamassassin
-    #chroot "$rootdir" apt-get -yq install dovecot-core dovecot-imapd
-
-    # TODO generate certs for exim and dovecot if needed on first boot
+    chroot "$rootdir" apt-get -yq install dovecot-imapd
 
     #backup
     chroot "$rootdir" apt-get -yq install obnam gnupg
@@ -1223,13 +1221,6 @@ function image_install_nodejs {
     fi
 }
 
-function image_install_email {
-    chroot "$rootdir" apt-get -yq remove postfix
-    chroot "$rootdir" apt-get -yq install exim4 sasl2-bin swaks
-    chroot "$rootdir" apt-get -yq install libnet-ssleay-perl procmail
-    chroot "$rootdir" apt-get -yq install dovecot-imapd
-}
-
 ##############################################################################
 
 
@@ -1410,7 +1401,6 @@ configure_user_interface
 image_setup_utils
 image_install_inadyn
 image_install_nodejs
-image_install_email
 
 # remove downloaded packages
 chroot $rootdir apt-get -y autoremove