--- loncom/interface/lonmsg.pm	2006/04/08 06:53:37	1.180
+++ loncom/interface/lonmsg.pm	2006/04/23 04:04:38	1.182
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.180 2006/04/08 06:53:37 albertel Exp $
+# $Id: lonmsg.pm,v 1.182 2006/04/23 04:04:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,6 +188,8 @@ sub unpackmsgid {
     $msgid=&Apache::lonnet::unescape($msgid);
     my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
                      $processid)=split(/\:/,&Apache::lonnet::unescape($msgid));
+    $shortsubj = &Apache::lonnet::unescape($shortsubj);
+    $shortsubj = &HTML::Entities::decode($shortsubj);
     if (!defined($processid)) { $fromcid = ''; }
     my %status=();
     unless ($skipstatus) {
@@ -278,6 +280,8 @@ sub author_res_msg {
     my $homeserver=&Apache::lonnet::homeserver($author,$domain);
     if ($homeserver ne 'no_host') {
        my $id=unpack("%32C*",$message);
+       $message .= " <p>This error occurred on machine ".
+	   $Apache::lonnet::perlvar{'lonHostID'}."</p>";
        my $msgid;
        ($msgid,$message)=&packagemsg($filename,$message);
        return &Apache::lonnet::reply('put:'.$domain.':'.$author.