-""" % (level+1, b.name, b.href, b.add_date, b.last_visit, b.last_modified, b.keyword, b.comment))
+IconURI: %s
+Icon: %s
+Charset: %s
+""" % (level+1, b.name, b.href, b.add_date, b.last_visit, b.last_modified,
+ b.keyword, b.comment.replace('\n', "\\n"),
+ b.icon_href or '', b.icon or '', b.charset or ''))