--- loncom/interface/lonmsg.pm	2003/03/17 16:55:06	1.42.2.1
+++ loncom/interface/lonmsg.pm	2002/12/23 18:02:44	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.42.2.1 2003/03/17 16:55:06 albertel Exp $
+# $Id: lonmsg.pm,v 1.43 2002/12/23 18:02:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,23 +47,21 @@ package Apache::lonmsg;
 use strict;
 use Apache::lonnet();
 use vars qw($msgcount);
-use HTML::TokeParser();
+use HTML::TokeParser;
 use Apache::Constants qw(:common);
-use Apache::loncommon();
-use Apache::lontexconvert();
-use HTML::Entities();
+use Apache::loncommon;
+use Apache::lontexconvert;
 
 # ===================================================================== Package
 
 sub packagemsg {
     my ($subject,$message,$citation)=@_;
-#    $message=~s/\</\&lt\;/g;
-#    $message=~s/\>/\&gt\;/g;
-    $message =&HTML::Entities::encode($message);
-    $citation=&HTML::Entities::encode($citation);
-    $subject =&HTML::Entities::encode($subject);
-#    $subject=~s/\</\&lt\;/g;
-#    $subject=~s/\>/\&gt\;/g;
+    $message=~s/\</\&lt\;/g;
+    $message=~s/\>/\&gt\;/g;
+    $citation=~s/\</\&lt\;/g;
+    $citation=~s/\>/\&gt\;/g;
+    $subject=~s/\</\&lt\;/g;
+    $subject=~s/\>/\&gt\;/g;
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -624,6 +622,8 @@ $content{'sendername'},$content{'senderd
              '"><b>Forward</b></a></td>'.
         '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
              '"><b>Mark Unread</b></a></td>'.
+        '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).
+             '"><b>Delete</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.
              &Apache::lontexconvert::msgtexconverted($content{'message'}).