diff --git a/modules/cvs.module b/modules/cvs.module
index 71e7b5ce4a8..8aaf65b0895 100644
--- a/modules/cvs.module
+++ b/modules/cvs.module
@@ -25,11 +25,11 @@ function cvs_page() {
     $output .= "<b>File:</b> $cvs->files<br />";
     $output .= "<b>Date:</b> ". format_date($cvs->timestamp) ."<br />";
     $output .= "<b>User:</b> $cvs->user<br />";
-    $output .= "\n". htmlentities($cvs->message) ."<hr />";
+    $output .= "\n". nl2br(htmlentities($cvs->message)) ."<hr />";
   }
 
   $theme->header();
-  $theme->box("CVS commit messages", "<pre>$output</pre>");
+  $theme->box("CVS commit messages", "<div style=\"font-family: monospace;\">$output</div>");
   $theme->footer();
 }