diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 8dfe822c5de..f2dde17c542 100644
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -471,7 +471,7 @@ function journal_print_feedback($course, $entry, $grades) {
     }
     echo "</I></FONT></P>";
 
-    echo text_to_html($entry->comment);
+    echo format_text($entry->comment);
     echo "</TD></TR></TABLE>";
     echo "</TD></TR></TABLE>";
 }
diff --git a/mod/journal/view.php b/mod/journal/view.php
index 23f2011bfc5..916c9987002 100644
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -45,7 +45,7 @@
 
     echo "<center>\n";
     
-    print_simple_box( text_to_html($journal->intro,  $journal->introformat) , "center");
+    print_simple_box( format_text($journal->intro,  $journal->introformat) , "center");
 
     echo "<br />";