diff --git a/kallithea/lib/diffs.py b/kallithea/lib/diffs.py
--- a/kallithea/lib/diffs.py
+++ b/kallithea/lib/diffs.py
@@ -453,7 +453,7 @@ class DiffProcessor(object):
         return self.adds, self.removes
 
 
-_escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(\r)|(?<=.)( \n| $)')
+_escape_re = re.compile(r'(&)|(<)|(>)|(\t)(\n|$)?|(\r)|(?<=.)( \n| $)')
 
 
 def _escaper(string):
@@ -470,10 +470,12 @@ def _escaper(string):
         if groups[2]:
             return '&gt;'
         if groups[3]:
+            if groups[4] is not None:  # end of line
+                return '<u>\t</u><i></i>'
             return '<u>\t</u>'
-        if groups[4]:
+        if groups[5]:
             return '<u class="cr"></u>'
-        if groups[5]:
+        if groups[6]:
             return ' <i></i>'
         assert False
 
diff --git a/kallithea/tests/models/test_diff_parsers.py b/kallithea/tests/models/test_diff_parsers.py
--- a/kallithea/tests/models/test_diff_parsers.py
+++ b/kallithea/tests/models/test_diff_parsers.py
@@ -297,13 +297,13 @@ class TestDiffLib(base.TestController):
         assert s == r'''
 context ... ... '@@ -51,6 +51,13 @@\n'
 unmod    51  51 '<u>\t</u>begin();\n'
-unmod    52  52 '<u>\t</u>\n'
+unmod    52  52 '<u>\t</u><i></i>'
 add      53     '<u>\t</u>int foo;<u class="cr"></u>\n'
 add      54     '<u>\t</u>int bar; <u class="cr"></u>\n'
 add      55     '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>\n'
 add      56     '<u>\t</u>int space; <i></i>'
-add      57     '<u>\t</u>int tab;<u>\t</u>\n'
-add      58     '<u>\t</u>\n'
+add      57     '<u>\t</u>int tab;<u>\t</u><i></i>'
+add      58     '<u>\t</u><i></i>'
 unmod    59  53 ' <i></i>'
 del          54 '<u>\t</u>#define MAX_STEPS (48)\n'
 add      60     '<u>\t</u><u class="cr"></u>\n'