--- loncom/interface/lonmsgdisplay.pm	2010/02/12 17:22:24	1.149
+++ loncom/interface/lonmsgdisplay.pm	2010/06/06 01:17:08	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.149 2010/02/12 17:22:24 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.152 2010/06/06 01:17:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2009,6 +2009,7 @@ sub facetoface {
              .&Apache::lonhtmlcommon::end_pick_box()
              .'<br />'
              .'<input type="submit" value="'.$lt{'subm'}.'" />'
+             .'</form>'
     );
 
     if (($stage ne 'query') &&
@@ -3184,7 +3185,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') {
@@ -3309,6 +3310,9 @@ sub sendoffmail {
                 $r->print($message);
             }
         }
+    } else {
+        &printheader($r,'','Messages cancelled.');
+        return 'cancelled';
     }
     return $sendstatus;
 }