--- loncom/interface/lonmsg.pm	2010/05/29 22:39:52	1.226
+++ loncom/interface/lonmsg.pm	2010/11/10 14:44:50	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.226 2010/05/29 22:39:52 raeburn Exp $
+# $Id: lonmsg.pm,v 1.230 2010/11/10 14:44:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -465,6 +465,7 @@ sub sendemail {
     if ($senderaddress) {
         $msg->add('From',$senderaddress);
     }
+    $msg->add('Content-type','text/plain; charset=UTF-8');
     if (my $fh = $msg->open()) {
 	print $fh $body;
 	$fh->close;
@@ -548,7 +549,7 @@ to access the full message.',$url);
             } else {
                 my $sendtext;
                 if (!grep/^\Q$addr\E/,@htmlexcerpt) {
-                    $sendtext = &htmlfree;
+                    $sendtext = $htmlfree;
                 } else {
                     $sendtext = $text;
                 }
@@ -985,7 +986,9 @@ sub secapply {
     my $rec=shift;
     my $defaultflag=shift;
     $rec=~s/\s+//g;
-    $rec=~s/\@/\:/g;
+    unless ($rec =~ /\:/) {
+        $rec=~s/\@/\:/g;
+    }
     my ($adr,$sections_or_groups)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
     if ($sections_or_groups) {
 	foreach my $item (split(/\;/,$sections_or_groups)) {