1 files changed, 8 insertions, 2 deletions
diff --git a/toolkit/components/places/BookmarkHTMLUtils.jsm b/toolkit/components/places/BookmarkHTMLUtils.jsm
index a009a5e7c..c10ef85d6 100644
--- a/toolkit/components/places/BookmarkHTMLUtils.jsm
+++ b/toolkit/components/places/BookmarkHTMLUtils.jsm
@@ -746,6 +746,7 @@ BookmarkImporter.prototype = {
         this._curFrame.inDescription = true;
         break;
       case "hr":
+        this._closeContainer(aElt);
         this._handleSeparator(aElt);
         break;
     }
@@ -1046,7 +1047,12 @@ BookmarkExporter.prototype = {
   },
 
   _writeLine: function (aText) {
-    this._write(aText + "\n");
+    if (Services.sysinfo.getProperty("name") == "Windows_NT") {
+      // Write CRLF line endings on Windows
+      this._write(aText + "\r\n");
+    } else {
+      this._write(aText + "\n");
+    }
   },
 
   _writeHeader: function () {
@@ -1145,7 +1151,7 @@ BookmarkExporter.prototype = {
     if (aItem.charset)
       this._writeAttribute("LAST_CHARSET", escapeHtmlEntities(aItem.charset));
     if (aItem.tags)
-      this._writeAttribute("TAGS", aItem.tags);
+      this._writeAttribute("TAGS", escapeHtmlEntities(aItem.tags));
     this._writeLine(">" + escapeHtmlEntities(aItem.title) + "</A>");
     this._writeDescription(aItem, aIndent);
   },