--- loncom/interface/lonmsg.pm	2005/07/08 10:39:49	1.152
+++ loncom/interface/lonmsg.pm	2005/11/17 21:33:40	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.152 2005/07/08 10:39:49 www Exp $
+# $Id: lonmsg.pm,v 1.154 2005/11/17 21:33:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,6 +114,8 @@ use HTML::Entities();
 use Mail::Send;
 use Apache::lonlocal;
 use Apache::loncommunicate;
+use Apache::lonfeedback;
+use Apache::lonrss();
 
 # Querystring component with sorting type
 my $sqs;
@@ -1113,8 +1115,9 @@ sub compout {
  '<label><input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
  &mt('and return receipt') . '</label>' . $crithelp . 
  '</p><p><label><input type="checkbox" name="permanent" /> '.
-&mt('Send copy to permanent email address (if known)').'</label></p>';
-     }
+&mt('Send copy to permanent email address (if known)').'</label></p>'.
+'<p><label><input type="checkbox" name="rsspost" /> '.
+		  &mt('Include in course newsfeed').'</label></p>';      }
     my %message;
     my %content;
     my $defdom=$env{'user.domain'};
@@ -1233,6 +1236,7 @@ ENDUPLOAD
        &discourse;
     }
     $r->print('</form>'.
+	      &Apache::lonfeedback::generate_preview_button('compemail','message').
 	      &Apache::lonhtmlcommon::htmlareaselectactive('message'));
 }
 
@@ -2193,6 +2197,13 @@ sub handler {
 	if ($env{'form.storebasecomment'}) {
 	    &storecomment($r);
 	}
+	if (($env{'form.rsspost'}) && ($env{'request.course.id'})) {
+	    &Apache::lonrss::addentry($env{'course.'.$env{'request.course.id'}.'.num'},
+				      $env{'course.'.$env{'request.course.id'}.'.domain'},
+				      'Course_Announcements',
+				      $env{'form.subject'},
+				      $env{'form.message'},'/adm/communicate','public');
+	}
 	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.newfolder'}) {
 	&printheader($r,'','New Folder');