--- loncom/interface/lonmsg.pm	2005/11/28 18:32:39	1.157
+++ loncom/interface/lonmsg.pm	2005/11/28 20:14:43	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.157 2005/11/28 18:32:39 raeburn Exp $
+# $Id: lonmsg.pm,v 1.158 2005/11/28 20:14:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,7 +136,15 @@ sub packagemsg {
     #remove machine specification
     $attachmenturl =~ s|^http://[^/]+/|/|;
     $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
-
+    my $course_context;
+    if (defined($env{'form.replyid'})) {
+        my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid)=
+                   split(/\:/,&Apache::lonnet::unescape($env{'form.replyid'}));
+        $course_context = $origcid;
+    }
+    unless(defined($course_context)) {
+        $course_context = $env{'request.course.id'};
+    }
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -145,7 +153,7 @@ sub packagemsg {
         $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$env{'user.name'}.':'.
            $env{'user.domain'}.':'.$msgcount.':'.
-           $env{'request.course.id'}.':'.$$);
+           $course_context.':'.$$);
     }
     my $result='<sendername>'.$env{'user.name'}.'</sendername>'.
            '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
@@ -159,7 +167,7 @@ sub packagemsg {
 	   '<browserversion>'.$env{'browser.version'}.'</browserversion>'.
            '<browsermathml>'.$env{'browser.mathml'}.'</browsermathml>'.
 	   '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
-	   '<courseid>'.$env{'request.course.id'}.'</courseid>'.
+	   '<courseid>'.$course_context.'</courseid>'.
 	   '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
 	   '<role>'.$env{'request.role'}.'</role>'.
 	   '<resource>'.$env{'request.filename'}.'</resource>'.