--- loncom/interface/lonmsg.pm	2003/06/20 14:55:01	1.55
+++ loncom/interface/lonmsg.pm	2003/06/23 22:25:14	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.55 2003/06/20 14:55:01 bowersj2 Exp $
+# $Id: lonmsg.pm,v 1.56 2003/06/23 22:25:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -839,14 +839,14 @@ $content{'sendername'},$content{'senderd
          $r->print('Sending critical: '.
                 &user_crit_msg($content{'sendername'},
                                  $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'},
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
                                  $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($content{'sendername'},
                                  $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'}));
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
       }
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
@@ -930,18 +930,18 @@ $content{'sendername'},$content{'senderd
       }
     foreach (keys %toaddr) {
       my ($recuname,$recdomain)=split(/\:/,$_);
-      my $msgtxt=$ENV{'form.message'};
+      my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
       if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
          $r->print('Sending critical: '.
                 &user_crit_msg($recuname,$recdomain,
-                                 $ENV{'form.subject'},
+               &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $msgtxt,
                                  $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
-                                 $ENV{'form.subject'},
+              &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $msgtxt,
                                  $content{'citation'}));
       }