--- loncom/interface/lonannounce.pm	2006/01/12 22:58:47	1.40
+++ loncom/interface/lonannounce.pm	2006/01/12 23:00:08	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.40 2006/01/12 22:58:47 albertel Exp $
+# $Id: lonannounce.pm,v 1.41 2006/01/12 23:00:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,8 +146,7 @@ sub normalcell {
     foreach my $item (@items) {
         if ($item) {
 	    my $internalflag=0;
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
 	    if ($msg=~/INTERNAL\:/) {
 		$msg=~s/INTERNAL\://gs;
 		$internalflag=1;
@@ -188,8 +187,7 @@ sub plaincell {
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
             my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
 		'\n'.&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
@@ -213,8 +211,7 @@ sub listcell {
     my @items=&order($text);
     foreach my $item (@items) {
         if ($item) {
-	    my ($courseid,$start,$end,@msg)=split(/\@/,$item);
-            my $msg=join('@',@msg);
+	    my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
 	    $msg=~s/INTERNAL\://gs;
             my $fullmsg=&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {