--- loncom/interface/lonmsg.pm	2005/04/07 06:56:23	1.140
+++ loncom/interface/lonmsg.pm	2005/04/11 21:51:43	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.140 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonmsg.pm,v 1.141 2005/04/11 21:51:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,8 @@ sub packagemsg {
     $partsubj=&Apache::lonnet::escape($partsubj);
     my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$env{'user.name'}.':'.
-           $env{'user.domain'}.':'.$msgcount.':'.$$);
+           $env{'user.domain'}.':'.$msgcount.':'.
+           $env{'request.course.id'}.':'.$$);
     my $result='<sendername>'.$env{'user.name'}.'</sendername>'.
            '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.
@@ -209,13 +210,13 @@ sub unpackmsgid {
     my ($msgid,$folder)=@_;
     $msgid=&Apache::lonnet::unescape($msgid);
     my $suffix=&foldersuffix($folder);
-    my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
+    my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/,
                           &Apache::lonnet::unescape($msgid));
     my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
     if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
     unless ($status{$msgid}) { $status{$msgid}='new'; }
-    return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
-} 
+    return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);
+}
 
 
 sub sendemail {
@@ -762,7 +763,7 @@ sub sortedmessages {
     my @temp;
     foreach (@messages) {
 	my $msgid=&Apache::lonnet::escape($_);
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
 	    &Apache::lonmsg::unpackmsgid($msgid,$folder);
 	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
 		     $msgid);
@@ -836,7 +837,7 @@ sub disnew {
     # Check for blocking of display because of scheduled online exams.
     &blockcheck(\%setters,\$startblock,\$endblock);
     foreach (@msgids) {
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+        my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
 	    &Apache::lonmsg::unpackmsgid($_);
         if (defined($sendtime) && $sendtime!~/error/) {
             my $numsendtime = $sendtime;