diff --git a/src/IDF/IssueComment.php b/src/IDF/IssueComment.php
index 8d82b94..bf1f179 100644
--- a/src/IDF/IssueComment.php
+++ b/src/IDF/IssueComment.php
@@ -116,4 +116,9 @@ class IDF_IssueComment extends Pluf_Model
         $q->lock = 0;
         $q->create();
     }
+}
+
+function IDF_IssueComment_Filter($text)
+{
+    return wordwrap($text, 80, "\n", true);
 }
\ No newline at end of file
diff --git a/src/IDF/templates/issues/view.html b/src/IDF/templates/issues/view.html
index f08ae6c..14cab4a 100644
--- a/src/IDF/templates/issues/view.html
+++ b/src/IDF/templates/issues/view.html
@@ -13,7 +13,7 @@
 <p>{blocktrans}Comment <a href="{$url}">{$i}</a> by {$who}, {$c.creation_dtime|date}{/blocktrans}</p>
 {/if}
 
-<p class="issue-comment-text">{if strlen($c.content) > 0}{$c.content|nl2br}{else}<i>{trans '(No comments were given for this change.)'}</i>{/if}</p>
+<pre class="issue-comment-text">{if strlen($c.content) > 0}{$c.content|issuetext}{else}<i>{trans '(No comments were given for this change.)'}</i>{/if}</pre>
 
 {if $i> 0 and $c.changedIssue()}
 <div class="issue-changes">