diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index ab7e071d..bac61c7d 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -280,7 +280,7 @@ ChangeDirective = ->
                 avatar: getUserAvatar(comment.user.pk)
                 userFullName: getUserFullName(comment.user.pk)
                 creationDate: moment(comment.created_at).format("YYYY/MM/DD HH:mm")
-                comment: comment.comment_html
+                comment: taiga.nl2br(comment.comment_html)
                 changesText: buildChangesText(comment)
                 hasChanges: countChanges(comment) > 0
             })
diff --git a/app/coffee/utils.coffee b/app/coffee/utils.coffee
index 30e60284..5f965b22 100644
--- a/app/coffee/utils.coffee
+++ b/app/coffee/utils.coffee
@@ -19,6 +19,10 @@
 # File: utils.coffee
 ###
 
+nl2br = (str) =>
+    breakTag = '<br />'
+    return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2')
+
 bindOnce = (scope, attr, continuation) =>
     val = scope.$eval(attr)
     if val != undefined
@@ -131,6 +135,7 @@ generateHash = (components=[]) ->
     return hex_sha1(components.join(":"))
 
 taiga = @.taiga
+taiga.nl2br = nl2br
 taiga.bindOnce = bindOnce
 taiga.mixOf = mixOf
 taiga.trim = trim