--- loncom/interface/lonmsgdisplay.pm	2006/05/01 19:37:33	1.22
+++ loncom/interface/lonmsgdisplay.pm	2006/05/11 20:05:03	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.22 2006/05/01 19:37:33 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.24 2006/05/11 20:05:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,9 +260,9 @@ sub movemsg {
 
 sub discourse {
     my $r=shift;
-    my $classlist = &Apache::loncoursedata::get_classlist();
+    my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
     my ($classgroups,$studentgroups) = 
-	&Apache::loncoursedata::get_group_memberships($classlist);
+	&Apache::loncoursedata::get_group_memberships($classlist,$keylist);
     my %lt=&Apache::lonlocal::texthash('cfa' => 'Check All',
             'cfs' => 'Check Section/Group',
             'cfn' => 'Uncheck All');
@@ -901,7 +901,9 @@ sub compout {
     }
     my $citation=&displayresource(%content);
     if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
-      $r->print(
+    if ($env{'form.text'}) { $dismsg=$env{'form.text'}; }
+    if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; }
+    $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".
                 '<input type="hidden" name="sendmail" value="on" />'."\n".
@@ -1902,7 +1904,7 @@ sub handler {
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','block','folder','startdis','interdis',
-	 'showcommentbaseurl','dismode','group']);
+	 'showcommentbaseurl','dismode','group','subject','text']);
     $sqs='&sortedby='.$env{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email