--- loncom/interface/lonmsgdisplay.pm	2010/04/14 06:36:26	1.124.4.10
+++ loncom/interface/lonmsgdisplay.pm	2010/11/20 13:19:49	1.124.4.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.10 2010/04/14 06:36:26 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.12 2010/11/20 13:19:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -698,7 +698,7 @@ sub disgroup {
 sub group_check_uncheck {
     my $output = qq|
 <script type="text/javascript">
-/ <![CDATA[
+// <![CDATA[
 function toggleAll(form,action) {
     if (typeof(form.selectedusers_forminput.length)=="undefined") {
          if (action == 'check') {
@@ -2621,12 +2621,14 @@ sub displaymessage {
             }
             if ($content{'group'} ne '') {
                 if (&check_group_priv($content{'group'})) {
-                    $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
-                    if ($groupcclist) {
-                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
-                                 .$groupcclist
-                                 .&Apache::lonhtmlcommon::row_closure()
-                        );
+                    if (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') {
+                        $groupcclist = join(', ',@{$recipients{'group_cc_broadcast'}});
+                        if ($groupcclist) {
+                            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group Cc'))
+                                     .$groupcclist
+                                     .&Apache::lonhtmlcommon::row_closure()
+                            );
+                        }
                     }
                 }
             }
@@ -3150,7 +3152,7 @@ sub sendoffmail {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
             if ($toaddr{$address}) {
-	        $msgtxt.='<hr />'.$toaddr{$address};
+	        $msgtxt.="\n".'<hr />'."\n".$toaddr{$address};
             }
 	    my @thismsg;
 	    if ($msgtype eq 'critical') {
@@ -3275,6 +3277,9 @@ sub sendoffmail {
                 $r->print($message);
             }
         }
+    } else {
+        &printheader($r,'','Messages cancelled.');
+        return 'cancelled';
     }
     return $sendstatus;
 }