--- loncom/interface/lonfeedback.pm	2006/06/29 21:22:09	1.205
+++ loncom/interface/lonfeedback.pm	2006/06/30 04:49:03	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.205 2006/06/29 21:22:09 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.207 2006/06/30 04:49:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -761,7 +761,7 @@ ENDDISCUSS
 	$discussion.='<a href="/adm/feedback?sendmessageonly=1&symb='.
 	    &escape($ressymb).
 	    '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
-		    &mt('Send Message').'</td></tr></table>';
+		    &mt('Send Message').'</a></td></tr></table>';
     }
     return $discussion;
 }
@@ -2197,7 +2197,7 @@ sub redirect_back {
 	  "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
   }
   my $start_page=
-      &Apache::loncommon::start_page('New posts marked as read',undef,
+      &Apache::loncommon::start_page('Feedback sent',undef,
 				     {'redirect'    => [2,$feedurl],
 				      'only_body'   => 1,
 				      'add_entries' => \%onload});
@@ -3417,10 +3417,10 @@ ENDREDIR
 				      $attachmenturl,%to);
 
 # Discussion? Store that.
-
       my $numpost=0;
-      if ($env{'form.discuss'} =~/^(?:non|)anon$/ 
-	  || $env{'form.anondiscuss'}) {
+      if (  ($env{'form.discuss'} ne ''
+	     && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
+	   || $env{'form.anondiscuss'} ne '') {
 	  my $subject = &clear_out_html($env{'form.subject'},undef,1);
 	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,