--- loncom/interface/lonmsg.pm	2006/12/24 22:13:19	1.191
+++ loncom/interface/lonmsg.pm	2006/12/28 18:47:15	1.194
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.191 2006/12/24 22:13:19 raeburn Exp $
+# $Id: lonmsg.pm,v 1.194 2006/12/28 18:47:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,6 +191,7 @@ sub unpackagemsg {
 sub buildmsgid {
     my ($now,$subject,$uname,$udom,$msgcount,$course_context,$symb,$error,$pid) = @_;
     $subject=&escape($subject);
+    $symb = &escape($symb);
     return(&escape($now.':'.$subject.':'.$uname.':'.
            $udom.':'.$msgcount.':'.$course_context.':'.$pid.':'.$symb.':'.$error));
 }
@@ -202,6 +203,7 @@ sub unpackmsgid {
         $processid,$symb,$error) = split(/\:/,&unescape($msgid));
     $shortsubj = &unescape($shortsubj);
     $shortsubj = &HTML::Entities::decode($shortsubj);
+    $symb = &unescape($symb);
     if (!defined($processid)) { $fromcid = ''; }
     my %status=();
     unless ($skipstatus) {
@@ -244,7 +246,7 @@ sub sendemail {
 # ==================================================== Send notification emails
 
 sub sendnotification {
-    my ($to,$touname,$toudom,$subj,$crit,$text)=@_;
+    my ($to,$touname,$toudom,$subj,$crit,$text,$msgid)=@_;
     my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
     unless ($sender=~/\w/) { 
 	$sender=$env{'user.name'}.'@'.$env{'user.domain'};
@@ -256,21 +258,36 @@ sub sendnotification {
     my $url='http://'.
       $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
       '/adm/email?username='.$touname.'&domain='.$toudom;
-    my $body=(<<ENDMSG);
-You received a$critical message from $sender in LON-CAPA. The subject is
+    my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
+        $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+    my $coursetext;
+    if ($fromcid ne '') {
+        $coursetext = "\n".&mt('Course').': ';
+        if ($env{'course.'.$fromcid.'.description'} ne '') {
+            $coursetext .= $env{'course.'.$fromcid.'.description'};
+        } else {
+            my %coursehash = &Apache::lonnet::coursedescription($fromcid,);
+            if ($coursehash{'description'} ne '') {
+                $coursetext .= $coursehash{'description'};
+            }
+        }
+        $coursetext .= "\n\n";
+    }
+    my $body = $coursetext. 
+               &mt('You received a[_1] message from '.$sender.' in LON-CAPA.',$critical).' '.&mt("The subject is 
 
  $subj
 
-=== Excerpt ============================================================
+")."\n".
+'=== '.&mt('Excerpt')." ============================================================
 $text
 ========================================================================
 
-Use
+".&mt("Use 
 
  $url
 
-to access the full message.
-ENDMSG
+to access the full message.");
     &sendemail($to,'New'.$critical.' message from '.$sender,$body);
 }
 # ============================================================= Check for email
@@ -405,10 +422,14 @@ sub user_crit_msg_raw {
         if (defined($sentmessage)) {
             $$sentmessage = $packed_message;
         }
-        (undef,my $packed_message_no_citation) =
+        if ($env{'request.course.id'} eq '') {
+            (undef,my $packed_message_no_citation) =
             &packagemsg($subject,$message,undef,undef,undef,$user,$domain,
                         $msgid);
-        $status .= &store_sent_mail($msgid,$packed_message_no_citation);
+            if ($status eq 'ok' || $status eq 'con_delayed') {
+                &store_sent_mail($msgid,$packed_message_no_citation);
+            }
+        }
     } else {
        $status='no_host';
     }
@@ -417,11 +438,11 @@ sub user_crit_msg_raw {
     my %userenv = &Apache::loncommon::getemails($user,$domain);
     if ($userenv{'critnotification'}) {
       &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1,
-			$text);
+			$text,$msgid);
     }
     if ($toperm && $userenv{'permanentemail'}) {
       &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,1,
-			$text);
+			$text,$msgid);
     }
 # Log this
     &Apache::lonnet::logthis(
@@ -538,7 +559,9 @@ sub user_normal_msg_raw {
            (undef,my $packed_message_no_citation) =
                &packagemsg($subject,$message,undef,$baseurl,$attachmenturl,
                            $user,$domain,$currid,undef,$crsmsgid,$symb,$error);
-           $status .= &store_sent_mail($msgid,$packed_message_no_citation);
+           if ($status eq 'ok' || $status eq 'con_delayed') {
+               &store_sent_mail($msgid,$packed_message_no_citation);
+           }
        }
     } else {
        $status='no_host';
@@ -556,11 +579,11 @@ sub user_normal_msg_raw {
                                        $domain,$user);
     if ($userenv{'notification'}) {
 	&sendnotification($userenv{'notification'},$user,$domain,$subject,0,
-			  $text);
+			  $text,$msgid);
     }
     if ($toperm && $userenv{'permanentemail'}) {
 	&sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
-			  $text);
+			  $text,$msgid);
     }
     &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
                          $env{'user.home'},