diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 122127b2..72ca2eae 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -86,16 +86,17 @@ function rebuild_exim_with_socks {
     cp src/EDITME Local/Makefile
     sed -i 's|# SUPPORT_SOCKS|SUPPORT_SOCKS|g' Local/Makefile
     # TODO how to make this non-interactive
-    dpkg-source --commit . SOCKS
+    EDITOR=nano echo '\C-x' | dpkg-source --commit . SOCKS
     debuild -us -uc
     cd "$INSTALL_DIR/exim4" || exit 3468356
     mv exim4_${exim_version}-*.deb exim4_${exim_version}_all.deb
     if [ ! -f exim4_${exim_version}_all.deb ]; then
-        ls -l "$INSTALL_DIR/exim4/"*.deb
+        ls -l "$INSTALL_DIR/exim4/exim4_"*.deb
         echo "exim4_${exim_version}_all.deb not found"
         exit 63857368
     fi
     dpkg -i exim4_${exim_version}_all.deb
+    apt-get -yq remove --purge at
 }
 
 function email_create_template {