diff --git a/include/class.thread.php b/include/class.thread.php
index ce03a4a268cf2659eb934d39d759cc6038ec94b9..f800070225fd3012222260c29f5ebc4b2c054414 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -742,9 +742,10 @@ Class ThreadEntry {
         else {
             //XXX: Are we potentially leaking the email address to
             // collaborators?
-            $header = sprintf("Received From: %s\n\n", $mailinfo['email']);
+            $header = sprintf("Received From: %s <%s>\n\n", $mailinfo['name'],
+                $mailinfo['email']);
             if ($body instanceof HtmlThreadBody)
-                $header = nl2br($header);
+                $header = nl2br(Format::htmlchars($header));
             // Add the banner to the top of the message
             if ($body instanceof ThreadBody)
                 $body->prepend($header);