diff --git a/.env.sample b/.env.sample
index 72e10fb..5f8862e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -42,8 +42,7 @@ SMTP_PORT=587
 SMTP_USER_NAME=foodsoft
 
 # incoming mail settings
-EMAIL_REPLY=foodsoft@example.org
-FOODSOFT_SMTP_ENABLED=1
+EMAIL_REPLY_DOMAIN=example.org
 SMTP_SERVER_HOST=order.example.org
 SMTP_SERVER_PORT=2525
 
diff --git a/app_config.yml.tmpl b/app_config.yml.tmpl
index 3f3a8d2..bed97f4 100644
--- a/app_config.yml.tmpl
+++ b/app_config.yml.tmpl
@@ -128,11 +128,8 @@ default: &defaults
   # email address to be used as from
   email_from: "{{ env "EMAIL_SENDER" }}"
 
-  # email address to be replied to by users
-  email_replyto: "{{ env "EMAIL_REPLY" }}"
-
   # domain to be used for reply emails
-  reply_email_domain: "{{ env "EMAIL_REPLY" }}"
+  reply_email_domain: "{{ env "EMAIL_REPLY_DOMAIN" }}"
 
   # If your foodcoop uses a mailing list instead of internal messaging system
   #mailing_list: list@example.org
@@ -142,8 +139,8 @@ default: &defaults
   notification:
     error_recipients:
       - "{{ env "EMAIL_ERROR" }}"
-    sender_address: "\"Foodsoft Error\" <{{ env "EMAIL_SENDER" }}>"
-    email_prefix: "[Foodsoft]"
+    sender_address: "\"Foodsoft error\" <{{ env "EMAIL_SENDER" }}>"
+    email_prefix: "[foodsoft] "
 
   # http config for this host to generate links in emails (uses environment config when not set)
   protocol: https
diff --git a/compose.yml b/compose.yml
index c1c97be..a37881e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,7 +23,7 @@ services:
     environment:
       - DOMAIN
       - EMAIL_ERROR
-      - EMAIL_REPLY
+      - EMAIL_REPLY_DOMAIN
       - EMAIL_SENDER
       - FOODCOOP_CITY
       - FOODCOOP_COUNTRY