--- loncom/interface/lonmsg.pm	2005/01/01 17:58:48	1.126
+++ loncom/interface/lonmsg.pm	2005/01/25 15:28:02	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.126 2005/01/01 17:58:48 www Exp $
+# $Id: lonmsg.pm,v 1.130 2005/01/25 15:28:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -590,7 +590,6 @@ sub makefolder {
 
 sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;
-    my $unmsgid=&Apache::lonnet::unescape($msgid);
     my $srcsuffix=&foldersuffix($srcfolder);
     my $trgsuffix=&foldersuffix($trgfolder);
 
@@ -599,16 +598,13 @@ sub movemsg {
     &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
 
 # Copy status
-    my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
-    &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
-# See if was deleted -> becomes "read" in trash
-    my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder);
-    if ($currentstatus eq 'deleted') {
-	&statuschange($msgid,'read',$trgfolder);
+    unless ($trgfolder eq 'trash') {
+	my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
+	&Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}});
     }
 # Delete orginals
     &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
-    &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
+    &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
 }
 
 # ======================================================= Display a course list
@@ -679,7 +675,7 @@ ENDDISHEADER
                       &Apache::loncoursedata::CL_FULLNAME(),
                       &Apache::loncoursedata::CL_SECTION()]);
         next if ($status ne 'Active');
-        my $key = 'send_to_&&&'.$section.'&&&'.$student;
+        my $key = 'send_to_&&&'.$section.'&&&_'.$student;
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
                   qq{<input type="checkbox" name="$key">}.('&nbsp;'x2).
@@ -707,9 +703,9 @@ sub discrit {
 $content{'sendername'}.'@'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
-            '<br /><blockquote>'.
+            '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote><small>'.
+            '</pre><small>'.
 &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
             '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
@@ -1242,9 +1238,9 @@ sub disfacetoface {
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
 $content{'sendername'}.'@'.
             $content{'senderdomain'}.') '.$content{'time'}.
-            '<br /><blockquote>'.
+            '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-	      '</blockquote>';
+	      '</pre>';
      }
     # Check to see if there were any messages.
     if ($result eq '') {