diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index e44a380362..d97d1bf8a1 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1353,10 +1353,14 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
     }
 
     $showEmail = api_get_setting('show_email_addresses') === 'true';
-    if (!empty($user['email']) && $showEmail) {
-        $result['complete_name_with_email'] = $result['complete_name'].' ('.$user['email'].')';
+    if (!empty($user['email'])) {
+        $result['complete_name_with_email_forced'] = $result['complete_name'].' ('.$user['email'].')';
+        if ($showEmail) {
+            $result['complete_name_with_email'] = $result['complete_name'].' ('.$user['email'].')';
+        }
     } else {
         $result['complete_name_with_email'] = $result['complete_name'];
+        $result['complete_name_with_email_forced'] = $result['complete_name'];
     }
 
     // Kept for historical reasons
diff --git a/main/inc/lib/notification.lib.php b/main/inc/lib/notification.lib.php
index 1bafba73a2..41702f10ff 100644
--- a/main/inc/lib/notification.lib.php
+++ b/main/inc/lib/notification.lib.php
@@ -365,6 +365,14 @@ class Notification extends Model
         }
 
         $newMessageText = $linkToNewMessage = '';
+        $showEmail = api_get_configuration_value('show_user_email_in_notification');
+        $senderInfoName = '';
+        if (!empty($senderInfo)) {
+            $senderInfoName = $senderInfo['complete_name'];
+            if ($showEmail) {
+                $senderInfoName = $senderInfo['complete_name_with_email_forced'];
+            }
+        }
 
         switch ($this->type) {
             case self::NOTIFICATION_TYPE_DIRECT_MESSAGE:
@@ -382,7 +390,7 @@ class Notification extends Model
                 if (!empty($senderInfo)) {
                     $newMessageText = sprintf(
                         get_lang('YouHaveANewMessageFromX'),
-                        $senderInfo['complete_name_with_email']
+                        $senderInfoName
                     );
                 }
                 $linkToNewMessage = Display::url(
@@ -394,7 +402,7 @@ class Notification extends Model
                 if (!empty($senderInfo)) {
                     $newMessageText = sprintf(
                         get_lang('YouHaveANewInvitationFromX'),
-                        $senderInfo['complete_name_with_email']
+                        $senderInfoName
                     );
                 }
                 $linkToNewMessage = Display::url(
@@ -408,7 +416,7 @@ class Notification extends Model
                     $senderName = $senderInfo['group_info']['name'];
                     $newMessageText = sprintf(get_lang('YouHaveReceivedANewMessageInTheGroupX'), $senderName);
                     $senderName = Display::url(
-                        $senderInfo['complete_name_with_email'],
+                        $senderInfoName,
                         api_get_path(WEB_CODE_PATH).'social/profile.php?'.$senderInfo['user_info']['user_id']
                     );
                     $newMessageText .= '<br />'.get_lang('User').': '.$senderName;
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 716f24ad65..831c51b404 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -679,3 +679,5 @@ $_configuration['gradebook_badge_sidebar'] = [
 //$_configuration['session_multiple_subscription_students_list_avoid_emptying'] = false;
 // Disable the option to set course coach in session when editing course
 //$_configuration['disabled_edit_session_coaches_course_editing_course'] = false;
+// Show sender's email when receiving email notifications.
+//$_configuration['show_user_email_in_notification'] = false;