--- loncom/interface/lonmsgdisplay.pm	2009/11/04 18:30:17	1.138
+++ loncom/interface/lonmsgdisplay.pm	2010/01/06 18:25:38	1.139.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.138 2009/11/04 18:30:17 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.139.2.1 2010/01/06 18:25:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1845,7 +1845,9 @@ sub disfacetoface {
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
-	&Apache::lonfeedback::newline_to_br(\$content{'message'});
+    if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+		&Apache::lonfeedback::newline_to_br(\$content{'message'});
+	}
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {
@@ -2840,6 +2842,9 @@ ENDJS
 # =========================================================== Show the citation
 
 sub displayresource {
+    if (&Apache::loncommon::needs_gci_custom()) {
+        return '';
+    }
     my %content=@_;
 #
 # If the recipient is in the same course that the message was sent from and