diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 33db295d06f..b7cdece51a4 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -705,7 +705,7 @@ $string['emailresetconfirmsent'] = 'An email has been sent to your address at <b
 If you continue to have difficulty, contact the site administrator.';
 $string['emailtoprivatefiles'] = 'You can also e-mail files as attachments straight to your private files space. Simply attach your files to an e-mail and send it to {$a}';
 $string['emailtoprivatefilesdenied'] = 'Your administrator has disabled the option to upload your own private files.';
-$string['emailvia'] = '{$a->name} via {$a->url}';
+$string['emailvia'] = '{$a->name} (via {$a->siteshortname})';
 $string['emptydragdropregion'] = 'empty region';
 $string['enable'] = 'Enable';
 $string['encryptedcode'] = 'Encrypted code';
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index f6b88c42a04..f560d075055 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5796,7 +5796,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
         $mail->From = $from->email;
         $fromdetails = new stdClass();
         $fromdetails->name = fullname($from);
-        $fromdetails->url = $CFG->wwwroot;
+        $fromdetails->url = preg_replace('#^https?://#', '', $CFG->wwwroot);
+        $fromdetails->siteshortname = format_string($SITE->shortname);
         $fromstring = $fromdetails->name;
         if ($CFG->emailfromvia == EMAIL_VIA_ALWAYS) {
             $fromstring = get_string('emailvia', 'core', $fromdetails);
@@ -5809,7 +5810,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
         $mail->From = $noreplyaddress;
         $fromdetails = new stdClass();
         $fromdetails->name = fullname($from);
-        $fromdetails->url = $CFG->wwwroot;
+        $fromdetails->url = preg_replace('#^https?://#', '', $CFG->wwwroot);
+        $fromdetails->siteshortname = format_string($SITE->shortname);
         $fromstring = $fromdetails->name;
         if ($CFG->emailfromvia != EMAIL_VIA_NEVER) {
             $fromstring = get_string('emailvia', 'core', $fromdetails);