--- loncom/interface/lonmsg.pm	2004/11/17 21:05:26	1.120
+++ loncom/interface/lonmsg.pm	2004/11/17 21:31:37	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.120 2004/11/17 21:05:26 www Exp $
+# $Id: lonmsg.pm,v 1.121 2004/11/17 21:31:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1006,6 +1006,7 @@ ENDDISHEADER
 
 sub compout {
     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
 
     if ($broadcast eq 'individual') {
 	&printheader($r,'/adm/email?compose=individual',
@@ -1057,7 +1058,7 @@ sub compout {
     my %content;
     my $defdom=$ENV{'user.domain'};
     if ($forwarding) {
-	%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
 	%content=&unpackagemsg($message{$forwarding},$folder);
 	$dispcrit.='<input type="hidden" name="forwid" value="'.
 	    $forwarding.'" />';
@@ -1071,7 +1072,7 @@ sub compout {
 	}
     }
     if ($replying) {
-	%message=&Apache::lonnet::get('nohist_email',[$replying]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]);
 	%content=&unpackagemsg($message{$replying},$folder);
 	$dispcrit.='<input type="hidden" name="replyid" value="'.
 	    $replying.'" />';
@@ -2046,7 +2047,7 @@ sub handler {
 	&printheader($r,'','Displaying Critical Messages');
 	&discrit($r);
     } elsif ($ENV{'form.forward'}) {
-	&compout($r,$ENV{'form.forward'},undef,undef,$folder);
+	&compout($r,$ENV{'form.forward'},undef,undef,undef,$folder);
     } elsif ($ENV{'form.markdel'}) {
 	&printheader($r,'','Deleted Message');
 	&statuschange($ENV{'form.markdel'},'deleted',$folder);