diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py
--- a/kallithea/lib/helpers.py
+++ b/kallithea/lib/helpers.py
@@ -1302,6 +1302,7 @@ def urlify_text(s, repo_name=None, link_
     if repo_name is not None:
         s = urlify_issues(s, repo_name, link_)
     s = MENTIONS_REGEX.sub(_mentions_replace, s)
+    s = s.replace('\r\n', '<br/>').replace('\n', '<br/>')
     return literal(s)
 
 
diff --git a/kallithea/tests/functional/test_files.py b/kallithea/tests/functional/test_files.py
--- a/kallithea/tests/functional/test_files.py
+++ b/kallithea/tests/functional/test_files.py
@@ -99,11 +99,11 @@ class TestFilesController(TestController
                                     revision='8911406ad776fdd3d0b9932a2e89677e57405a48',
                                     f_path='vcs/nodes.py'))
 
-        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://issues.example.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.
-In addition some other __str__ are unicode as well
-Added test for unicode
-Improved test to clone into uniq repository.
-removed extra unicode conversion in diff.</div>
+        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://issues.example.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.<br/>"""
+"""In addition some other __str__ are unicode as well<br/>"""
+"""Added test for unicode<br/>"""
+"""Improved test to clone into uniq repository.<br/>"""
+"""removed extra unicode conversion in diff.</div>
 """)
 
         response.mustcontain("""<option selected="selected" value="8911406ad776fdd3d0b9932a2e89677e57405a48">default at 8911406ad776</option>""")
diff --git a/kallithea/tests/models/test_dump_html_mails.ref.html b/kallithea/tests/models/test_dump_html_mails.ref.html
--- a/kallithea/tests/models/test_dump_html_mails.ref.html
+++ b/kallithea/tests/models/test_dump_html_mails.ref.html
@@ -94,9 +94,7 @@ View Comment: http://comment.org
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
-
- - and here it ends indented.</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -253,9 +251,7 @@ View Comment: http://comment.org
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
-
- - and here it ends indented.</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -430,9 +426,7 @@ View Comment: http://comment.org
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
-
- - and here it ends indented.</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -607,9 +601,7 @@ View Comment: http://comment.org
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
-
- - and here it ends indented.</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.<br/><br/> - and here it ends indented.</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -728,8 +720,7 @@ Subject: Test Message
                     <td>
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message
- - nothing interesting here except indentation.</div></td>
+        <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message<br/> - nothing interesting here except indentation.</div></td>
     </tr>
 </table>
                     </td>
@@ -986,8 +977,7 @@ View Pull Request: http://pr.org/7
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
- - please approve indented!</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
         </td>
     </tr>
     <tr><td height="15px"></td></tr>
@@ -1160,8 +1150,7 @@ View Pull Request: http://pr.org/7
     <tr><td height="10px"></td></tr>
     <tr>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
- - please approve indented!</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff<br/> - please approve indented!</div></div>
         </td>
     </tr>
     <tr><td height="15px"></td></tr>
@@ -1317,9 +1306,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -1482,9 +1469,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -1665,9 +1650,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -1848,9 +1831,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -2030,9 +2011,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -2212,9 +2191,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -2400,9 +2377,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
@@ -2588,9 +2563,7 @@ View Comment: http://pr.org/comment
     <tr>
         <td width="20px"></td>
         <td>
-            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
-
- - and indented on second line</div></div>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!<br/><br/> - and indented on second line</div></div>
         </td>
         <td width="20px"></td>
     </tr>
diff --git a/kallithea/tests/other/test_libs.py b/kallithea/tests/other/test_libs.py
--- a/kallithea/tests/other/test_libs.py
+++ b/kallithea/tests/other/test_libs.py
@@ -308,9 +308,9 @@ class TestLibs(TestController):
        some text 123123123123
        sometimes !
        """,
-       """Multi line\n"""
-       """       url[123123123123]\n"""
-       """       some text url[123123123123]\n"""
+       """Multi line<br/>"""
+       """       url[123123123123]<br/>"""
+       """       some text url[123123123123]<br/>"""
        """       sometimes !"""),
     ])
     def test_urlify_changesets(self, sample, expected):
@@ -342,8 +342,8 @@ class TestLibs(TestController):
       ("""Multi line
        https://foo.bar.example.com
        some text lalala""",
-       """Multi line\n"""
-       """       url[https://foo.bar.example.com]\n"""
+       """Multi line<br/>"""
+       """       url[https://foo.bar.example.com]<br/>"""
        """       some text lalala""",
        "https://foo.bar.example.com"),
       ("@mention @someone",