diff --git a/.config/zz-docker.config.php b/.config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/.config/zz-docker.config.php
+++ b/.config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2020.09/apache/config/zz-docker.config.php b/2020.09/apache/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2020.09/apache/config/zz-docker.config.php
+++ b/2020.09/apache/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2020.09/fpm-alpine/config/zz-docker.config.php b/2020.09/fpm-alpine/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2020.09/fpm-alpine/config/zz-docker.config.php
+++ b/2020.09/fpm-alpine/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2020.09/fpm/config/zz-docker.config.php b/2020.09/fpm/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2020.09/fpm/config/zz-docker.config.php
+++ b/2020.09/fpm/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.01/apache/config/zz-docker.config.php b/2021.01/apache/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.01/apache/config/zz-docker.config.php
+++ b/2021.01/apache/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.01/fpm-alpine/config/zz-docker.config.php b/2021.01/fpm-alpine/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.01/fpm-alpine/config/zz-docker.config.php
+++ b/2021.01/fpm-alpine/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.01/fpm/config/zz-docker.config.php b/2021.01/fpm/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.01/fpm/config/zz-docker.config.php
+++ b/2021.01/fpm/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-dev/apache/config/zz-docker.config.php b/2021.03-dev/apache/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-dev/apache/config/zz-docker.config.php
+++ b/2021.03-dev/apache/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-dev/fpm-alpine/config/zz-docker.config.php b/2021.03-dev/fpm-alpine/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-dev/fpm-alpine/config/zz-docker.config.php
+++ b/2021.03-dev/fpm-alpine/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-dev/fpm/config/zz-docker.config.php b/2021.03-dev/fpm/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-dev/fpm/config/zz-docker.config.php
+++ b/2021.03-dev/fpm/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-rc/apache/config/zz-docker.config.php b/2021.03-rc/apache/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-rc/apache/config/zz-docker.config.php
+++ b/2021.03-rc/apache/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-rc/fpm-alpine/config/zz-docker.config.php b/2021.03-rc/fpm-alpine/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-rc/fpm-alpine/config/zz-docker.config.php
+++ b/2021.03-rc/fpm-alpine/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;
diff --git a/2021.03-rc/fpm/config/zz-docker.config.php b/2021.03-rc/fpm/config/zz-docker.config.php
index 2d5835d..49ca5bd 100644
--- a/2021.03-rc/fpm/config/zz-docker.config.php
+++ b/2021.03-rc/fpm/config/zz-docker.config.php
@@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
 	}
 }
 
+if (!empty(getenv('SMTP_DOMAIN'))) {
+	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
+
+	$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
+}
+
 return $config;