--- loncom/interface/lontemplate.pm	2009/06/11 16:48:33	1.37
+++ loncom/interface/lontemplate.pm	2009/10/16 13:47:40	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.37 2009/06/11 16:48:33 bisitz Exp $
+# $Id: lontemplate.pm,v 1.39 2009/10/16 13:47:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,27 +70,20 @@ sub print_aboutme_content_template {
               }
               $message=&Apache::lontexconvert::msgtexconverted($message);
               if ($target ne 'tex') {
-		     if ($allowed) {
-			$r->print('<p>');
-		     }
-
 		    if($field eq 'aaa_contactinfo') {
 				$r->print('<div class="LC_Clear_AboutMe_Image" >&nbsp;</div>');
 				&print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
 		    } else {
 			  &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
 		    }
+			if($allowed) {
+               &print_editbox_template($r,$syllabus{$field},$field);
+			}
 
               } else {
                      $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
                                &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
               }
-              if ($allowed) {
-               &print_editbox_template($r,$syllabus{$field},$field);
-		if ($target ne 'tex') {
-			$r->print('</p>');
-		}
-              }
           }
        }
 
@@ -98,10 +91,10 @@ sub print_aboutme_content_template {
 
 sub send_message {
 	my ($r,$cnum,$cdom) = @_;
-	my $s;
-	my $image = qq{<img name="Send message" src="/res/adm/pages/mail-message-new.png" border="none" align="middle" />};
-	$s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom);
-	return $s;
+	my $linktext = &mt('Send message to [_1]',
+			   &Apache::loncommon::plainname($cnum,$cdom));
+	my $image = qq{<img name="Send_message" alt="Send message symbol" src="/res/adm/pages/mail-message-new.png" border="none" align="middle" />};
+	return &Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper($linktext,$cnum,$cdom);
 }
 
 sub print_template {