diff --git a/src/IDF/Template/IssueComment.php b/src/IDF/Template/IssueComment.php
index 5b5e96d..7bca605 100644
--- a/src/IDF/Template/IssueComment.php
+++ b/src/IDF/Template/IssueComment.php
@@ -32,7 +32,7 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
     private $request = null;
     private $scm = null;
 
-    function start($text, $request, $echo=true, $wordwrap=true, $esc=true, $autolink=true)
+    function start($text, $request, $echo=true, $wordwrap=true, $esc=true, $autolink=true, $nl2br=false)
     {
         $this->project = $request->project;
         $this->request = $request;
@@ -53,6 +53,7 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
             $text = preg_replace_callback('#(src:)([^\s\(\)]+)#im',
                                           array($this, 'callbackSource'), $text);
         }
+        if ($nl2br) $text = nl2br($text);
         if ($echo) {
             echo $text;
         } else {
diff --git a/src/IDF/templates/idf/source/changelog.html b/src/IDF/templates/idf/source/changelog.html
index 9a594f5..e249369 100644
--- a/src/IDF/templates/idf/source/changelog.html
+++ b/src/IDF/templates/idf/source/changelog.html
@@ -13,7 +13,7 @@
 {aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $change.scm_id)}
 <tr class="log">
 <td><a href="{$url}">{$change.creation_dtime|dateago:"wihtout"}</a></td>
-<td>{issuetext $change.summary, $request}{if $change.fullmessage}<br /><br />{issuetext $change.fullmessage, $request}{/if}</td>
+<td>{issuetext $change.summary, $request}{if $change.fullmessage}<br /><br />{issuetext $change.fullmessage, $request, true, false, true, true, true}{/if}</td>
 </tr>
 <tr class="extra">
 <td colspan="2">
diff --git a/src/IDF/templates/idf/source/commit.html b/src/IDF/templates/idf/source/commit.html
index 6e0eb6b..035e8ca 100644
--- a/src/IDF/templates/idf/source/commit.html
+++ b/src/IDF/templates/idf/source/commit.html
@@ -13,7 +13,7 @@
 <th><strong>{trans 'Commit:'}</strong></th><td class="mono"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}" title="{trans 'View corresponding source tree'}">{$cobject.commit}</a></td>
 </tr>
 <tr>
-<th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br /><br />{issuetext $cobject.full_message, $request}{/if}</td>
+<th><strong>{trans 'Message:'}</strong></th><td>{issuetext $cobject.title, $request}{if isset($cobject.full_message)}<br /><br />{issuetext $cobject.full_message, $request, true, false, true, true, true}{/if}</td>
 </tr>
 {if count($diff.files)}
 <tr>