--- loncom/interface/lonmsgdisplay.pm	2007/05/02 19:56:34	1.73
+++ loncom/interface/lonmsgdisplay.pm	2007/05/03 16:55:08	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.73 2007/05/02 19:56:34 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.76 2007/05/03 16:55:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -737,12 +737,20 @@ $content{'sendername'}.':'.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
             '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</pre><small>'.
-&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
-            '</small><br />'.
-            '<input type="submit" name="rec_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
+            '</pre><small>';
+        my $rec_button = &mt('Move to Inbox');
+        my $reprec_button = &mt('Move to Inbox/Compose reply');
+        if ($content{'sendback'}) {
+            $rec_button = &mt('Confirm Receipt');
+            $reprec_button = &mt('Confirm Receipt and Reply');
+            $result .= &mt('You have to confirm that you have received this message before you can view other pages. After confirmation, this message will be moved to your regular inbox');
+        } else {
+            $result .= &mt('Click one of the buttons below to move the message to your inbox').' '.&mt('Access to other pages will be prevented until you have done this.');
+        }
+        $result .= '</small><br />'.
+            '<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />'.
             '<input type="submit" name="reprec_'.$key.'" '.
-                  'value="'.&mt('Confirm Receipt and Reply').'" />';
+                  'value="'.$reprec_button.'" />';
     }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -2182,12 +2190,16 @@ sub retrieve_cc_recips {
                      ($ccdom eq $env{'user.domain'}))) {
                     my $showcc ='<span class="LC_nobreak">';
                     if ($context eq 'replying') { 
-                        $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'">';
+                        $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'" />';
                     }
                     $showcc .= &Apache::loncommon::aboutmewrapper(
                                        &Apache::loncommon::plainname($ccname,
-                                         $ccdom),$ccname,$ccdom).'</label></span>';
-                    push (@ccs,$showcc);
+                                         $ccdom),$ccname,$ccdom);
+		    if ($context eq 'replying') {
+			$showcc .='</label>';
+		    }
+		    $showcc .= '</span>';
+		    push(@ccs,$showcc);
                 }
             }
         }
@@ -2632,16 +2644,18 @@ sub handler {
 	&printheader($r,'','Confirmed Receipt');
 	my $replying = 0;
 	foreach my $envkey (keys(%env)) {
-	    if ($envkey=~/^form\.rec\_(.*)$/) {
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($1).'<br>');
-	    }
-	    if ($envkey=~/^form\.reprec\_(.*)$/) {
-		my $msgid=$1;
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &Apache::lonmsg::user_crit_received($msgid).'<br>');
-		&compout($r,'','','',$msgid);
-		$replying = 1;
+	    if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
+       		my $msgid = $2;
+		$r->print('<b>'.&mt('Confirming Receipt').':</b> ');
+		my $result = &Apache::lonmsg::user_crit_received($msgid);
+                if ($result =~ /trans:\s+ok/) {
+                    &statuschange($msgid,'read');
+                }
+                $r->print($result.'<br />');
+                if ($1 eq 'rep') {
+		    &compout($r,'','','',$msgid);
+		    $replying = 1;
+                }
 	    }
 	}
 	if (!$replying) {