diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 98710ad8f9..6df4d9a7a1 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -8197,6 +8197,11 @@ function api_mail_html(
     }
 
     $mailView = new Template(null, false, false, false, false, false, false);
+
+    $noReply = api_get_setting('noreply_email_address');
+    if (!empty($noReply)) {
+        $message .= "<br />".get_lang('ThisIsAutomaticEmailNoReply');
+    }
     $mailView->assign('content', $message);
 
     if (isset($additionalParameters['link'])) {
diff --git a/main/inc/lib/notification.lib.php b/main/inc/lib/notification.lib.php
index bd3cdc6f7a..c65684897b 100644
--- a/main/inc/lib/notification.lib.php
+++ b/main/inc/lib/notification.lib.php
@@ -299,7 +299,8 @@ class Notification extends Model
                     case self::NOTIFY_INVITATION_AT_ONCE:
                     case self::NOTIFY_GROUP_AT_ONCE:
                         $extraHeaders = [];
-                        if (isset($senderInfo['email'])) {
+                        $noReply = api_get_setting('noreply_email_address');
+                        if (empty($noReply) && isset($senderInfo['email'])) {
                             $extraHeaders = array(
                                 'reply_to' => array(
                                     'name' => $senderInfo['complete_name'],