--- loncom/interface/lonmsgdisplay.pm	2010/02/12 17:22:24	1.149
+++ loncom/interface/lonmsgdisplay.pm	2010/06/06 02:40:30	1.153
@@ -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.153 2010/06/06 02:40:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,18 +225,18 @@ function folder_choice(targetform,caller
    <table border="0" cellspacing="2" cellpadding="8">
     <tr>
      <td><b>'.$lt{'fold'}.'</b><br />'."\n".
-         &Apache::loncommon::select_form($folder,'folder',%formhash).'
+         &Apache::loncommon::select_form($folder,'folder',\%formhash).'
      </td>
      <td><b>'.$lt{'show'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
-					 %show).'
+					 \%show).'
      </td>
      <td><b>'.$lt{'status'}.'</b><br />'."\n".
-       &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+       &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
      </td>
      <td><b>'.$lt{'actn'}.'</b><br />'."\n".'
          <span class="LC_nobreak">'.
-         &Apache::loncommon::select_form('view','folderaction',%actions).
+         &Apache::loncommon::select_form('view','folderaction',\%actions).
          ' <input type="button" value="'.$lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
@@ -1257,7 +1257,7 @@ ENDDISHEADER
             $userfolders{$key} = $key;
         }
         $userfolders{''} = "";
-        $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
+        $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
                   '</td>');
     }
     $r->print('<td>'.
@@ -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;
 }