diff --git a/lib/WeBWorK/ContentGenerator/Feedback.pm b/lib/WeBWorK/ContentGenerator/Feedback.pm
index 2082d978b2..3ba1af90d6 100644
--- a/lib/WeBWorK/ContentGenerator/Feedback.pm
+++ b/lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -143,16 +143,11 @@ sub initialize ($c) {
 
 		my $systemURL = $c->url_for('root')->to_abs;
 
-		my $msg = qq/This  message was automatically generated by the WeBWorK
-system at $systemURL, in response to a request from $remote_host:$remote_port.
-
-Click this link to see the page from which the user sent feedback:
-$emailableURL
-
-/;
+		my $msg = sprintf("Message from %s (%s) via WeBWorK at\n%s\n\n", $user->full_name, $user->user_id, $systemURL);
+		$msg .= "To visit the page from which the user sent feedback, go to:\n$emailableURL\n\n";
 
 		if ($feedback) {
-			$msg .= qq/***** The feedback message: *****\n\n\n$feedback\n\n\n/;
+			$msg .= sprintf("%s (%s) wrote:\n\n\n%s\n\n\n", $user->full_name, $user->user_id, $feedback);
 		}
 		if ($problem and $verbosity >= 1) {
 			$msg .=
@@ -172,6 +167,7 @@ $emailableURL
 		if ($user && $verbosity >= 1) {
 			$msg .= "***** Data about the user: *****\n\n";
 			$msg .= $c->format_user($user) . "\n";
+			$msg .= "$remote_host:$remote_port\n";
 		}
 
 		if ($problem && $verbosity >= 1) {