--- loncom/interface/lonmsgdisplay.pm	2009/09/25 16:35:29	1.135
+++ loncom/interface/lonmsgdisplay.pm	2009/10/12 08:01:08	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.135 2009/09/25 16:35:29 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.136 2009/10/12 08:01:08 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1786,8 +1786,10 @@ sub retrieve_instructor_comments {
 }
 
 sub disfacetoface {
-    my ($r,$user,$domain)=@_;
-    my $target=$env{'form.grade_target'};
+    my ($r,$user,$domain,$target)=@_;
+	if ($target eq '') {
+    	my $target=$env{'form.grade_target'};
+	}
     unless ($env{'request.course.id'}) { return; }
     if  (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
 	 && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
@@ -1799,7 +1801,7 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.domain'},
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='';
+    my $result='<div>';
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
@@ -1856,6 +1858,7 @@ $content{'sendername'}.':'.
 	      '</pre>';
      }
     # Check to see if there were any messages.
+	&Apache::lonnet::logthis("lonmsgdisplay ..later ... target -- $target");
     if ($result eq '') {
         my $lctype = &mt(lc(&Apache::loncommon::course_type()));
 	if ($target ne 'tex') { 
@@ -1863,9 +1866,11 @@ $content{'sendername'}.':'.
 	} else {
 	    $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
 	}
+    } elsif ($target ne 'tex') {
+       $r->print($result.'</div>');
     } else {
-       $r->print($result);
-    }
+		$r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
+	}
 }
 
 sub general_message {