diff --git a/mod/data/lib.php b/mod/data/lib.php
index d918241ee11..9796e2f5bff 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1152,7 +1152,8 @@ function data_print_comment($data, $commentid) {
     echo '</td><td class="content" align="left">'."\n";
 
     // Print whole message
-    echo format_text($comment->content);
+    $options->para = false;
+    echo format_text($comment->content, FORMAT_MOODLE, $options);
 
 /// Commands
 
diff --git a/mod/data/view.php b/mod/data/view.php
index 48ebb005a74..4966f945c81 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -131,7 +131,7 @@
         echo '<div style="clear:both;"></div>';
     }
     
-    if ($data->intro and empty($sort) and empty($search) and empty($page)) {
+    if ($data->intro and empty($sort) and empty($search) and empty($page) and empty($rid)) {
         print_simple_box(format_text($data->intro), 'center', '70%', '', 5, 'generalbox', 'intro');
     }
 
@@ -345,8 +345,7 @@
     if (!$records = get_records_sql($sql)){
         if ($search){
             notify(get_string('nomatch','data'));
-        }
-        else {
+        } else {
             notify(get_string('norecords','data'));
         }