diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 9bb1184b..83a633ac 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -307,6 +307,8 @@ function configure_email_onion {
 
     { echo "onion_relay:";
       echo "  driver = smtp";
+      echo "  helo_data = \"\$address_data \$original_domain\"";
+      echo "  hosts_avoid_tls = *";
       echo "  socks_proxy = 127.0.0.1 port=9050"; } > /etc/exim4/conf.d/transport/050_exim4-config_onion_relay
 
     if ! grep -q "AutomapHostsOnResolve" /etc/tor/torrc; then