diff --git a/manifest.json b/manifest.json
index da5c62e..7bce06e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,7 @@
     }
   },
   "name": "Colored Diffs",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Color diffs in messages formatted by Git or other version control systems",
   "author": "Vadim Atlygin",
   "homepage_url": "https://github.com/Qeole/colorediffs",
diff --git a/scripts/transformations.js b/scripts/transformations.js
index 6d9c469..bf2b412 100644
--- a/scripts/transformations.js
+++ b/scripts/transformations.js
@@ -31,6 +31,9 @@ function replaceSpaces(root, tabsize) {
     };
 
     function doReplace(node) {
+        node.textContent = node.textContent.replace(/&/g,'&')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
         node.innerHTML = node.textContent.replace(/( +|\t+)/g, replacer);
     };