From a0dd0702fb020d2cce3e1b8a8a5f303e284c047a Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sun, 14 Jul 2019 16:00:02 +0100
Subject: [PATCH 01/18] Clipper: Adding support for clipping page as HTML

---
 CliClient/package-lock.json                   | 317 +++++++++++---
 CliClient/package.json                        |   1 +
 CliClient/tests/htmlUtils.js                  |  33 ++
 .../content_scripts/index.js                  |  38 +-
 Clipper/joplin-webclipper/popup/src/App.js    |  27 +-
 Clipper/joplin-webclipper/popup/src/bridge.js |   3 +
 ElectronClient/app/gui/note-viewer/index.html |   3 +
 ElectronClient/app/package-lock.json          | 412 +++++++++++++++---
 ElectronClient/app/package.json               |   2 +
 .../lib/MdToHtml/rules/html_image.js          |   2 +-
 ReactNativeClient/lib/htmlUtils.js            |  45 ++
 ReactNativeClient/lib/joplin-database.js      |   6 +-
 ReactNativeClient/lib/markupLanguageUtils.js  |  21 +
 ReactNativeClient/lib/models/Note.js          |   3 +
 ReactNativeClient/lib/services/rest/Api.js    |  99 +++--
 15 files changed, 866 insertions(+), 146 deletions(-)
 create mode 100644 CliClient/tests/htmlUtils.js
 create mode 100644 ReactNativeClient/lib/htmlUtils.js
 create mode 100644 ReactNativeClient/lib/markupLanguageUtils.js

diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json
index 6d3718096..62dc0c167 100644
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -15,9 +15,9 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
+      "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
     },
     "acorn-globals": {
       "version": "4.3.2",
@@ -26,13 +26,6 @@
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
-        }
       }
     },
     "acorn-walk": {
@@ -518,18 +511,6 @@
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.2.0",
         "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
       }
     },
     "debug": {
@@ -1374,6 +1355,11 @@
       "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz",
       "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc="
     },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
     "is-absolute": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
@@ -1472,6 +1458,193 @@
         "css": "^2.2.4",
         "html-entities": "^1.2.1",
         "jsdom": "^11.9.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+        },
+        "ajv": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
+          "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "har-validator": {
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+          "requires": {
+            "ajv": "^6.5.5",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "jsdom": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+          "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+          "requires": {
+            "abab": "^2.0.0",
+            "acorn": "^5.5.3",
+            "acorn-globals": "^4.1.0",
+            "array-equal": "^1.0.0",
+            "cssom": ">= 0.3.2 < 0.4.0",
+            "cssstyle": "^1.0.0",
+            "data-urls": "^1.0.0",
+            "domexception": "^1.0.1",
+            "escodegen": "^1.9.1",
+            "html-encoding-sniffer": "^1.0.2",
+            "left-pad": "^1.3.0",
+            "nwsapi": "^2.0.7",
+            "parse5": "4.0.0",
+            "pn": "^1.1.0",
+            "request": "^2.87.0",
+            "request-promise-native": "^1.0.5",
+            "sax": "^1.2.4",
+            "symbol-tree": "^3.2.2",
+            "tough-cookie": "^2.3.4",
+            "w3c-hr-time": "^1.0.1",
+            "webidl-conversions": "^4.0.2",
+            "whatwg-encoding": "^1.0.3",
+            "whatwg-mimetype": "^2.1.0",
+            "whatwg-url": "^6.4.1",
+            "ws": "^5.2.0",
+            "xml-name-validator": "^3.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+        },
+        "parse5": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+          "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+        },
+        "request": {
+          "version": "2.88.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "tough-cookie": {
+              "version": "2.4.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+              "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+              "requires": {
+                "psl": "^1.1.24",
+                "punycode": "^1.4.1"
+              }
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        },
+        "whatwg-url": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+          "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
       }
     },
     "joplin-turndown-plugin-gfm": {
@@ -1496,35 +1669,35 @@
       "optional": true
     },
     "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz",
+      "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==",
       "requires": {
         "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
+        "acorn": "^6.1.1",
+        "acorn-globals": "^4.3.2",
         "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
+        "cssom": "^0.3.6",
+        "cssstyle": "^1.2.2",
+        "data-urls": "^1.1.0",
         "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
+        "escodegen": "^1.11.1",
         "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
+        "nwsapi": "^2.1.4",
+        "parse5": "5.1.0",
         "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
+        "request": "^2.88.0",
+        "request-promise-native": "^1.0.7",
+        "saxes": "^3.1.9",
         "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
+        "tough-cookie": "^3.0.1",
         "w3c-hr-time": "^1.0.1",
+        "w3c-xmlserializer": "^1.1.2",
         "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^7.0.0",
+        "ws": "^7.0.0",
         "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
@@ -1647,6 +1820,23 @@
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
           "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
         },
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+          "requires": {
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+              "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+            }
+          }
+        },
         "uuid": {
           "version": "3.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
@@ -2200,9 +2390,9 @@
       }
     },
     "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
     },
     "path-exists": {
       "version": "3.0.0",
@@ -2503,6 +2693,14 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "saxes": {
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "requires": {
+        "xmlchars": "^2.1.1"
+      }
+    },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
@@ -3212,6 +3410,16 @@
         "browser-process-hrtime": "^0.1.2"
       }
     },
+    "w3c-xmlserializer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "requires": {
+        "domexception": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -3241,9 +3449,9 @@
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
     "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -3297,11 +3505,11 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz",
+      "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==",
       "requires": {
-        "async-limiter": "~1.0.0"
+        "async-limiter": "^1.0.0"
       }
     },
     "xml-name-validator": {
@@ -3323,6 +3531,11 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
     },
+    "xmlchars": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
+      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
+    },
     "xregexp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",
diff --git a/CliClient/package.json b/CliClient/package.json
index 99e2311c8..1918b607c 100644
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -45,6 +45,7 @@
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
     "joplin-turndown-plugin-gfm": "^1.0.8",
+    "jsdom": "^15.1.1",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
diff --git a/CliClient/tests/htmlUtils.js b/CliClient/tests/htmlUtils.js
new file mode 100644
index 000000000..0181025f3
--- /dev/null
+++ b/CliClient/tests/htmlUtils.js
@@ -0,0 +1,33 @@
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const htmlUtils = require('lib/htmlUtils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('htmlUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should extract image URLs', async (done) => {
+		const testCases = [
+			['<img src="http://test.com/img.png"/>', ['http://test.com/img.png']],
+			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://test.com/img.png', 'http://test.com/img2.png']],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const expected = testCases[i][1];
+
+			expect(htmlUtils.extractImageUrls(md).join(' ')).toBe(expected.join(' '));
+		}
+
+		done();
+	});
+
+});
\ No newline at end of file
diff --git a/Clipper/joplin-webclipper/content_scripts/index.js b/Clipper/joplin-webclipper/content_scripts/index.js
index 5b5324802..943530de8 100644
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -61,7 +61,7 @@
 		const output = {};
 		for (let i = 0; i < images.length; i++) {
 			const img = images[i];
-			const src = forceAbsoluteUrls ? absoluteUrl(img.src) : img.src;
+			const src = forceAbsoluteUrls ? absoluteUrl(img.currentSrc) : img.currentSrc;
 			output[src] = {
 				width: img.width,
 				height: img.height,
@@ -112,7 +112,7 @@
 				}
 
 				if (nodeName === 'img') {
-					node.src = absoluteUrl(node.src);
+					node.src = absoluteUrl(node.currentSrc);
 					const imageSize = imageSizes[node.src];
 					if (imageSize) {
 						node.width = imageSize.width;
@@ -135,6 +135,8 @@
 		for (let i = 0; i < childNodes.length; i++) {
 			const node = childNodes[i];
 			const nodeName = node.nodeName.toLowerCase();
+			const nodeParent = node.parentNode;
+			const nodeParentName = nodeParent ? nodeParent.nodeName.toLowerCase() : '';
 
 			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
 			if (isVisible && ['script', 'noscript', 'style', 'select', 'option', 'button'].indexOf(nodeName) >= 0) isVisible = false;
@@ -153,6 +155,10 @@
 				if (a && a.toLowerCase().indexOf('math/tex') >= 0) isVisible = true;
 			}
 
+			if (nodeName === 'source' && nodeParentName === 'picture') {
+				isVisible = false
+			}
+
 			if (!isVisible) {
 				node.classList.add('joplin-clipper-hidden');
 			} else {
@@ -179,19 +185,25 @@
 	// Given a document, return a <style> tag that contains all the styles
 	// required to render the page. Not currently used but could be as an 
 	// option to clip pages as HTML.
-	function getStyleTag(doc) {
-		const styleText = [];
+	function getStyleSheets(doc) {
+		const output = [];
 		for (var i=0; i<doc.styleSheets.length; i++) {
+			var sheet = doc.styleSheets[i];
 			try {
-				var sheet = doc.styleSheets[i];
 				for (const cssRule of sheet.cssRules) {
-					styleText.push(cssRule.cssText);
+					output.push({ type: 'text', value: cssRule.cssText });
 				}
 			} catch (error) {
-				console.warn(error);
+				// Calling sheet.cssRules will throw a CORS error on Chrome if the stylesheet is on a different domain.
+				// In that case, we skip it and add it to the list of stylesheet URLs. These URls will be downloaded
+				// by the desktop application, since it doesn't have CORS restrictions.
+				console.info('Could not retrieve stylesheet now:', sheet.href);
+				console.info('It will downloaded by the main application.');
+				console.info(error);
+				output.push({ type: 'url', value: sheet.href });
 			}
 		}
-		return '<style>' + styleText.join('\n') + '</style>';
+		return output;
 	}
 
 	function documentForReadability() {
@@ -223,7 +235,7 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
-		const clippedContentResponse = (title, html, imageSizes, anchorNames) => {
+		const clippedContentResponse = (title, html, imageSizes, anchorNames, stylesheets) => {
 			return {
 				name: 'clippedContent',
 				title: title,
@@ -234,6 +246,9 @@
 				tags: command.tags || '',
 				image_sizes: imageSizes,
 				anchor_names: anchorNames,
+				source_command: Object.assign({}, command),
+				convert_to: command.preProcessFor ? command.preProcessFor : 'markdown',
+				stylesheets: stylesheets,
 			};			
 		}
 
@@ -255,7 +270,6 @@
 		} else if (command.name === "isProbablyReaderable") {
 
 			const ok = isProbablyReaderable(documentForReadability());
-			console.info('isProbablyReaderable', ok);
 			return { name: 'isProbablyReaderable', value: ok };
 
 		} else if (command.name === "completePageHtml") {
@@ -267,7 +281,9 @@
 			const cleanDocument = document.body.cloneNode(true);
 			const imageSizes = getImageSizes(document, true);
 			cleanUpElement(cleanDocument, imageSizes);
-			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document));
+
+			const stylesheets = command.preProcessFor === 'html' ? getStyleSheets(document) : null;
+			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document), stylesheets);
 
 		} else if (command.name === "selectedHtml") {
 
diff --git a/Clipper/joplin-webclipper/popup/src/App.js b/Clipper/joplin-webclipper/popup/src/App.js
index 109bf8ace..fb2ef624b 100644
--- a/Clipper/joplin-webclipper/popup/src/App.js
+++ b/Clipper/joplin-webclipper/popup/src/App.js
@@ -7,6 +7,20 @@ import led_orange from './led_orange.png';
 const { connect } = require('react-redux');
 const { bridge } = require('./bridge');
 
+function commandUserString(command) {
+	const s = [];
+
+	if (command.name === 'simplifiedPageHtml') s.push('Simplified page');
+	if (command.name === 'completePageHtml') s.push('Complete page');
+	if (command.name === 'selectedHtml') s.push('Selection');
+	if (command.name === 'pageUrl') s.push('URL only');
+
+	const p = command.preProcessFor ? command.preProcessFor : 'markdown';
+	s.push('(' + p + ')');
+
+	return s.join(' ');
+}
+
 class PreviewComponent extends React.PureComponent {
 
 	constructor() {
@@ -17,7 +31,7 @@ class PreviewComponent extends React.PureComponent {
 
 	componentDidMount() {
 		if (!this.bodyRef.current) return;
-		
+
 		// Because the text size is made twice smaller with CSS, we need
 		// to also reduce the size of the images
 		const imgs = this.bodyRef.current.getElementsByTagName('img');
@@ -32,6 +46,7 @@ class PreviewComponent extends React.PureComponent {
 			<div className="Preview">
 				<h2>Title:</h2>
 				<input className={"Title"} value={this.props.title} onChange={this.props.onTitleChange}/>
+				<p><span>Type:</span> {commandUserString(this.props.command)}</p>
 				<a className={"Confirm Button"} onClick={this.props.onConfirmClick}>Confirm</a>
 			</div>
 		);
@@ -84,6 +99,14 @@ class AppComponent extends Component {
 		this.clipComplete_click = () => {
 			bridge().sendCommandToActiveTab({
 				name: 'completePageHtml',
+				preProcessFor: 'markdown',
+			});
+		}
+
+		this.clipCompleteHtml_click = () => {
+			bridge().sendCommandToActiveTab({
+				name: 'completePageHtml',
+				preProcessFor: 'html',
 			});
 		}
 
@@ -259,6 +282,7 @@ class AppComponent extends Component {
 				title={content.title}
 				body_html={content.body_html}
 				onTitleChange={this.contentTitle_change}
+				command={content.source_command}
 			/>
 		}
 
@@ -360,6 +384,7 @@ class AppComponent extends Component {
 					<ul>
 						<li><a className="Button" onClick={this.clipSimplified_click} title={simplifiedPageButtonTooltip}>{simplifiedPageButtonLabel}</a></li>
 						<li><a className="Button" onClick={this.clipComplete_click}>Clip complete page</a></li>
+						<li><a className="Button" onClick={this.clipCompleteHtml_click}>Clip complete page (HTML) (Beta)</a></li>
 						<li><a className="Button" onClick={this.clipSelection_click}>Clip selection</a></li>
 						<li><a className="Button" onClick={this.clipScreenshot_click}>Clip screenshot</a></li>
 						<li><a className="Button" onClick={this.clipUrl_click}>Clip URL</a></li>
diff --git a/Clipper/joplin-webclipper/popup/src/bridge.js b/Clipper/joplin-webclipper/popup/src/bridge.js
index 36a1597b5..03c219c9d 100644
--- a/Clipper/joplin-webclipper/popup/src/bridge.js
+++ b/Clipper/joplin-webclipper/popup/src/bridge.js
@@ -35,6 +35,9 @@ class Bridge {
 					tags: command.tags || '',
 					image_sizes: command.image_sizes || {},
 					anchor_names: command.anchor_names || [],
+					source_command: command.source_command,
+					convert_to: command.convert_to,
+					stylesheets: command.stylesheets,
 				};
 
 				this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content });
diff --git a/ElectronClient/app/gui/note-viewer/index.html b/ElectronClient/app/gui/note-viewer/index.html
index 3e7e290b4..120189e0c 100644
--- a/ElectronClient/app/gui/note-viewer/index.html
+++ b/ElectronClient/app/gui/note-viewer/index.html
@@ -9,6 +9,9 @@
 		}
 
 		#content {
+			/* Needs this in case the content contains elements with absolute positioning */
+			/* Without this they would just stay at a fixed position when scrolling */
+			position: relative;
 			overflow-y: auto;
 			height: 100%;
 			padding-left: 10px;
diff --git a/ElectronClient/app/package-lock.json b/ElectronClient/app/package-lock.json
index 60366142f..8a818eee5 100644
--- a/ElectronClient/app/package-lock.json
+++ b/ElectronClient/app/package-lock.json
@@ -154,9 +154,9 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
+      "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
     },
     "acorn-globals": {
       "version": "4.3.2",
@@ -165,13 +165,6 @@
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
-        }
       }
     },
     "acorn-walk": {
@@ -1260,6 +1253,15 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
       "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
     },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -1382,6 +1384,21 @@
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
       "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
     },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "requires": {
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "cli-boxes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
@@ -1712,18 +1729,6 @@
         "abab": "^2.0.0",
         "whatwg-mimetype": "^2.2.0",
         "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
       }
     },
     "debug": {
@@ -2400,8 +2405,7 @@
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -3434,6 +3438,11 @@
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
     "highlight.js": {
       "version": "9.15.6",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz",
@@ -3473,6 +3482,27 @@
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
     },
+    "html-minifier": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
+      "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
+      "requires": {
+        "camel-case": "^3.0.0",
+        "clean-css": "^4.2.1",
+        "commander": "^2.19.0",
+        "he": "^1.2.0",
+        "param-case": "^2.1.1",
+        "relateurl": "^0.2.7",
+        "uglify-js": "^3.5.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+        }
+      }
+    },
     "http-errors": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.1.tgz",
@@ -3579,6 +3609,11 @@
       "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3805,6 +3840,69 @@
         "css": "^2.2.4",
         "html-entities": "^1.2.1",
         "jsdom": "^11.9.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+        },
+        "jsdom": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+          "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+          "requires": {
+            "abab": "^2.0.0",
+            "acorn": "^5.5.3",
+            "acorn-globals": "^4.1.0",
+            "array-equal": "^1.0.0",
+            "cssom": ">= 0.3.2 < 0.4.0",
+            "cssstyle": "^1.0.0",
+            "data-urls": "^1.0.0",
+            "domexception": "^1.0.1",
+            "escodegen": "^1.9.1",
+            "html-encoding-sniffer": "^1.0.2",
+            "left-pad": "^1.3.0",
+            "nwsapi": "^2.0.7",
+            "parse5": "4.0.0",
+            "pn": "^1.1.0",
+            "request": "^2.87.0",
+            "request-promise-native": "^1.0.5",
+            "sax": "^1.2.4",
+            "symbol-tree": "^3.2.2",
+            "tough-cookie": "^2.3.4",
+            "w3c-hr-time": "^1.0.1",
+            "webidl-conversions": "^4.0.2",
+            "whatwg-encoding": "^1.0.3",
+            "whatwg-mimetype": "^2.1.0",
+            "whatwg-url": "^6.4.1",
+            "ws": "^5.2.0",
+            "xml-name-validator": "^3.0.0"
+          }
+        },
+        "parse5": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+          "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+        },
+        "whatwg-url": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+          "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        },
+        "ws": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
       }
     },
     "joplin-turndown-plugin-gfm": {
@@ -3834,36 +3932,161 @@
       "optional": true
     },
     "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz",
+      "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==",
       "requires": {
         "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
+        "acorn": "^6.1.1",
+        "acorn-globals": "^4.3.2",
         "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
+        "cssom": "^0.3.6",
+        "cssstyle": "^1.2.2",
+        "data-urls": "^1.1.0",
         "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
+        "escodegen": "^1.11.1",
         "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
+        "nwsapi": "^2.1.4",
+        "parse5": "5.1.0",
         "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
+        "request": "^2.88.0",
+        "request-promise-native": "^1.0.7",
+        "saxes": "^3.1.9",
         "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
+        "tough-cookie": "^3.0.1",
         "w3c-hr-time": "^1.0.1",
+        "w3c-xmlserializer": "^1.1.2",
         "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^7.0.0",
+        "ws": "^7.0.0",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
+          "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+        },
+        "har-validator": {
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+          "requires": {
+            "ajv": "^6.5.5",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "request": {
+          "version": "2.88.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "tough-cookie": {
+              "version": "2.4.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+              "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+              "requires": {
+                "psl": "^1.1.24",
+                "punycode": "^1.4.1"
+              }
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+          "requires": {
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+              "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+            }
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
       }
     },
     "jsesc": {
@@ -4115,6 +4338,11 @@
         "signal-exit": "^3.0.0"
       }
     },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
+    },
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
@@ -4474,6 +4702,14 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
     "node-abi": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.7.1.tgz",
@@ -4924,6 +5160,14 @@
         "semver": "^5.1.0"
       }
     },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
     "parse-color": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz",
@@ -4983,9 +5227,9 @@
       }
     },
     "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
     },
     "path-exists": {
       "version": "3.0.0",
@@ -5157,6 +5401,11 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
+    "psl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
+      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
+    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -5595,6 +5844,11 @@
         "rc": "^1.0.1"
       }
     },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -5778,6 +6032,14 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "saxes": {
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "requires": {
+        "xmlchars": "^2.1.1"
+      }
+    },
     "scheduler": {
       "version": "0.13.6",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
@@ -6371,6 +6633,27 @@
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
       "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
     },
+    "uglify-js": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
+      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
+      "requires": {
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "uid-safe": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
@@ -6472,11 +6755,15 @@
         }
       }
     },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -6568,6 +6855,16 @@
         "browser-process-hrtime": "^0.1.2"
       }
     },
+    "w3c-xmlserializer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "requires": {
+        "domexception": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
     "wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -6611,9 +6908,9 @@
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
     "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -6716,11 +7013,11 @@
       }
     },
     "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz",
+      "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==",
       "requires": {
-        "async-limiter": "~1.0.0"
+        "async-limiter": "^1.0.0"
       }
     },
     "xdg-basedir": {
@@ -6756,6 +7053,11 @@
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
       "dev": true
     },
+    "xmlchars": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
+      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
+    },
     "xmldom": {
       "version": "0.1.27",
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json
index 50e1a8350..2e1df3233 100644
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@@ -100,9 +100,11 @@
     "fs-extra": "^5.0.0",
     "highlight.js": "^9.15.6",
     "html-entities": "^1.2.1",
+    "html-minifier": "^4.0.0",
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
     "joplin-turndown-plugin-gfm": "^1.0.8",
+    "jsdom": "^15.1.1",
     "jssha": "^2.3.1",
     "katex": "^0.10.0",
     "levenshtein": "^1.0.5",
diff --git a/ReactNativeClient/lib/MdToHtml/rules/html_image.js b/ReactNativeClient/lib/MdToHtml/rules/html_image.js
index 6e3754f0d..da8dfd1fa 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/html_image.js
+++ b/ReactNativeClient/lib/MdToHtml/rules/html_image.js
@@ -33,7 +33,7 @@ function installRule(markdownIt, mdOptions, ruleOptions) {
 		return self.renderToken(tokens, idx, options);
 	};
 
-	const imageRegex = /<img(.*?)src=["'](.*?)["'](.*?)\/>/
+	const imageRegex = /<img(.*?)src=["'](.*?)["'](.*?)>/gi
 
 	const handleImageTags = function(defaultRender) {
 		return function(tokens, idx, options, env, self) {
diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
new file mode 100644
index 000000000..a7e7a142d
--- /dev/null
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -0,0 +1,45 @@
+const jsdom = require("jsdom");
+const { JSDOM } = jsdom;
+
+const htmlUtils = {
+
+	extractImageUrls(html) {
+		if (!html) return [];
+		
+		const dom = new JSDOM(html);
+		const imgs = dom.window.document.getElementsByTagName('img');
+		const output = [];
+
+		for (const img of imgs) {
+			const src = img.getAttribute('src');
+			if (!src) continue;
+			output.push(src);
+		}
+
+		return output;
+	},
+
+	replaceImageUrls(html, callback) {
+		if (!html) return '';
+
+		const dom = new JSDOM(html);
+		const doc = dom.window.document;
+		const imgs = doc.getElementsByTagName('img');
+
+		for (const img of imgs) {
+			const src = img.getAttribute('src');
+			const newSrc = callback(src);
+			img.setAttribute('src', newSrc);
+		}
+
+		// This function returns the head and body but without the <head> and <body>
+		// tag, which for our purpose are not needed and can cause issues when present.
+		const output = [];
+		if (doc.head) output.push(doc.head.innerHTML);
+		if (doc.body) output.push(doc.body.innerHTML);
+		return output.join('\n');
+	},  
+
+};
+
+module.exports = htmlUtils;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/joplin-database.js b/ReactNativeClient/lib/joplin-database.js
index bce17da21..c41e08f44 100644
--- a/ReactNativeClient/lib/joplin-database.js
+++ b/ReactNativeClient/lib/joplin-database.js
@@ -303,7 +303,7 @@ class JoplinDatabase extends Database {
 		// must be set in the synchronizer too.
 
 		// Note: v16 and v17 don't do anything. They were used to debug an issue.
-		const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
+		const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24];
 
 		let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion);
 
@@ -634,6 +634,10 @@ class JoplinDatabase extends Database {
 				queries.push('CREATE UNIQUE INDEX key_values_key ON key_values (key)');
 			}
 
+			if (targetVersion == 24) {
+				queries.push('ALTER TABLE notes ADD COLUMN `markup_language` INT NOT NULL DEFAULT 1'); // 1: Markdown, 2: HTML
+			}
+
 			queries.push({ sql: 'UPDATE version SET version = ?', params: [targetVersion] });
 
 			try {
diff --git a/ReactNativeClient/lib/markupLanguageUtils.js b/ReactNativeClient/lib/markupLanguageUtils.js
new file mode 100644
index 000000000..c56a24d65
--- /dev/null
+++ b/ReactNativeClient/lib/markupLanguageUtils.js
@@ -0,0 +1,21 @@
+const markdownUtils = require('lib/markdownUtils');
+const htmlUtils = require('lib/htmlUtils');
+const Note = require('lib/models/Note');
+
+class MarkupLanguageUtils {
+
+	lib_(language) {
+		if (language === Note.MARKUP_LANGUAGE_HTML) return htmlUtils;
+		if (language === Note.MARKUP_LANGUAGE_MARKDOWN) return markdownUtils;
+		throw new Error('Unsupported markup language: ' + language);
+	}
+
+	extractImageUrls(language, text) {
+		return this.lib_(language).extractImageUrls(text);
+	}
+
+}
+
+const markupLanguageUtils = new MarkupLanguageUtils();
+
+module.exports = markupLanguageUtils;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/models/Note.js b/ReactNativeClient/lib/models/Note.js
index 42b5cb79e..f284071b1 100644
--- a/ReactNativeClient/lib/models/Note.js
+++ b/ReactNativeClient/lib/models/Note.js
@@ -634,4 +634,7 @@ class Note extends BaseItem {
 Note.updateGeolocationEnabled_ = true;
 Note.geolocationUpdating_ = false;
 
+Note.MARKUP_LANGUAGE_MARKDOWN = 1;
+Note.MARKUP_LANGUAGE_HTML = 2;
+
 module.exports = Note;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index 0de139809..d262a30bc 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -7,6 +7,8 @@ const BaseItem = require('lib/models/BaseItem');
 const BaseModel = require('lib/BaseModel');
 const Setting = require('lib/models/Setting');
 const markdownUtils = require('lib/markdownUtils');
+const htmlUtils = require('lib/htmlUtils');
+const markupLanguageUtils = require('lib/markupLanguageUtils');
 const mimeUtils = require('lib/mime-utils.js').mime;
 const { Logger } = require('lib/logger.js');
 const md5 = require('md5');
@@ -369,7 +371,7 @@ class Api {
 
 			let note = await this.requestNoteToNote_(requestNote);
 
-			const imageUrls = markdownUtils.extractImageUrls(note.body);
+			const imageUrls = markupLanguageUtils.extractImageUrls(note.markup_language, note.body);
 
 			this.logger().info('Request (' + requestId + '): Downloading images: ' + imageUrls.length);
 
@@ -379,7 +381,7 @@ class Api {
 
 			result = await this.createResourcesFromPaths_(result);
 			await this.removeTempFiles_(result);
-			note.body = this.replaceImageUrlsByResources_(note.body, result, imageSizes);
+			note.body = this.replaceImageUrlsByResources_(note.markup_language, note.body, result, imageSizes);
 
 			this.logger().info('Request (' + requestId + '): Saving note...');
 
@@ -431,17 +433,30 @@ class Api {
 		if (requestNote.id) output.id = requestNote.id;
 
 		if (requestNote.body_html) {
-			// Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
-			// when getting the content from elsewhere. So here wrap it - it won't change anything to the final
-			// rendering but it makes sure everything will be parsed.
-			output.body = await this.htmlToMdParser().parse('<div>' + requestNote.body_html + '</div>', {
-				baseUrl: requestNote.base_url ? requestNote.base_url : '',
-				anchorNames: requestNote.anchor_names ? requestNote.anchor_names : [],
-			});
+			if (requestNote.convert_to === 'html') {
+				const style = await this.buildNoteStyleSheet_(requestNote.stylesheets);
+				const styleTag = style.length ? '<style>' + style.join('\n') + '</style>' + '\n' : '';
 
-			// Note: to save the note as HTML, use the code below:
-			// const minify = require('html-minifier').minify;
-			// output.body = minify(requestNote.body_html, { collapseWhitespace: true });
+				const minify = require('html-minifier').minify;
+				output.body = minify(styleTag + requestNote.body_html, {
+					// Remove all spaces and, especially, newlines from tag attributes, as that would
+					// break the rendering.
+					customAttrCollapse: /.*/,
+					// Need to remove all whitespaces because whitespace at a beginning of a line
+					// means a code block in Markdown.
+					collapseWhitespace: true,
+				});
+				output.markup_language = Note.MARKUP_LANGUAGE_HTML;
+			} else { // Convert to Markdown 
+				// Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
+				// when getting the content from elsewhere. So here wrap it - it won't change anything to the final
+				// rendering but it makes sure everything will be parsed.
+				output.body = await this.htmlToMdParser().parse('<div>' + requestNote.body_html + '</div>', {
+					baseUrl: requestNote.base_url ? requestNote.base_url : '',
+					anchorNames: requestNote.anchor_names ? requestNote.anchor_names : [],
+				});
+				output.markup_language = Note.MARKUP_LANGUAGE_MARKDOWN;
+			}
 		}
 
 		if (requestNote.parent_id) {
@@ -486,6 +501,32 @@ class Api {
 		return newImagePath;
 	}
 
+	async buildNoteStyleSheet_(stylesheets) {
+		if (!stylesheets) return [];
+
+		const output = [];
+
+		for (const stylesheet of stylesheets) {
+			if (stylesheet.type === 'text') {
+				output.push(stylesheet.value);
+			} else if (stylesheet.type === 'url') {
+				try {
+					const tempPath = Setting.value('tempDir') + '/' + md5(Math.random() + '_' + Date.now()) + '.css';
+					await shim.fetchBlob(stylesheet.value, { path: tempPath, maxRetry: 1 });
+					const text = await shim.fsDriver().readFile(tempPath);
+					output.push(text);
+					await shim.fsDriver().remove(tempPath);
+				} catch (error) {
+					this.logger().warn('Cannot download stylesheet at ' + stylesheet.value, error);
+				}
+			} else {
+				throw new Error('Invalid stylesheet type: ' + stylesheet.type);
+			}
+		}
+
+		return output;
+	}
+
 	async downloadImage_(url, allowFileProtocolImages) {
 		const tempDir = Setting.value('tempDir');
 
@@ -571,21 +612,29 @@ class Api {
 		}
 	}
 
-	replaceImageUrlsByResources_(md, urls, imageSizes) {
-		let output = md.replace(/(!\[.*?\]\()([^\s\)]+)(.*?\))/g, (match, before, imageUrl, after) => {
-			const urlInfo = urls[imageUrl];
-			if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
-			const imageSize = imageSizes[urlInfo.originalUrl];
-			const resourceUrl = Resource.internalUrl(urlInfo.resource);
+	replaceImageUrlsByResources_(markupLanguage, md, urls, imageSizes) {
+		if (markupLanguage === Note.MARKUP_LANGUAGE_HTML) {
+			return htmlUtils.replaceImageUrls(md, imageUrl => {
+				const urlInfo = urls[imageUrl];
+				if (!urlInfo || !urlInfo.resource) return imageUrl;
+				return Resource.internalUrl(urlInfo.resource);
+			}); 
+		} else { 
+			let output = md.replace(/(!\[.*?\]\()([^\s\)]+)(.*?\))/g, (match, before, imageUrl, after) => {
+				const urlInfo = urls[imageUrl];
+				if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
+				const imageSize = imageSizes[urlInfo.originalUrl];
+				const resourceUrl = Resource.internalUrl(urlInfo.resource);
 
-			if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {
-				return '<img width="' + imageSize.width + '" height="' + imageSize.height + '" src="' + resourceUrl + '"/>';
-			} else {
-				return before + resourceUrl + after;
-			}
-		});
+				if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {
+					return '<img width="' + imageSize.width + '" height="' + imageSize.height + '" src="' + resourceUrl + '"/>';
+				} else {
+					return before + resourceUrl + after;
+				}
+			});
 
-		return output;
+			return output;
+		}
 	}
 
 

From 5460a977b1b6fe17c123d0e74effece29cc1b60e Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sun, 14 Jul 2019 19:52:57 +0100
Subject: [PATCH 02/18] Clipper: Fixed issues related to viewing images and to
 HTML comments that were incorrectly being displayed

---
 .../content_scripts/index.js                  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Clipper/joplin-webclipper/content_scripts/index.js b/Clipper/joplin-webclipper/content_scripts/index.js
index 943530de8..e0d61b7fc 100644
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -61,7 +61,8 @@
 		const output = {};
 		for (let i = 0; i < images.length; i++) {
 			const img = images[i];
-			const src = forceAbsoluteUrls ? absoluteUrl(img.currentSrc) : img.currentSrc;
+			let src = imageSrc(img);
+			src = forceAbsoluteUrls ? absoluteUrl(src) : src;
 			output[src] = {
 				width: img.width,
 				height: img.height,
@@ -86,6 +87,14 @@
 		return output;
 	}
 
+	// In general we should use currentSrc because that's the image that's currently displayed,
+	// especially within <picture> tags or with srcset. In these cases there can be multiple
+	// sources and the best one is probably the one being displayed, thus currentSrc.
+	function imageSrc(image) {
+		if (image.currentSrc) return image.currentSrc;
+		return image.src;
+	}
+
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
 	// And hard-code the image dimensions so that the information can be used by the clipper server to
 	// display them at the right sizes in the notes.
@@ -112,8 +121,9 @@
 				}
 
 				if (nodeName === 'img') {
-					node.src = absoluteUrl(node.currentSrc);
-					const imageSize = imageSizes[node.src];
+					const src = absoluteUrl(imageSrc(node));
+					node.setAttribute('src', src);
+					const imageSize = imageSizes[src];
 					if (imageSize) {
 						node.width = imageSize.width;
 						node.height = imageSize.height;
@@ -132,7 +142,7 @@
 	function preProcessDocument(element) {
 		const childNodes = element.childNodes;
 
-		for (let i = 0; i < childNodes.length; i++) {
+		for (let i = childNodes.length - 1; i >= 0; i--) {
 			const node = childNodes[i];
 			const nodeName = node.nodeName.toLowerCase();
 			const nodeParent = node.parentNode;
@@ -159,7 +169,9 @@
 				isVisible = false
 			}
 
-			if (!isVisible) {
+			if (node.nodeType === 8) { // Comments are just removed since we can't add a class
+				node.parentNode.removeChild(node);
+			} else if (!isVisible) {
 				node.classList.add('joplin-clipper-hidden');
 			} else {
 				preProcessDocument(node);

From 74ee629266dbb18f775abe029eb9b46357c19585 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 15 Jul 2019 00:44:45 +0100
Subject: [PATCH 03/18] Clipper: Fixed issue with relative links when importing
 HTML

---
 ReactNativeClient/lib/htmlUtils.js         | 29 ++++++++++++++++++----
 ReactNativeClient/lib/services/rest/Api.js |  5 +++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
index a7e7a142d..e13db1c07 100644
--- a/ReactNativeClient/lib/htmlUtils.js
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -1,5 +1,13 @@
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
+const urlUtils = require('lib/urlUtils.js');
+
+function headAndBodyHtml_(doc) {
+	const output = [];
+	if (doc.head) output.push(doc.head.innerHTML);
+	if (doc.body) output.push(doc.body.innerHTML);
+	return output.join('\n');
+}
 
 const htmlUtils = {
 
@@ -34,11 +42,22 @@ const htmlUtils = {
 
 		// This function returns the head and body but without the <head> and <body>
 		// tag, which for our purpose are not needed and can cause issues when present.
-		const output = [];
-		if (doc.head) output.push(doc.head.innerHTML);
-		if (doc.body) output.push(doc.body.innerHTML);
-		return output.join('\n');
-	},  
+		return headAndBodyHtml_(doc);
+	},
+
+	prependBaseUrl(html, baseUrl) {
+		const dom = new JSDOM(html);
+		const doc = dom.window.document;
+		const anchors = doc.getElementsByTagName('a');
+
+		for (const anchor of anchors) {
+			const href = anchor.getAttribute('href');
+			const newHref = urlUtils.prependBaseUrl(href, baseUrl);
+			anchor.setAttribute('href', newHref);
+		}
+
+		return headAndBodyHtml_(doc);
+	}, 
 
 };
 
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index d262a30bc..b473753af 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -432,6 +432,8 @@ class Api {
 
 		if (requestNote.id) output.id = requestNote.id;
 
+		const baseUrl = requestNote.base_url ? requestNote.base_url : '';
+
 		if (requestNote.body_html) {
 			if (requestNote.convert_to === 'html') {
 				const style = await this.buildNoteStyleSheet_(requestNote.stylesheets);
@@ -446,13 +448,14 @@ class Api {
 					// means a code block in Markdown.
 					collapseWhitespace: true,
 				});
+				output.body = htmlUtils.prependBaseUrl(output.body, baseUrl);
 				output.markup_language = Note.MARKUP_LANGUAGE_HTML;
 			} else { // Convert to Markdown 
 				// Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
 				// when getting the content from elsewhere. So here wrap it - it won't change anything to the final
 				// rendering but it makes sure everything will be parsed.
 				output.body = await this.htmlToMdParser().parse('<div>' + requestNote.body_html + '</div>', {
-					baseUrl: requestNote.base_url ? requestNote.base_url : '',
+					baseUrl: baseUrl,
 					anchorNames: requestNote.anchor_names ? requestNote.anchor_names : [],
 				});
 				output.markup_language = Note.MARKUP_LANGUAGE_MARKDOWN;

From c75618eb8fea4dc298ac0cc5f064a87db731fe82 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 15 Jul 2019 01:17:17 +0100
Subject: [PATCH 04/18] Clipper: Minor fixes

---
 ReactNativeClient/lib/htmlUtils.js         | 1 +
 ReactNativeClient/lib/services/rest/Api.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
index e13db1c07..77414eafe 100644
--- a/ReactNativeClient/lib/htmlUtils.js
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -52,6 +52,7 @@ const htmlUtils = {
 
 		for (const anchor of anchors) {
 			const href = anchor.getAttribute('href');
+			if (!href) continue;
 			const newHref = urlUtils.prependBaseUrl(href, baseUrl);
 			anchor.setAttribute('href', newHref);
 		}
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index b473753af..b9f0d3be6 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -437,9 +437,10 @@ class Api {
 		if (requestNote.body_html) {
 			if (requestNote.convert_to === 'html') {
 				const style = await this.buildNoteStyleSheet_(requestNote.stylesheets);
+				const minify = require('html-minifier').minify;
+
 				const styleTag = style.length ? '<style>' + style.join('\n') + '</style>' + '\n' : '';
 
-				const minify = require('html-minifier').minify;
 				output.body = minify(styleTag + requestNote.body_html, {
 					// Remove all spaces and, especially, newlines from tag attributes, as that would
 					// break the rendering.
@@ -447,6 +448,7 @@ class Api {
 					// Need to remove all whitespaces because whitespace at a beginning of a line
 					// means a code block in Markdown.
 					collapseWhitespace: true,
+					minifyCSS: true,
 				});
 				output.body = htmlUtils.prependBaseUrl(output.body, baseUrl);
 				output.markup_language = Note.MARKUP_LANGUAGE_HTML;

From fbb0ac58927324f6771808a2be6441cbc8a0da32 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 15 Jul 2019 20:43:28 +0000
Subject: [PATCH 05/18] Clipper: Refactored image rules to re-use more code

---
 CliClient/tests/htmlUtils.js                  | 15 +++++++
 .../lib/MdToHtml/rules/html_image.js          | 21 ++--------
 ReactNativeClient/lib/MdToHtml/rules/image.js | 21 ++--------
 ReactNativeClient/lib/MdToHtml/utils.js       | 26 +++++++++++-
 ReactNativeClient/lib/htmlUtils.js            | 41 +++++++++++++------
 5 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/CliClient/tests/htmlUtils.js b/CliClient/tests/htmlUtils.js
index 0181025f3..d4350d3ac 100644
--- a/CliClient/tests/htmlUtils.js
+++ b/CliClient/tests/htmlUtils.js
@@ -30,4 +30,19 @@ describe('htmlUtils', function() {
 		done();
 	});
 
+	it('should encode attributes', async (done) => {
+		const testCases = [
+			[{ a: 'one', b: 'two' }, 'a="one" b="two"'],
+			[{ a: 'one&two' }, 'a="one&amp;two"'],
+		];
+
+		for (let i = 0; i < testCases.length; i++) {
+			const attrs = testCases[i][0];
+			const expected = testCases[i][1];
+			expect(htmlUtils.attributesHtml(attrs)).toBe(expected);
+		}
+
+		done();
+	});
+
 });
\ No newline at end of file
diff --git a/ReactNativeClient/lib/MdToHtml/rules/html_image.js b/ReactNativeClient/lib/MdToHtml/rules/html_image.js
index da8dfd1fa..5607af77b 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/html_image.js
+++ b/ReactNativeClient/lib/MdToHtml/rules/html_image.js
@@ -1,26 +1,13 @@
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
+const htmlUtils = require('lib/htmlUtils.js');
 const utils = require('../utils');
 
 function renderImageHtml(before, src, after, ruleOptions) {
-	const resourceId = Resource.urlToId(src);
-	const result = ruleOptions.resources[resourceId];
-	const resource = result ? result.item : null;
-	const resourceStatus = utils.resourceStatus(result);
-
-	if (resourceStatus !== 'ready') {
-		const icon = utils.resourceStatusImage(resourceStatus);
-		return '<div class="not-loaded-resource resource-status-' + resourceStatus + '" data-resource-id="' + resourceId + '">' + '<img src="data:image/svg+xml;utf8,' + htmlentities(icon) + '"/>' + '</div>';
-	}
-
-	const mime = resource.mime ? resource.mime.toLowerCase() : '';
-	if (Resource.isSupportedImageMimeType(mime)) {
-		let newSrc = './' + Resource.filename(resource);
-		if (ruleOptions.resourceBaseUrl) newSrc = ruleOptions.resourceBaseUrl + newSrc;
-		return '<img ' + before + ' data-resource-id="' + resource.id + '" src="' + newSrc + '" ' + after + '/>';
-	}
-
+	const r = utils.imageReplacement(src, ruleOptions.resources, ruleOptions.resourceBaseUrl);
+	if (typeof r === 'string') return r;
+	if (r) return '<img ' + before + ' ' + htmlUtils.attributesHtml(r) + ' ' + after + '/>';
 	return '[Image: ' + htmlentities(resource.title) + ' (' + htmlentities(mime) + ')]';
 }
 
diff --git a/ReactNativeClient/lib/MdToHtml/rules/image.js b/ReactNativeClient/lib/MdToHtml/rules/image.js
index dfbbf69ba..c4b90b89c 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/image.js
+++ b/ReactNativeClient/lib/MdToHtml/rules/image.js
@@ -2,6 +2,7 @@ const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
 const utils = require('../utils');
+const htmlUtils = require('lib/htmlUtils.js');
 
 function installRule(markdownIt, mdOptions, ruleOptions) {
 	const defaultRender = markdownIt.renderer.rules.image;
@@ -13,23 +14,9 @@ function installRule(markdownIt, mdOptions, ruleOptions) {
 
 		if (!Resource.isResourceUrl(src)) return defaultRender(tokens, idx, options, env, self);
 
-		const resourceId = Resource.urlToId(src);
-		const result = ruleOptions.resources[resourceId];
-		const resource = result ? result.item : null;
-		const resourceStatus = utils.resourceStatus(result);
-
-		if (resourceStatus !== 'ready') {
-			const icon = utils.resourceStatusImage(resourceStatus);
-			return '<div class="not-loaded-resource resource-status-' + resourceStatus + '" data-resource-id="' + resourceId + '">' + '<img src="data:image/svg+xml;utf8,' + htmlentities(icon) + '"/>' + '</div>';
-		}
-
-		const mime = resource.mime ? resource.mime.toLowerCase() : '';
-		if (Resource.isSupportedImageMimeType(mime)) {
-			let realSrc = './' + Resource.filename(resource);
-			if (ruleOptions.resourceBaseUrl) realSrc = ruleOptions.resourceBaseUrl + realSrc;
-			let output = '<img data-from-md data-resource-id="' + resource.id + '" title="' + htmlentities(title) + '" src="' + realSrc + '"/>';
-			return output;
-		}
+		const r = utils.imageReplacement(src, ruleOptions.resources, ruleOptions.resourceBaseUrl);
+		if (typeof r === 'string') return r;
+		if (r) return '<img data-from-md ' + htmlUtils.attributesHtml(Object.assign({}, r, { title: title })) + '/>';
 
 		return defaultRender(tokens, idx, options, env, self);
 	};
diff --git a/ReactNativeClient/lib/MdToHtml/utils.js b/ReactNativeClient/lib/MdToHtml/utils.js
index d830ba6bb..0febfc1a6 100644
--- a/ReactNativeClient/lib/MdToHtml/utils.js
+++ b/ReactNativeClient/lib/MdToHtml/utils.js
@@ -68,7 +68,7 @@ utils.resourceStatusFile = function(state) {
 	throw new Error('Unknown state: ' + state);
 }
 
-utils.resourceStatus = function(resourceInfo, localState) {
+utils.resourceStatus = function(resourceInfo) {
 	let resourceStatus = 'ready';
 
 	if (resourceInfo) {
@@ -91,4 +91,28 @@ utils.resourceStatus = function(resourceInfo, localState) {
 	return resourceStatus;
 }
 
+utils.imageReplacement = function(src, resources, resourceBaseUrl) {
+	const resourceId = Resource.urlToId(src);
+	const result = resources[resourceId];
+	const resource = result ? result.item : null;
+	const resourceStatus = utils.resourceStatus(result);
+
+	if (resourceStatus !== 'ready') {
+		const icon = utils.resourceStatusImage(resourceStatus);
+		return '<div class="not-loaded-resource resource-status-' + resourceStatus + '" data-resource-id="' + resourceId + '">' + '<img src="data:image/svg+xml;utf8,' + htmlentities(icon) + '"/>' + '</div>';
+	}
+
+	const mime = resource.mime ? resource.mime.toLowerCase() : '';
+	if (Resource.isSupportedImageMimeType(mime)) {
+		let newSrc = './' + Resource.filename(resource);
+		if (resourceBaseUrl) newSrc = resourceBaseUrl + newSrc;
+		return {
+			'data-resource-id': resource.id,
+			'src': newSrc,
+		};
+	}
+
+	return null;
+}
+
 module.exports = utils;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
index 77414eafe..31538319d 100644
--- a/ReactNativeClient/lib/htmlUtils.js
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -1,15 +1,17 @@
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 const urlUtils = require('lib/urlUtils.js');
+const Entities = require('html-entities').AllHtmlEntities;
+const htmlentities = (new Entities()).encode;
 
-function headAndBodyHtml_(doc) {
-	const output = [];
-	if (doc.head) output.push(doc.head.innerHTML);
-	if (doc.body) output.push(doc.body.innerHTML);
-	return output.join('\n');
-}
+class HtmlUtils {
 
-const htmlUtils = {
+	headAndBodyHtml(doc) {
+		const output = [];
+		if (doc.head) output.push(doc.head.innerHTML);
+		if (doc.body) output.push(doc.body.innerHTML);
+		return output.join('\n');
+	}
 
 	extractImageUrls(html) {
 		if (!html) return [];
@@ -25,7 +27,7 @@ const htmlUtils = {
 		}
 
 		return output;
-	},
+	}
 
 	replaceImageUrls(html, callback) {
 		if (!html) return '';
@@ -42,8 +44,8 @@ const htmlUtils = {
 
 		// This function returns the head and body but without the <head> and <body>
 		// tag, which for our purpose are not needed and can cause issues when present.
-		return headAndBodyHtml_(doc);
-	},
+		return this.headAndBodyHtml(doc);
+	}
 
 	prependBaseUrl(html, baseUrl) {
 		const dom = new JSDOM(html);
@@ -57,9 +59,22 @@ const htmlUtils = {
 			anchor.setAttribute('href', newHref);
 		}
 
-		return headAndBodyHtml_(doc);
-	}, 
+		return this.headAndBodyHtml(doc);
+	}
 
-};
+	attributesHtml(attr) {
+		const output = [];
+
+		for (const n in attr) {
+			if (!attr.hasOwnProperty(n)) continue;
+			output.push(n + '="' + htmlentities(attr[n]) + '"');
+		}
+
+		return output.join(' ');
+	}
+
+}
+
+const htmlUtils = new HtmlUtils();
 
 module.exports = htmlUtils;
\ No newline at end of file

From 38e8a881d53207fbbbcec3a485a5d6ffb1c871db Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Tue, 16 Jul 2019 19:05:47 +0100
Subject: [PATCH 06/18] More refactoring to easily handle multiple renderers

---
 ElectronClient/app/compile.js                 |  2 +-
 ElectronClient/app/gui/NoteRevisionViewer.jsx |  2 +-
 ElectronClient/app/gui/NoteText.jsx           | 42 ++++++++++--------
 .../lib/components/note-body-viewer.js        |  2 +-
 ReactNativeClient/lib/markdownUtils.js        |  2 +-
 ReactNativeClient/lib/renderers/HtmlToHtml.js | 43 +++++++++++++++++++
 .../lib/renderers/MarkupToHtml.js             | 35 +++++++++++++++
 .../lib/{ => renderers}/MdToHtml.js           |  4 +-
 .../MdToHtml/rules/checkbox.js                |  2 +-
 .../MdToHtml/rules/code_inline.js             |  0
 .../MdToHtml/rules/highlight_keywords.js      |  2 +-
 .../MdToHtml/rules/html_image.js              |  2 +-
 .../{ => renderers}/MdToHtml/rules/image.js   |  2 +-
 .../{ => renderers}/MdToHtml/rules/katex.js   |  0
 .../MdToHtml/rules/link_open.js               |  2 +-
 .../{ => renderers}/MdToHtml/setupLinkify.js  |  0
 .../lib/{MdToHtml => renderers}/noteStyle.js  |  0
 .../lib/{MdToHtml => renderers}/utils.js      |  0
 .../lib/{MdToHtml => renderers}/webviewLib.js |  0
 Tools/buildReactNativeInjectedJs.js           |  2 +-
 20 files changed, 115 insertions(+), 29 deletions(-)
 create mode 100644 ReactNativeClient/lib/renderers/HtmlToHtml.js
 create mode 100644 ReactNativeClient/lib/renderers/MarkupToHtml.js
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml.js (98%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/checkbox.js (99%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/code_inline.js (100%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/highlight_keywords.js (98%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/html_image.js (98%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/image.js (96%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/katex.js (100%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/rules/link_open.js (98%)
 rename ReactNativeClient/lib/{ => renderers}/MdToHtml/setupLinkify.js (100%)
 rename ReactNativeClient/lib/{MdToHtml => renderers}/noteStyle.js (100%)
 rename ReactNativeClient/lib/{MdToHtml => renderers}/utils.js (100%)
 rename ReactNativeClient/lib/{MdToHtml => renderers}/webviewLib.js (100%)

diff --git a/ElectronClient/app/compile.js b/ElectronClient/app/compile.js
index aaff1a5ee..4d8254e05 100644
--- a/ElectronClient/app/compile.js
+++ b/ElectronClient/app/compile.js
@@ -47,7 +47,7 @@ convertJsx(__dirname + '/plugins');
 const libContent = [
 	fs.readFileSync(basePath + '/ReactNativeClient/lib/string-utils-common.js', 'utf8'),
 	fs.readFileSync(basePath + '/ReactNativeClient/lib/markJsUtils.js', 'utf8'),
-	fs.readFileSync(basePath + '/ReactNativeClient/lib/MdToHtml/webviewLib.js', 'utf8'),
+	fs.readFileSync(basePath + '/ReactNativeClient/lib/renderers/webviewLib.js', 'utf8'),
 ];
 
 fs.writeFileSync(__dirname + '/gui/note-viewer/lib.js', libContent.join('\n'), 'utf8');
diff --git a/ElectronClient/app/gui/NoteRevisionViewer.jsx b/ElectronClient/app/gui/NoteRevisionViewer.jsx
index f6452a1fc..02617ec28 100644
--- a/ElectronClient/app/gui/NoteRevisionViewer.jsx
+++ b/ElectronClient/app/gui/NoteRevisionViewer.jsx
@@ -9,7 +9,7 @@ const Revision = require('lib/models/Revision');
 const Setting = require('lib/models/Setting');
 const RevisionService = require('lib/services/RevisionService');
 const shared = require('lib/components/shared/note-screen-shared.js');
-const MdToHtml = require('lib/MdToHtml');
+const MdToHtml = require('lib/renderers/MdToHtml');
 const { time } = require('lib/time-utils.js');
 const ReactTooltip = require('react-tooltip');
 const { substrWithEllipsis } = require('lib/string-utils');
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index c5f61b07b..61263a027 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -12,7 +12,7 @@ const TagList = require('./TagList.min.js');
 const { connect } = require('react-redux');
 const { _ } = require('lib/locale.js');
 const { reg } = require('lib/registry.js');
-const MdToHtml = require('lib/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
 const shared = require('lib/components/shared/note-screen-shared.js');
 const { bridge } = require('electron').remote.require('./bridge');
 const { themeStyle } = require('../theme.js');
@@ -325,12 +325,12 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	mdToHtml() {
-		if (this.mdToHtml_) return this.mdToHtml_;
-		this.mdToHtml_ = new MdToHtml({
+	markupToHtml() {
+		if (this.markupToHtml_) return this.markupToHtml_;
+		this.markupToHtml_ = new MarkupToHtml({
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
-		return this.mdToHtml_;
+		return this.markupToHtml_;
 	}
 
 	async componentWillMount() {
@@ -355,7 +355,7 @@ class NoteTextComponent extends React.Component {
 
 		this.lastLoadedNoteId_ = note ? note.id : null;
 
-		this.updateHtml(note && note.body ? note.body : '');
+		this.updateHtml(note ? note.markup_language : null, note && note.body ? note.body : '');
 
 		eventManager.on('alarmChange', this.onAlarmChange_);
 		eventManager.on('noteTypeToggle', this.onNoteTypeToggle_);
@@ -369,7 +369,7 @@ class NoteTextComponent extends React.Component {
 	componentWillUnmount() {
 		this.saveIfNeeded();
 
-		this.mdToHtml_ = null;
+		this.markupToHtml_ = null;
 
 		eventManager.removeListener('alarmChange', this.onAlarmChange_);
 		eventManager.removeListener('noteTypeToggle', this.onNoteTypeToggle_);
@@ -481,7 +481,7 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		this.mdToHtml_ = null;
+		this.markupToHtml_ = null;
 
 		// If we are loading nothing (noteId == null), make sure to
 		// set webviewReady to false too because the webview component
@@ -595,7 +595,7 @@ class NoteTextComponent extends React.Component {
 
 		// if (newState.note) await shared.refreshAttachedResources(this, newState.note.body);
 
-		this.updateHtml(newState.note ? newState.note.body : '');
+		this.updateHtml(newState.note ? newState.note.markup_language : null, newState.note ? newState.note.body : '');
 	}
 
 	async componentWillReceiveProps(nextProps) {
@@ -930,12 +930,20 @@ class NoteTextComponent extends React.Component {
 		}
 	}
 
-	async updateHtml(body = null, options = null) {
+	async updateHtml(markupLanguage = null, body = null, options = null) {
 		if (!options) options = {};
 		if (!('useCustomCss' in options)) options.useCustomCss = true;
 
 		let bodyToRender = body;
-		if (bodyToRender === null) bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+
+		if (bodyToRender === null) {
+			bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+			markupLanguage = this.state.note ? this.state.note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
+		}
+
+		if (!markupLanguage) markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
+
+		const resources = await shared.attachedResources(bodyToRender);
 
 		const theme = themeStyle(this.props.theme);
 
@@ -943,7 +951,7 @@ class NoteTextComponent extends React.Component {
 			codeTheme: theme.codeThemeCss,
 			postMessageSyntax: 'ipcProxySendToHost',
 			userCss: options.useCustomCss ? this.props.customCss : '',
-			resources: await shared.attachedResources(bodyToRender),
+			resources: resources,
 			codeHighlightCacheKey: this.state.note ? this.state.note.id : null,
 		};
 
@@ -953,10 +961,10 @@ class NoteTextComponent extends React.Component {
 
 		if (!bodyToRender.trim() && visiblePanes.indexOf('viewer') >= 0 && visiblePanes.indexOf('editor') < 0) {
 			// Fixes https://github.com/laurent22/joplin/issues/217
-			bodyToRender = '*' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '*';
+			bodyToRender = '<i>' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '</i>';
 		}
 
-		const result = this.mdToHtml().render(bodyToRender, theme, mdOptions);
+		const result = this.markupToHtml().render(markupLanguage, bodyToRender, theme, mdOptions);
 
 		this.setState({
 			bodyHtml: result.html,
@@ -1079,7 +1087,7 @@ class NoteTextComponent extends React.Component {
 					lastSavedNote: Object.assign({}, note),
 				});
 
-				this.updateHtml(note.body);
+				this.updateHtml(note.markup_language, note.body);
 			} catch (error) {
 				reg.logger().error(error);
 				bridge().showErrorMessageBox(error.message);
@@ -1108,13 +1116,13 @@ class NoteTextComponent extends React.Component {
 		const previousTheme = Setting.value('theme');
 		Setting.setValue('theme', Setting.THEME_LIGHT);
 		this.lastSetHtml_ = '';
-		await this.updateHtml(tempBody, { useCustomCss: false });
+		await this.updateHtml(this.state.note.markup_language, tempBody, { useCustomCss: false });
 		this.forceUpdate();
 
 		const restoreSettings = async () => {
 			Setting.setValue('theme', previousTheme);
 			this.lastSetHtml_ = '';
-			await this.updateHtml(previousBody);
+			await this.updateHtml(this.state.note.markup_language, previousBody);
 			this.forceUpdate();
 		}
 
diff --git a/ReactNativeClient/lib/components/note-body-viewer.js b/ReactNativeClient/lib/components/note-body-viewer.js
index 9a93595e1..9cf727ac0 100644
--- a/ReactNativeClient/lib/components/note-body-viewer.js
+++ b/ReactNativeClient/lib/components/note-body-viewer.js
@@ -6,7 +6,7 @@ const Resource = require('lib/models/Resource.js');
 const Setting = require('lib/models/Setting.js');
 const { reg } = require('lib/registry.js');
 const { shim } = require('lib/shim');
-const MdToHtml = require('lib/MdToHtml.js');
+const MdToHtml = require('lib/renderers/MdToHtml.js');
 const shared = require('lib/components/shared/note-screen-shared.js');
 
 class NoteBodyViewer extends Component {
diff --git a/ReactNativeClient/lib/markdownUtils.js b/ReactNativeClient/lib/markdownUtils.js
index 8447426af..3c51e1dd8 100644
--- a/ReactNativeClient/lib/markdownUtils.js
+++ b/ReactNativeClient/lib/markdownUtils.js
@@ -1,7 +1,7 @@
 const stringPadding = require('string-padding');
 const urlUtils = require('lib/urlUtils');
 const MarkdownIt = require('markdown-it');
-const setupLinkify = require('lib/MdToHtml/setupLinkify');
+const setupLinkify = require('lib/renderers/MdToHtml/setupLinkify');
 
 const markdownUtils = {
 
diff --git a/ReactNativeClient/lib/renderers/HtmlToHtml.js b/ReactNativeClient/lib/renderers/HtmlToHtml.js
new file mode 100644
index 000000000..d9e309334
--- /dev/null
+++ b/ReactNativeClient/lib/renderers/HtmlToHtml.js
@@ -0,0 +1,43 @@
+const Resource = require('lib/models/Resource');
+const htmlUtils = require('lib/htmlUtils');
+const utils = require('./utils');
+const jsdom = require("jsdom");
+const { JSDOM } = jsdom;
+
+class HtmlToHtml {
+
+	constructor(options) {
+		this.resourceBaseUrl_ = 'resourceBaseUrl' in options ? options.resourceBaseUrl : null;
+	}
+
+	render(markup, theme, options) {
+		const dom = new JSDOM(markup);
+		
+		// Replace all the image resource IDs by path to local files
+		const imgs = dom.window.document.getElementsByTagName('img');
+		for (const img of imgs) {
+			if (!img.src) continue;
+			const r = utils.imageReplacement(img.src, options.resources, this.resourceBaseUrl_);
+			if (!r) continue;
+
+			if (typeof r === 'string') {
+				img.outerHTML = r;
+			} else {
+				for (const n in r) {
+					img.setAttribute(n, r[n]);
+				}
+			}
+		}
+
+		// We need this extra style so that the images don't overflow
+		const extraStyle = '<style>img {max-width: 100%;height: auto;}</style>'
+
+		return {
+			html: extraStyle + htmlUtils.headAndBodyHtml(dom.window.document),
+			cssFiles: [],
+		}
+	}
+
+}
+
+module.exports = HtmlToHtml;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/renderers/MarkupToHtml.js b/ReactNativeClient/lib/renderers/MarkupToHtml.js
new file mode 100644
index 000000000..7e2800332
--- /dev/null
+++ b/ReactNativeClient/lib/renderers/MarkupToHtml.js
@@ -0,0 +1,35 @@
+const MdToHtml = require('./MdToHtml');
+const HtmlToHtml = require('./HtmlToHtml');
+const Note = require('lib/models/Note');
+
+class MarkupToHtml {
+
+	constructor(options) {
+		this.options_ = options;
+		this.renderers_ = {};
+	}
+
+	renderer(markupLanguage) {
+		if (this.renderers_[markupLanguage]) return this.renderers_[markupLanguage];
+
+		let RendererClass = null;
+
+		if (markupLanguage === Note.MARKUP_LANGUAGE_MARKDOWN) {
+			RendererClass = MdToHtml;
+		} else if (markupLanguage === Note.MARKUP_LANGUAGE_HTML) {
+			RendererClass = HtmlToHtml;
+		} else {
+			throw new Error('Invalid markup language: ' + markupLanguage);
+		}
+
+		this.renderers_[markupLanguage] = new RendererClass(this.options_);
+		return this.renderers_[markupLanguage];
+	}
+
+	render(markupLanguage, markup, theme, options) {
+		return this.renderer(markupLanguage).render(markup, theme, options);
+	}
+
+}
+
+module.exports = MarkupToHtml;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/MdToHtml.js b/ReactNativeClient/lib/renderers/MdToHtml.js
similarity index 98%
rename from ReactNativeClient/lib/MdToHtml.js
rename to ReactNativeClient/lib/renderers/MdToHtml.js
index 52e31a2d8..e8f0901b1 100644
--- a/ReactNativeClient/lib/MdToHtml.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml.js
@@ -6,8 +6,8 @@ const { shim } = require('lib/shim.js');
 const { _ } = require('lib/locale');
 const md5 = require('md5');
 const StringUtils = require('lib/string-utils.js');
-const noteStyle = require('./MdToHtml/noteStyle');
-const Setting = require('./models/Setting.js');
+const noteStyle = require('./noteStyle');
+const Setting = require('lib/models/Setting.js');
 const rules = {
 	image: require('./MdToHtml/rules/image'),
 	checkbox: require('./MdToHtml/rules/checkbox'),
diff --git a/ReactNativeClient/lib/MdToHtml/rules/checkbox.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js
similarity index 99%
rename from ReactNativeClient/lib/MdToHtml/rules/checkbox.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js
index bfc8a1e43..f059b170b 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/checkbox.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml/rules/checkbox.js
@@ -1,7 +1,7 @@
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
-const utils = require('../utils');
+const utils = require('../../utils');
 
 let checkboxIndex_ = -1;
 
diff --git a/ReactNativeClient/lib/MdToHtml/rules/code_inline.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/code_inline.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/rules/code_inline.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/code_inline.js
diff --git a/ReactNativeClient/lib/MdToHtml/rules/highlight_keywords.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/highlight_keywords.js
similarity index 98%
rename from ReactNativeClient/lib/MdToHtml/rules/highlight_keywords.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/highlight_keywords.js
index 49e8ff26f..7b5a622f8 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/highlight_keywords.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml/rules/highlight_keywords.js
@@ -1,7 +1,7 @@
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
-const utils = require('../utils');
+const utils = require('../../utils');
 const StringUtils = require('lib/string-utils.js');
 const md5 = require('md5');
 
diff --git a/ReactNativeClient/lib/MdToHtml/rules/html_image.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/html_image.js
similarity index 98%
rename from ReactNativeClient/lib/MdToHtml/rules/html_image.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/html_image.js
index 5607af77b..9c0d0212c 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/html_image.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml/rules/html_image.js
@@ -2,7 +2,7 @@ const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
 const htmlUtils = require('lib/htmlUtils.js');
-const utils = require('../utils');
+const utils = require('../../utils');
 
 function renderImageHtml(before, src, after, ruleOptions) {
 	const r = utils.imageReplacement(src, ruleOptions.resources, ruleOptions.resourceBaseUrl);
diff --git a/ReactNativeClient/lib/MdToHtml/rules/image.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/image.js
similarity index 96%
rename from ReactNativeClient/lib/MdToHtml/rules/image.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/image.js
index c4b90b89c..95b61453c 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/image.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml/rules/image.js
@@ -1,7 +1,7 @@
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
-const utils = require('../utils');
+const utils = require('../../utils');
 const htmlUtils = require('lib/htmlUtils.js');
 
 function installRule(markdownIt, mdOptions, ruleOptions) {
diff --git a/ReactNativeClient/lib/MdToHtml/rules/katex.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/katex.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/rules/katex.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/katex.js
diff --git a/ReactNativeClient/lib/MdToHtml/rules/link_open.js b/ReactNativeClient/lib/renderers/MdToHtml/rules/link_open.js
similarity index 98%
rename from ReactNativeClient/lib/MdToHtml/rules/link_open.js
rename to ReactNativeClient/lib/renderers/MdToHtml/rules/link_open.js
index d786c3fbe..7dd24fdab 100644
--- a/ReactNativeClient/lib/MdToHtml/rules/link_open.js
+++ b/ReactNativeClient/lib/renderers/MdToHtml/rules/link_open.js
@@ -1,7 +1,7 @@
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 const Resource = require('lib/models/Resource.js');
-const utils = require('../utils');
+const utils = require('../../utils');
 
 const loaderImage = '<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="16px" height="16px" viewBox="0 0 128 128" xml:space="preserve"><g><circle cx="16" cy="64" r="16" fill="#000000" fill-opacity="1"/><circle cx="16" cy="64" r="16" fill="#555555" fill-opacity="0.67" transform="rotate(45,64,64)"/><circle cx="16" cy="64" r="16" fill="#949494" fill-opacity="0.42" transform="rotate(90,64,64)"/><circle cx="16" cy="64" r="16" fill="#cccccc" fill-opacity="0.2" transform="rotate(135,64,64)"/><circle cx="16" cy="64" r="16" fill="#e1e1e1" fill-opacity="0.12" transform="rotate(180,64,64)"/><circle cx="16" cy="64" r="16" fill="#e1e1e1" fill-opacity="0.12" transform="rotate(225,64,64)"/><circle cx="16" cy="64" r="16" fill="#e1e1e1" fill-opacity="0.12" transform="rotate(270,64,64)"/><circle cx="16" cy="64" r="16" fill="#e1e1e1" fill-opacity="0.12" transform="rotate(315,64,64)"/><animateTransform attributeName="transform" type="rotate" values="0 64 64;315 64 64;270 64 64;225 64 64;180 64 64;135 64 64;90 64 64;45 64 64" calcMode="discrete" dur="720ms" repeatCount="indefinite"></animateTransform></g></svg>';
 
diff --git a/ReactNativeClient/lib/MdToHtml/setupLinkify.js b/ReactNativeClient/lib/renderers/MdToHtml/setupLinkify.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/setupLinkify.js
rename to ReactNativeClient/lib/renderers/MdToHtml/setupLinkify.js
diff --git a/ReactNativeClient/lib/MdToHtml/noteStyle.js b/ReactNativeClient/lib/renderers/noteStyle.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/noteStyle.js
rename to ReactNativeClient/lib/renderers/noteStyle.js
diff --git a/ReactNativeClient/lib/MdToHtml/utils.js b/ReactNativeClient/lib/renderers/utils.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/utils.js
rename to ReactNativeClient/lib/renderers/utils.js
diff --git a/ReactNativeClient/lib/MdToHtml/webviewLib.js b/ReactNativeClient/lib/renderers/webviewLib.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/webviewLib.js
rename to ReactNativeClient/lib/renderers/webviewLib.js
diff --git a/Tools/buildReactNativeInjectedJs.js b/Tools/buildReactNativeInjectedJs.js
index e740e9503..21dfc2d8a 100644
--- a/Tools/buildReactNativeInjectedJs.js
+++ b/Tools/buildReactNativeInjectedJs.js
@@ -18,7 +18,7 @@ async function copyJs(name, filePath) {
 
 async function main(argv) {
 	await fs.mkdirp(outputDir);
-	await copyJs('webviewLib', rnDir + '/lib/MdToHtml/webviewLib.js');	
+	await copyJs('webviewLib', rnDir + '/lib/renderers/MdToHtml/webviewLib.js');	
 }
 
 main(process.argv).catch((error) => {

From 2361c5a5e7ef1421246f76630af71c3eea7d8103 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Tue, 16 Jul 2019 21:47:44 +0100
Subject: [PATCH 07/18] Clipper: Better handling of images when multiple images
 have the same source but with different dimensions

---
 .../content_scripts/index.js                  | 33 ++++++++++++++-----
 ReactNativeClient/lib/renderers/HtmlToHtml.js |  2 +-
 ReactNativeClient/lib/services/rest/Api.js    |  9 +++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Clipper/joplin-webclipper/content_scripts/index.js b/Clipper/joplin-webclipper/content_scripts/index.js
index e0d61b7fc..ef38cd056 100644
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -61,14 +61,19 @@
 		const output = {};
 		for (let i = 0; i < images.length; i++) {
 			const img = images[i];
+			if (img.classList && img.classList.contains('joplin-clipper-hidden')) continue;
+
 			let src = imageSrc(img);
 			src = forceAbsoluteUrls ? absoluteUrl(src) : src;
-			output[src] = {
+
+			if (!output[src]) output[src] = [];
+
+			output[src].push({
 				width: img.width,
 				height: img.height,
 				naturalWidth: img.naturalWidth,
 				naturalHeight: img.naturalHeight,
-			};
+			});
 		}
 		return output;
 	}
@@ -98,17 +103,18 @@
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
 	// And hard-code the image dimensions so that the information can be used by the clipper server to
 	// display them at the right sizes in the notes.
-	function cleanUpElement(element, imageSizes) {
+	function cleanUpElement(element, imageSizes, imageIndexes) {
 		const childNodes = element.childNodes;
+		const hiddenNodes = [];
 
-		for (let i = childNodes.length - 1; i >= 0; i--) {
+		for (let i = 0; i < childNodes.length; i++) {
 			const node = childNodes[i];
 			const nodeName = node.nodeName.toLowerCase();
 
 			const isHidden = node && node.classList && node.classList.contains('joplin-clipper-hidden');
 
 			if (isHidden) {
-				element.removeChild(node);
+				hiddenNodes.push(node);
 			} else {
 
 				// If the data-joplin-clipper-value has been set earlier, create a new DIV element
@@ -123,16 +129,23 @@
 				if (nodeName === 'img') {
 					const src = absoluteUrl(imageSrc(node));
 					node.setAttribute('src', src);
-					const imageSize = imageSizes[src];
+					if (!(src in imageIndexes)) imageIndexes[src] = 0;
+					const imageSize = imageSizes[src][imageIndexes[src]];
+					imageIndexes[src]++;
 					if (imageSize) {
 						node.width = imageSize.width;
 						node.height = imageSize.height;
 					}
 				}
 
-				cleanUpElement(node, imageSizes);
+				cleanUpElement(node, imageSizes, imageIndexes);
 			}
 		}
+
+		for (const hiddenNode of hiddenNodes) {
+			if (!hiddenNode.parentNode) continue;
+			hiddenNode.parentNode.remove(hiddenNode);
+		}
 	}
 
 	// When we clone the document before cleaning it, we lose some of the information that might have been set via CSS or
@@ -292,7 +305,8 @@
 			// directly on the document, so we make a copy of it first.
 			const cleanDocument = document.body.cloneNode(true);
 			const imageSizes = getImageSizes(document, true);
-			cleanUpElement(cleanDocument, imageSizes);
+			const imageIndexes = {};
+			cleanUpElement(cleanDocument, imageSizes, imageIndexes);
 
 			const stylesheets = command.preProcessFor === 'html' ? getStyleSheets(document) : null;
 			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document), stylesheets);
@@ -305,7 +319,8 @@
 			const container = document.createElement('div');
 			container.appendChild(range.cloneContents());
 			const imageSizes = getImageSizes(document, true);
-			cleanUpElement(container, imageSizes);
+			const imageIndexes = {};
+			cleanUpElement(container, imageSizes, imageIndexes);
 			return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document), getAnchorNames(document));
 
 		} else if (command.name === 'screenshot') {
diff --git a/ReactNativeClient/lib/renderers/HtmlToHtml.js b/ReactNativeClient/lib/renderers/HtmlToHtml.js
index d9e309334..14d0f1392 100644
--- a/ReactNativeClient/lib/renderers/HtmlToHtml.js
+++ b/ReactNativeClient/lib/renderers/HtmlToHtml.js
@@ -30,7 +30,7 @@ class HtmlToHtml {
 		}
 
 		// We need this extra style so that the images don't overflow
-		const extraStyle = '<style>img {max-width: 100%;height: auto;}</style>'
+		const extraStyle = ''; //<style>img {max-width: 100%;height: auto;}</style>'
 
 		return {
 			html: extraStyle + htmlUtils.headAndBodyHtml(dom.window.document),
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index b9f0d3be6..b167b0dd4 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -15,6 +15,7 @@ const md5 = require('md5');
 const { shim } = require('lib/shim');
 const HtmlToMd = require('lib/HtmlToMd');
 const urlUtils = require('lib/urlUtils.js');
+const ArrayUtils = require('lib/ArrayUtils.js');
 const { netUtils } = require('lib/net-utils');
 const { fileExtension, safeFileExtension, safeFilename, filename } = require('lib/path-utils');
 const ApiResponse = require('lib/services/rest/ApiResponse');
@@ -371,7 +372,7 @@ class Api {
 
 			let note = await this.requestNoteToNote_(requestNote);
 
-			const imageUrls = markupLanguageUtils.extractImageUrls(note.markup_language, note.body);
+			const imageUrls = ArrayUtils.unique(markupLanguageUtils.extractImageUrls(note.markup_language, note.body));
 
 			this.logger().info('Request (' + requestId + '): Downloading images: ' + imageUrls.length);
 
@@ -618,6 +619,8 @@ class Api {
 	}
 
 	replaceImageUrlsByResources_(markupLanguage, md, urls, imageSizes) {
+		const imageSizesIndexes = {};
+
 		if (markupLanguage === Note.MARKUP_LANGUAGE_HTML) {
 			return htmlUtils.replaceImageUrls(md, imageUrl => {
 				const urlInfo = urls[imageUrl];
@@ -628,7 +631,9 @@ class Api {
 			let output = md.replace(/(!\[.*?\]\()([^\s\)]+)(.*?\))/g, (match, before, imageUrl, after) => {
 				const urlInfo = urls[imageUrl];
 				if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
-				const imageSize = imageSizes[urlInfo.originalUrl];
+				if (!(urlInfo.originalUrl in imageSizesIndexes)) imageSizesIndexes[urlInfo.originalUrl] = 0;
+				const imageSize = imageSizes[urlInfo.originalUrl][imageSizesIndexes[urlInfo.originalUrl]];
+				imageSizesIndexes[urlInfo.originalUrl]++;
 				const resourceUrl = Resource.internalUrl(urlInfo.resource);
 
 				if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {

From 7239a2013caafd039a9c993490fc96d1fb5d54be Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Tue, 16 Jul 2019 22:23:04 +0100
Subject: [PATCH 08/18] Clipper: Improved clipping of images in HTML mode

---
 .../joplin-webclipper/content_scripts/index.js | 18 ++++++++++--------
 ElectronClient/app/gui/NoteText.jsx            |  3 ++-
 ReactNativeClient/lib/renderers/utils.js       |  2 ++
 ReactNativeClient/lib/services/rest/Api.js     |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Clipper/joplin-webclipper/content_scripts/index.js b/Clipper/joplin-webclipper/content_scripts/index.js
index ef38cd056..b8a80e6e1 100644
--- a/Clipper/joplin-webclipper/content_scripts/index.js
+++ b/Clipper/joplin-webclipper/content_scripts/index.js
@@ -103,7 +103,7 @@
 	// Cleans up element by removing all its invisible children (which we don't want to render as Markdown)
 	// And hard-code the image dimensions so that the information can be used by the clipper server to
 	// display them at the right sizes in the notes.
-	function cleanUpElement(element, imageSizes, imageIndexes) {
+	function cleanUpElement(convertToMarkup, element, imageSizes, imageIndexes) {
 		const childNodes = element.childNodes;
 		const hiddenNodes = [];
 
@@ -132,19 +132,19 @@
 					if (!(src in imageIndexes)) imageIndexes[src] = 0;
 					const imageSize = imageSizes[src][imageIndexes[src]];
 					imageIndexes[src]++;
-					if (imageSize) {
+					if (imageSize && convertToMarkup === 'markdown') {
 						node.width = imageSize.width;
 						node.height = imageSize.height;
 					}
 				}
 
-				cleanUpElement(node, imageSizes, imageIndexes);
+				cleanUpElement(convertToMarkup, node, imageSizes, imageIndexes);
 			}
 		}
 
 		for (const hiddenNode of hiddenNodes) {
 			if (!hiddenNode.parentNode) continue;
-			hiddenNode.parentNode.remove(hiddenNode);
+			hiddenNode.parentNode.removeChild(hiddenNode);
 		}
 	}
 
@@ -260,6 +260,8 @@
 	async function prepareCommandResponse(command) {
 		console.info('Got command: ' + command.name);
 
+		const convertToMarkup = command.preProcessFor ? command.preProcessFor : 'markdown';
+
 		const clippedContentResponse = (title, html, imageSizes, anchorNames, stylesheets) => {
 			return {
 				name: 'clippedContent',
@@ -272,7 +274,7 @@
 				image_sizes: imageSizes,
 				anchor_names: anchorNames,
 				source_command: Object.assign({}, command),
-				convert_to: command.preProcessFor ? command.preProcessFor : 'markdown',
+				convert_to: convertToMarkup,
 				stylesheets: stylesheets,
 			};			
 		}
@@ -306,9 +308,9 @@
 			const cleanDocument = document.body.cloneNode(true);
 			const imageSizes = getImageSizes(document, true);
 			const imageIndexes = {};
-			cleanUpElement(cleanDocument, imageSizes, imageIndexes);
+			cleanUpElement(convertToMarkup, cleanDocument, imageSizes, imageIndexes);
 
-			const stylesheets = command.preProcessFor === 'html' ? getStyleSheets(document) : null;
+			const stylesheets = convertToMarkup === 'html' ? getStyleSheets(document) : null;
 			return clippedContentResponse(pageTitle(), cleanDocument.innerHTML, imageSizes, getAnchorNames(document), stylesheets);
 
 		} else if (command.name === "selectedHtml") {
@@ -320,7 +322,7 @@
 			container.appendChild(range.cloneContents());
 			const imageSizes = getImageSizes(document, true);
 			const imageIndexes = {};
-			cleanUpElement(container, imageSizes, imageIndexes);
+			cleanUpElement(convertToMarkup, container, imageSizes, imageIndexes);
 			return clippedContentResponse(pageTitle(), container.innerHTML, getImageSizes(document), getAnchorNames(document));
 
 		} else if (command.name === 'screenshot') {
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 61263a027..a78ddcbfa 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -1643,6 +1643,7 @@ class NoteTextComponent extends React.Component {
 		const style = this.props.style;
 		const note = this.state.note;
 		const body = note && note.body ? note.body : '';
+		const markupLanguage = note ? note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
 		const theme = themeStyle(this.props.theme);
 		const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
 		const isTodo = note && !!note.is_todo;
@@ -1813,7 +1814,7 @@ class NoteTextComponent extends React.Component {
 
 		const toolbarItems = this.createToolbarItems(note);
 
-		const toolbar = <Toolbar
+		const toolbar = markupLanguage !== Note.MARKUP_LANGUAGE_MARKDOWN ? null : <Toolbar
 			style={toolbarStyle}
 			items={toolbarItems}
 		/>
diff --git a/ReactNativeClient/lib/renderers/utils.js b/ReactNativeClient/lib/renderers/utils.js
index 0febfc1a6..6605653d6 100644
--- a/ReactNativeClient/lib/renderers/utils.js
+++ b/ReactNativeClient/lib/renderers/utils.js
@@ -92,6 +92,8 @@ utils.resourceStatus = function(resourceInfo) {
 }
 
 utils.imageReplacement = function(src, resources, resourceBaseUrl) {
+	if (!Resource.isResourceUrl(src)) return null;
+	
 	const resourceId = Resource.urlToId(src);
 	const result = resources[resourceId];
 	const resource = result ? result.item : null;
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index b167b0dd4..593fa2de1 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -585,7 +585,7 @@ class Api {
 			});
 		}
 
-		const concurrency = 3
+		const concurrency = 10;
 		const pool = new PromisePool(promiseProducer, concurrency)
 		await pool.start()
 

From 30d0dfb42410c82fdbacc572d6eac98e0c7bd674 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Tue, 16 Jul 2019 22:58:44 +0100
Subject: [PATCH 09/18] Clipper: Fixed sizing issue when importing HTML pages

---
 ElectronClient/app/gui/note-viewer/index.html |  5 ++++-
 ReactNativeClient/lib/services/rest/Api.js    | 15 +++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ElectronClient/app/gui/note-viewer/index.html b/ElectronClient/app/gui/note-viewer/index.html
index 120189e0c..af4493a14 100644
--- a/ElectronClient/app/gui/note-viewer/index.html
+++ b/ElectronClient/app/gui/note-viewer/index.html
@@ -13,9 +13,11 @@
 			/* Without this they would just stay at a fixed position when scrolling */
 			position: relative;
 			overflow-y: auto;
-			height: 100%;
 			padding-left: 10px;
 			padding-right: 10px;
+
+			/* Note: the height is set via updateBodyHeight(). Setting it here to 100% */
+			/* won't work with some pages due to the position: relative */
 		}
 
 		mark {
@@ -256,6 +258,7 @@
 		// The body element needs to have a fixed height for the content to be scrollable
 		function updateBodyHeight() {
 			document.getElementById('body').style.height = window.innerHeight + 'px';
+			document.getElementById('content').style.height = window.innerHeight + 'px';
 		}
 
 		contentElement.addEventListener('scroll', webviewLib.logEnabledEventHandler(e => {
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index 593fa2de1..9026dbfec 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -572,12 +572,7 @@ class Api {
 
 		const output = {};
 
-		let urlIndex = 0;
-		const promiseProducer = () => {
-			if (urlIndex >= urls.length) return null;
-
-			const url = urls[urlIndex++];
-
+		const downloadOne = url => {
 			return new Promise(async (resolve, reject) => {
 				const imagePath = await this.downloadImage_(url, allowFileProtocolImages);
 				if (imagePath) output[url] = { path: imagePath, originalUrl: url };
@@ -585,6 +580,14 @@ class Api {
 			});
 		}
 
+		let urlIndex = 0;
+		const promiseProducer = () => {
+			if (urlIndex >= urls.length) return null;
+
+			const url = urls[urlIndex++];
+			return downloadOne(url);
+		}
+
 		const concurrency = 10;
 		const pool = new PromisePool(promiseProducer, concurrency)
 		await pool.start()

From fbb35438186b0d0a0cee093ea882695d67150489 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jul 2019 22:42:53 +0100
Subject: [PATCH 10/18] Desktop: Fixed race condition when loading a note while
 another one is still loading. Improved performance when loading large note.

---
 ElectronClient/app/gui/NoteText.jsx | 181 +++++++++++++++-------------
 1 file changed, 94 insertions(+), 87 deletions(-)

diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index a78ddcbfa..9e325a51e 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -71,6 +71,7 @@ class NoteTextComponent extends React.Component {
 			newNote: null,
 			noteTags: [],
 			showRevisions: false,
+			loading: false,
 
 			// If the current note was just created, and the title has never been
 			// changed by the user, this variable contains that note ID. Used
@@ -95,6 +96,7 @@ class NoteTextComponent extends React.Component {
 		this.lastSetMarkers_ = '';
 		this.lastSetMarkersOptions_ = {};
 		this.selectionRange_ = null;
+		this.lastComponentUpdateNoteId_ = null;
 		this.noteSearchBar_ = React.createRef();
 
 		// Complicated but reliable method to get editor content height
@@ -388,6 +390,14 @@ class NoteTextComponent extends React.Component {
 				this.webviewRef().closeDevTools();
 			}
 		}
+
+		const currentNoteId = this.state.note ? this.state.note.id : null;
+		if (this.lastComponentUpdateNoteId_ !== currentNoteId) {
+			const undoManager = this.editor_.editor.getSession().getUndoManager();
+			undoManager.reset();
+			this.editor_.editor.getSession().setUndoManager(undoManager);
+			this.lastComponentUpdateNoteId_ = currentNoteId;
+		}
 	}
 
 	webviewRef() {
@@ -397,6 +407,8 @@ class NoteTextComponent extends React.Component {
 	}
 
 	async saveIfNeeded(saveIfNewNote = false, options = {}) {
+		if (this.state.loading) return;
+
 		const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
 
 		if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
@@ -447,6 +459,12 @@ class NoteTextComponent extends React.Component {
 
 		await this.saveIfNeeded();
 
+		const defer = () => {
+			this.setState({ loading: false });
+		}
+
+		this.setState({ loading: true });
+
 		const previousNote = this.state.note ? Object.assign({}, this.state.note) : null;
 
 		const stateNoteId = this.state.note ? this.state.note.id : null;
@@ -470,14 +488,14 @@ class NoteTextComponent extends React.Component {
 			noteTags = await Tag.tagsByNoteId(noteId);
 			this.lastLoadedNoteId_ = noteId;
 			note = noteId ? await Note.load(noteId) : null;
-			if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
-			if (options.noReloadIfLocalChanges && this.isModified()) return;
+			if (noteId !== this.lastLoadedNoteId_) return defer(); // Race condition - current note was changed while this one was loading
+			if (options.noReloadIfLocalChanges && this.isModified()) return defer();
 
 			// If the note hasn't been changed, exit now
 			if (this.state.note && note) {
 				let diff = Note.diffObjects(this.state.note, note);
 				delete diff.type_;
-				if (!Object.getOwnPropertyNames(diff).length) return;
+				if (!Object.getOwnPropertyNames(diff).length) return defer();
 			}
 		}
 
@@ -515,22 +533,6 @@ class NoteTextComponent extends React.Component {
 			}
 
 			if (this.editor_) {
-				// Calling setValue here does two things:
-				// 1. It sets the initial value as recorded by the undo manager. If we were to set it instead to "" and wait for the render
-				//    phase to set the value, the initial value would still be "", which means pressing "undo" on a note that has just loaded
-				//    would clear it.
-				// 2. It resets the undo manager - fixes https://github.com/laurent22/joplin/issues/355
-				// Note: calling undoManager.reset() doesn't work
-				try {
-					this.editor_.editor.getSession().setValue(note && note.body? note.body : '');
-				} catch (error) {
-					if (error.message === "Cannot read property 'match' of undefined") {
-						// The internals of Ace Editor throws an exception when creating a new note,
-						// but that can be ignored.
-					} else {
-						console.error(error);
-					}
-				}
 				this.editor_.editor.clearSelection();
 				this.editor_.editor.moveCursorTo(0,0);
 
@@ -595,7 +597,9 @@ class NoteTextComponent extends React.Component {
 
 		// if (newState.note) await shared.refreshAttachedResources(this, newState.note.body);
 
-		this.updateHtml(newState.note ? newState.note.markup_language : null, newState.note ? newState.note.body : '');
+		await this.updateHtml(newState.note ? newState.note.markup_language : null, newState.note ? newState.note.body : '');
+
+		defer();
 	}
 
 	async componentWillReceiveProps(nextProps) {
@@ -1416,6 +1420,8 @@ class NoteTextComponent extends React.Component {
 	}
 
 	createToolbarItems(note) {
+		const markupLanguage = note.markup_language;
+
 		const toolbarItems = [];
 		if (note && this.state.folder && ['Search', 'Tag'].includes(this.props.notesParentType)) {
 			toolbarItems.push({
@@ -1428,7 +1434,6 @@ class NoteTextComponent extends React.Component {
 						noteId: note.id,
 					});
 				},
-				// enabled: false,
 			});
 		}
 
@@ -1451,83 +1456,85 @@ class NoteTextComponent extends React.Component {
 			});
 		}
 
-		toolbarItems.push({
-			tooltip: _('Bold'),
-			iconName: 'fa-bold',
-			onClick: () => { return this.commandTextBold(); },
-		});
+		if (note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN) {
+			toolbarItems.push({
+				tooltip: _('Bold'),
+				iconName: 'fa-bold',
+				onClick: () => { return this.commandTextBold(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Italic'),
-			iconName: 'fa-italic',
-			onClick: () => { return this.commandTextItalic(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Italic'),
+				iconName: 'fa-italic',
+				onClick: () => { return this.commandTextItalic(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
 
-		toolbarItems.push({
-			tooltip: _('Hyperlink'),
-			iconName: 'fa-link',
-			onClick: () => { return this.commandTextLink(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Hyperlink'),
+				iconName: 'fa-link',
+				onClick: () => { return this.commandTextLink(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Code'),
-			iconName: 'fa-code',
-			onClick: () => { return this.commandTextCode(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Code'),
+				iconName: 'fa-code',
+				onClick: () => { return this.commandTextCode(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Attach file'),
-			iconName: 'fa-paperclip',
-			onClick: () => { return this.commandAttachFile(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Attach file'),
+				iconName: 'fa-paperclip',
+				onClick: () => { return this.commandAttachFile(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
 
-		toolbarItems.push({
-			tooltip: _('Numbered List'),
-			iconName: 'fa-list-ol',
-			onClick: () => { return this.commandTextListOl(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Numbered List'),
+				iconName: 'fa-list-ol',
+				onClick: () => { return this.commandTextListOl(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Bulleted List'),
-			iconName: 'fa-list-ul',
-			onClick: () => { return this.commandTextListUl(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Bulleted List'),
+				iconName: 'fa-list-ul',
+				onClick: () => { return this.commandTextListUl(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Checkbox'),
-			iconName: 'fa-check-square',
-			onClick: () => { return this.commandTextCheckbox(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Checkbox'),
+				iconName: 'fa-check-square',
+				onClick: () => { return this.commandTextCheckbox(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Heading'),
-			iconName: 'fa-header',
-			onClick: () => { return this.commandTextHeading(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Heading'),
+				iconName: 'fa-header',
+				onClick: () => { return this.commandTextHeading(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Horizontal Rule'),
-			iconName: 'fa-ellipsis-h',
-			onClick: () => { return this.commandTextHorizontalRule(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Horizontal Rule'),
+				iconName: 'fa-ellipsis-h',
+				onClick: () => { return this.commandTextHorizontalRule(); },
+			});
 
-		toolbarItems.push({
-			tooltip: _('Insert Date Time'),
-			iconName: 'fa-calendar-plus-o',
-			onClick: () => { return this.commandDateTime(); },
-		});
+			toolbarItems.push({
+				tooltip: _('Insert Date Time'),
+				iconName: 'fa-calendar-plus-o',
+				onClick: () => { return this.commandDateTime(); },
+			});
 
-		toolbarItems.push({
-			type: 'separator',
-		});
+			toolbarItems.push({
+				type: 'separator',
+			});
+		}
 
 		if (note && this.props.watchedNoteFiles.indexOf(note.id) >= 0) {
 			toolbarItems.push({
@@ -1814,7 +1821,7 @@ class NoteTextComponent extends React.Component {
 
 		const toolbarItems = this.createToolbarItems(note);
 
-		const toolbar = markupLanguage !== Note.MARKUP_LANGUAGE_MARKDOWN ? null : <Toolbar
+		const toolbar = <Toolbar
 			style={toolbarStyle}
 			items={toolbarItems}
 		/>
@@ -1853,7 +1860,7 @@ class NoteTextComponent extends React.Component {
 		delete editorRootStyle.fontSize;
 		const editor =  <AceEditor
 			value={body}
-			mode="markdown"
+			mode={markupLanguage === Note.MARKUP_LANGUAGE_HTML ? 'text' : 'markdown'}
 			theme={editorRootStyle.editorTheme}
 			style={editorRootStyle}
 			width={editorStyle.width + 'px'}

From feb5f17479eec86d63ec2fb70672ff7587fce6fa Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jul 2019 22:48:13 +0100
Subject: [PATCH 11/18] Clipper: Generate better HTML so that it loads faster
 in text editor

---
 ElectronClient/app/package-lock.json       |  5 +++++
 ElectronClient/app/package.json            |  1 +
 ReactNativeClient/lib/services/rest/Api.js | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ElectronClient/app/package-lock.json b/ElectronClient/app/package-lock.json
index 8a818eee5..28682b58c 100644
--- a/ElectronClient/app/package-lock.json
+++ b/ElectronClient/app/package-lock.json
@@ -6654,6 +6654,11 @@
         }
       }
     },
+    "uglifycss": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz",
+      "integrity": "sha512-J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ=="
+    },
     "uid-safe": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json
index 2e1df3233..e9989df17 100644
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@@ -150,6 +150,7 @@
     "syswide-cas": "^5.1.0",
     "tar": "^4.4.4",
     "tcp-port-used": "^0.1.2",
+    "uglifycss": "0.0.29",
     "url-parse": "^1.4.3",
     "uuid": "^3.2.1",
     "valid-url": "^1.0.9",
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index 9026dbfec..8a45ef43d 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -440,9 +440,7 @@ class Api {
 				const style = await this.buildNoteStyleSheet_(requestNote.stylesheets);
 				const minify = require('html-minifier').minify;
 
-				const styleTag = style.length ? '<style>' + style.join('\n') + '</style>' + '\n' : '';
-
-				output.body = minify(styleTag + requestNote.body_html, {
+				const minifyOptions = {
 					// Remove all spaces and, especially, newlines from tag attributes, as that would
 					// break the rendering.
 					customAttrCollapse: /.*/,
@@ -450,7 +448,18 @@ class Api {
 					// means a code block in Markdown.
 					collapseWhitespace: true,
 					minifyCSS: true,
+					maxLineLength: 300,
+				};
+
+				const uglifycss = require('uglifycss');
+				const styleString = uglifycss.processString(style.join('\n'), {
+					// Need to set a max length because Ace Editor takes forever
+					// to display notes with long lines.
+					maxLineLen: 200,
 				});
+
+				const styleTag = style.length ? '<style>' + styleString + '</style>' + '\n' : '';
+				output.body = styleTag + minify(requestNote.body_html, minifyOptions);
 				output.body = htmlUtils.prependBaseUrl(output.body, baseUrl);
 				output.markup_language = Note.MARKUP_LANGUAGE_HTML;
 			} else { // Convert to Markdown 

From 490db0db62a24ab6398cc57f22a077aab76016f7 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jul 2019 22:49:12 +0100
Subject: [PATCH 12/18] Desktop: Disable Markdown actions for HTML notes

---
 ElectronClient/app/app.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ElectronClient/app/app.js b/ElectronClient/app/app.js
index 38714e443..39ae632eb 100644
--- a/ElectronClient/app/app.js
+++ b/ElectronClient/app/app.js
@@ -954,16 +954,17 @@ class Application extends BaseApplication {
 		this.lastMenuScreen_ = screen;
 	}
 
-	updateMenuItemStates() {
+	async updateMenuItemStates() {
 		if (!this.lastMenuScreen_) return;
 		if (!this.store()) return;
 
 		const selectedNoteIds = this.store().getState().selectedNoteIds;
+		const note = selectedNoteIds.length === 1 ? await Note.load(selectedNoteIds[0]) : null;
 
 		for (const itemId of ['copy', 'paste', 'cut', 'selectAll', 'bold', 'italic', 'link', 'code', 'insertDateTime', 'commandStartExternalEditing', 'setTags', 'showLocalSearch']) {
 			const menuItem = Menu.getApplicationMenu().getMenuItemById('edit:' + itemId);
 			if (!menuItem) continue;
-			menuItem.enabled = selectedNoteIds.length === 1;
+			menuItem.enabled = !!note && note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN;
 		}
 	}
 

From 687e308a73fa780684a24d902fba813ee1e9cebd Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jul 2019 22:49:40 +0100
Subject: [PATCH 13/18] Desktop: Added markup language to property dialog

---
 ElectronClient/app/gui/NotePropertiesDialog.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ElectronClient/app/gui/NotePropertiesDialog.jsx b/ElectronClient/app/gui/NotePropertiesDialog.jsx
index 69267b134..76fe03814 100644
--- a/ElectronClient/app/gui/NotePropertiesDialog.jsx
+++ b/ElectronClient/app/gui/NotePropertiesDialog.jsx
@@ -33,6 +33,7 @@ class NotePropertiesDialog extends React.Component {
 			location: _('Location'),
 			source_url: _('URL'),
 			revisionsLink: _('Note History'),
+			markup_language: _('Markup'),
 		};
 	}
 
@@ -82,6 +83,7 @@ class NotePropertiesDialog extends React.Component {
 		}
 
 		formNote.revisionsLink = note.id;
+		formNote.markup_language = Note.markupLanguageToLabel(note.markup_language);
 		formNote.id = note.id;
 
 		return formNote;
@@ -292,7 +294,7 @@ class NotePropertiesDialog extends React.Component {
 				controlComp = <div style={Object.assign({}, theme.textStyle, {display: 'inline-block'})}>{displayedValue}</div>
 			}
 
-			if (key !== 'id' && key !== 'revisionsLink') {
+			if (['id', 'revisionsLink', 'markup_language'].indexOf(key) < 0) {
 				editCompHandler = () => {this.editPropertyButtonClick(key, value)};
 				editCompIcon = 'fa-edit';
 			}

From 38177c7e540a3c03bddec59f1c90357c3d29044a Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 17 Jul 2019 22:50:12 +0100
Subject: [PATCH 14/18] All: Optimised loading of multiple items

---
 ReactNativeClient/lib/models/BaseItem.js | 12 ++++++++++++
 ReactNativeClient/lib/models/Note.js     | 19 +++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ReactNativeClient/lib/models/BaseItem.js b/ReactNativeClient/lib/models/BaseItem.js
index 5fd542af4..a081b9236 100644
--- a/ReactNativeClient/lib/models/BaseItem.js
+++ b/ReactNativeClient/lib/models/BaseItem.js
@@ -149,6 +149,18 @@ class BaseItem extends BaseModel {
 		return null;
 	}
 
+	static async loadItemsByIds(ids) {
+		const classes = this.syncItemClassNames();
+		let output = [];
+		for (let i = 0; i < classes.length; i++) {
+			const ItemClass = this.getClass(classes[i]);
+			const sql = 'SELECT * FROM ' + ItemClass.tableName() + ' WHERE id IN ("' + ids.join('","') + '")';
+			const models = await ItemClass.modelSelectAll(sql);
+			output = output.concat(models);
+		}
+		return output;
+	}
+
 	static loadItemByField(itemType, field, value) {
 		let ItemClass = this.itemClass(itemType);
 		return ItemClass.loadByField(field, value);
diff --git a/ReactNativeClient/lib/models/Note.js b/ReactNativeClient/lib/models/Note.js
index f284071b1..7cb902440 100644
--- a/ReactNativeClient/lib/models/Note.js
+++ b/ReactNativeClient/lib/models/Note.js
@@ -129,7 +129,7 @@ class Note extends BaseItem {
 		matches = matches.concat(matches2)
 
 		// For example: <img src=":/fcca2938a96a22570e8eae2565bc6b0b"/>
-		const imgRegex = /<img.*?src=["']:\/([a-zA-Z0-9]{32})["']/g
+		const imgRegex = /<img.*?src=["']:\/([a-zA-Z0-9]{32})["']/gi
 		const imgMatches = [];
 		while (true) {
 			const m = imgRegex.exec(body);
@@ -142,15 +142,8 @@ class Note extends BaseItem {
 
 	static async linkedItems(body) {
 		const itemIds = this.linkedItemIds(body);
-		const output = [];
-
-		for (let i = 0; i < itemIds.length; i++) {
-			const item = await BaseItem.loadItemById(itemIds[i]);
-			if (!item) continue;
-			output.push(item);
-		}
-
-		return output;
+		const r = await BaseItem.loadItemsByIds(itemIds);
+		return r;
 	}
 
 	static async linkedItemIdsByType(type, body) {
@@ -629,6 +622,12 @@ class Note extends BaseItem {
 		return false;
 	}
 
+	static markupLanguageToLabel(markupLanguageId) {
+		if (markupLanguageId === Note.MARKUP_LANGUAGE_MARKDOWN) return 'Markdown';
+		if (markupLanguageId === Note.MARKUP_LANGUAGE_HTML) return 'HTML';
+		throw new Error('Invalid markup language ID: ' + markupLanguageId);
+	}
+
 }
 
 Note.updateGeolocationEnabled_ = true;

From 14fc73b388c3752c6ee908800bc860d80bb6b594 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 19 Jul 2019 17:48:38 +0100
Subject: [PATCH 15/18] Use markupToHtml everywhere

---
 CliClient/package-lock.json                     | 6 +++---
 ElectronClient/app/gui/NoteRevisionViewer.jsx   | 8 +++++---
 ReactNativeClient/lib/renderers/MarkupToHtml.js | 4 ++++
 Tools/buildReactNativeInjectedJs.js             | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json
index 62dc0c167..e1881491c 100644
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -1702,9 +1702,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
-          "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
diff --git a/ElectronClient/app/gui/NoteRevisionViewer.jsx b/ElectronClient/app/gui/NoteRevisionViewer.jsx
index 02617ec28..f2f1d9908 100644
--- a/ElectronClient/app/gui/NoteRevisionViewer.jsx
+++ b/ElectronClient/app/gui/NoteRevisionViewer.jsx
@@ -9,7 +9,7 @@ const Revision = require('lib/models/Revision');
 const Setting = require('lib/models/Setting');
 const RevisionService = require('lib/services/RevisionService');
 const shared = require('lib/components/shared/note-screen-shared.js');
-const MdToHtml = require('lib/renderers/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
 const { time } = require('lib/time-utils.js');
 const ReactTooltip = require('react-tooltip');
 const { substrWithEllipsis } = require('lib/string-utils');
@@ -92,6 +92,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 
 	async reloadNote() {
 		let noteBody = '';
+		let markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
 		if (!this.state.revisions.length || !this.state.currentRevId) {
 			noteBody = _('This note has no history');
 			this.setState({ note: null });
@@ -100,16 +101,17 @@ class NoteRevisionViewerComponent extends React.PureComponent {
 			const note = await RevisionService.instance().revisionNote(this.state.revisions, revIndex);
 			if (!note) return;
 			noteBody = note.body;
+			markupLanguage = note.markup_language;
 			this.setState({ note: note });
 		}
 
 		const theme = themeStyle(this.props.theme);
 
-		const mdToHtml = new MdToHtml({
+		const markupToHtml = new MarkupToHtml({
 			resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
 		});
 
-		const result = mdToHtml.render(noteBody, theme, {
+		const result = markupToHtml.render(markupLanguage, noteBody, theme, {
 			codeTheme: theme.codeThemeCss,
 			userCss: this.props.customCss ? this.props.customCss : '',
 			resources: await shared.attachedResources(noteBody),
diff --git a/ReactNativeClient/lib/renderers/MarkupToHtml.js b/ReactNativeClient/lib/renderers/MarkupToHtml.js
index 7e2800332..771daba58 100644
--- a/ReactNativeClient/lib/renderers/MarkupToHtml.js
+++ b/ReactNativeClient/lib/renderers/MarkupToHtml.js
@@ -26,6 +26,10 @@ class MarkupToHtml {
 		return this.renderers_[markupLanguage];
 	}
 
+	injectedJavaScript() {
+		return '';
+	}
+
 	render(markupLanguage, markup, theme, options) {
 		return this.renderer(markupLanguage).render(markup, theme, options);
 	}
diff --git a/Tools/buildReactNativeInjectedJs.js b/Tools/buildReactNativeInjectedJs.js
index 21dfc2d8a..972967411 100644
--- a/Tools/buildReactNativeInjectedJs.js
+++ b/Tools/buildReactNativeInjectedJs.js
@@ -18,7 +18,7 @@ async function copyJs(name, filePath) {
 
 async function main(argv) {
 	await fs.mkdirp(outputDir);
-	await copyJs('webviewLib', rnDir + '/lib/renderers/MdToHtml/webviewLib.js');	
+	await copyJs('webviewLib', rnDir + '/lib/renderers/webviewLib.js');	
 }
 
 main(process.argv).catch((error) => {

From 8ff1668c8fb0d7fbda2f1ab1c3824e96f017a696 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 19 Jul 2019 18:18:05 +0100
Subject: [PATCH 16/18] Minor changes

---
 CliClient/tests/htmlUtils.js        | 10 ++++++++++
 ElectronClient/app/gui/NoteText.jsx |  2 +-
 ReactNativeClient/lib/htmlUtils.js  |  2 +-
 ReactNativeClient/root.js           |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CliClient/tests/htmlUtils.js b/CliClient/tests/htmlUtils.js
index d4350d3ac..fec221c1e 100644
--- a/CliClient/tests/htmlUtils.js
+++ b/CliClient/tests/htmlUtils.js
@@ -45,4 +45,14 @@ describe('htmlUtils', function() {
 		done();
 	});
 
+	it('should return the head and body HTML', async (done) => {
+		const html = '<html><head><style>h1 { font-weight: bold; }</style></head><body><h1>Bonjour</h1></body></html>';
+		const dom = htmlUtils.parse(html);
+		const resultHtml = htmlUtils.headAndBodyHtml(dom);
+
+		expect(resultHtml).toBe('<style>h1 { font-weight: bold; }</style>\n<h1>Bonjour</h1>');
+
+		done();
+	});
+
 });
\ No newline at end of file
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 9e325a51e..7174f40d2 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -670,7 +670,7 @@ class NoteTextComponent extends React.Component {
 		const arg0 = args && args.length >= 1 ? args[0] : null;
 		const arg1 = args && args.length >= 2 ? args[1] : null;
 
-		console.info('Got ipc-message: ' + msg, args);
+		if (percentScroll !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
 
 		if (msg.indexOf('checkboxclick:') === 0) {
 			// Ugly hack because setting the body here will make the scrollbar
diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
index 31538319d..674c8168b 100644
--- a/ReactNativeClient/lib/htmlUtils.js
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -15,7 +15,7 @@ class HtmlUtils {
 
 	extractImageUrls(html) {
 		if (!html) return [];
-		
+
 		const dom = new JSDOM(html);
 		const imgs = dom.window.document.getElementsByTagName('img');
 		const output = [];
diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js
index c41de6a2e..e64973593 100644
--- a/ReactNativeClient/root.js
+++ b/ReactNativeClient/root.js
@@ -422,7 +422,7 @@ async function initialize(dispatch) {
 		if (Setting.value('env') == 'prod') {
 			await db.open({ name: 'joplin.sqlite' })
 		} else {
-			await db.open({ name: 'joplin-68.sqlite' });
+			await db.open({ name: 'joplin-70.sqlite' });
 
 			// await db.clearForTesting();
 		}

From 36168a9a5d50e2f4e4939c132807f2c376f6c735 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sun, 21 Jul 2019 00:18:51 +0100
Subject: [PATCH 17/18] Use regex instead of jsdom for compability with mobile
 app

---
 CliClient/package-lock.json                   | 217 ------------------
 CliClient/package.json                        |   1 -
 CliClient/tests/htmlUtils.js                  |  57 ++++-
 ElectronClient/app/gui/NoteText.jsx           |   4 +-
 ElectronClient/app/package-lock.json          | 208 +----------------
 ElectronClient/app/package.json               |   1 -
 ReactNativeClient/lib/htmlUtils.js            |  72 +++---
 ReactNativeClient/lib/models/Note.js          |   4 +-
 ReactNativeClient/lib/renderers/HtmlToHtml.js |  34 ++-
 ReactNativeClient/lib/renderers/utils.js      |   2 +
 10 files changed, 118 insertions(+), 482 deletions(-)

diff --git a/CliClient/package-lock.json b/CliClient/package-lock.json
index e1881491c..e7e190088 100644
--- a/CliClient/package-lock.json
+++ b/CliClient/package-lock.json
@@ -1355,11 +1355,6 @@
       "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz",
       "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc="
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
-    },
     "is-absolute": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
@@ -1668,182 +1663,6 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "optional": true
     },
-    "jsdom": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz",
-      "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==",
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^6.1.1",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.3.6",
-        "cssstyle": "^1.2.2",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.1.4",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-        },
-        "combined-stream": {
-          "version": "1.0.8",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
-        },
-        "form-data": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "mime-db": {
-          "version": "1.40.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-        },
-        "mime-types": {
-          "version": "2.1.24",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-          "requires": {
-            "mime-db": "1.40.0"
-          }
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          },
-          "dependencies": {
-            "tough-cookie": {
-              "version": "2.4.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-              "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-              "requires": {
-                "psl": "^1.1.24",
-                "punycode": "^1.4.1"
-              }
-            }
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
-        },
-        "tough-cookie": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-          "requires": {
-            "ip-regex": "^2.1.0",
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-              "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-            }
-          }
-        },
-        "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        }
-      }
-    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -2389,11 +2208,6 @@
         "data-uri-to-buffer": "0.0.3"
       }
     },
-    "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -2693,14 +2507,6 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
-    "saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
-      "requires": {
-        "xmlchars": "^2.1.1"
-      }
-    },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
@@ -3410,16 +3216,6 @@
         "browser-process-hrtime": "^0.1.2"
       }
     },
-    "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
-      "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -3504,14 +3300,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "ws": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz",
-      "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==",
-      "requires": {
-        "async-limiter": "^1.0.0"
-      }
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -3531,11 +3319,6 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
     },
-    "xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
-    },
     "xregexp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.2.0.tgz",
diff --git a/CliClient/package.json b/CliClient/package.json
index 1918b607c..99e2311c8 100644
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -45,7 +45,6 @@
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
     "joplin-turndown-plugin-gfm": "^1.0.8",
-    "jsdom": "^15.1.1",
     "jssha": "^2.3.0",
     "levenshtein": "^1.0.5",
     "lodash": "^4.17.4",
diff --git a/CliClient/tests/htmlUtils.js b/CliClient/tests/htmlUtils.js
index fec221c1e..10be8dd62 100644
--- a/CliClient/tests/htmlUtils.js
+++ b/CliClient/tests/htmlUtils.js
@@ -18,6 +18,9 @@ describe('htmlUtils', function() {
 		const testCases = [
 			['<img src="http://test.com/img.png"/>', ['http://test.com/img.png']],
 			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://test.com/img.png', 'http://test.com/img2.png']],
+			['<img src="http://test.com/img.png" alt="testing"  >', ['http://test.com/img.png']],
+			['nothing here', []],
+			['', []],
 		];
 
 		for (let i = 0; i < testCases.length; i++) {
@@ -30,6 +33,31 @@ describe('htmlUtils', function() {
 		done();
 	});
 
+	it('should replace image URLs', async (done) => {
+		const testCases = [
+			['<img src="http://test.com/img.png"/>', ['http://other.com/img2.png'], '<img src="http://other.com/img2.png"/>'],
+			['<img src="http://test.com/img.png"/> <img src="http://test.com/img2.png"/>', ['http://other.com/img2.png', 'http://other.com/img3.png'], '<img src="http://other.com/img2.png"/> <img src="http://other.com/img3.png"/>'],
+			['<img src="http://test.com/img.png" alt="testing"  >', ['http://other.com/img.png'], '<img src="http://other.com/img.png" alt="testing"  >'],
+		];
+
+		const callback = (urls) => {
+			let i = -1;
+
+			return function(src) {
+				i++;
+				return urls[i];
+			}
+		}
+
+		for (let i = 0; i < testCases.length; i++) {
+			const md = testCases[i][0];
+			const r = htmlUtils.replaceImageUrls(md, callback(testCases[i][1]));
+			expect(r.trim()).toBe(testCases[i][2].trim());
+		}
+
+		done();
+	});
+
 	it('should encode attributes', async (done) => {
 		const testCases = [
 			[{ a: 'one', b: 'two' }, 'a="one" b="two"'],
@@ -45,12 +73,31 @@ describe('htmlUtils', function() {
 		done();
 	});
 
-	it('should return the head and body HTML', async (done) => {
-		const html = '<html><head><style>h1 { font-weight: bold; }</style></head><body><h1>Bonjour</h1></body></html>';
-		const dom = htmlUtils.parse(html);
-		const resultHtml = htmlUtils.headAndBodyHtml(dom);
+	it('should prepend a base URL', async (done) => {
+		const testCases = [
+			[
+				'<a href="a.html">Something</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">Something</a>',
+			],
+			[
+				'<a href="a.html">a</a> <a href="b.html">b</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">a</a> <a href="http://test.com/b.html">b</a>',
+			],
+			[
+				'<a href="a.html">a</a> <a href="b.html">b</a>',
+				'http://test.com',
+				'<a href="http://test.com/a.html">a</a> <a href="http://test.com/b.html">b</a>',
+			],
+		];
 
-		expect(resultHtml).toBe('<style>h1 { font-weight: bold; }</style>\n<h1>Bonjour</h1>');
+		for (let i = 0; i < testCases.length; i++) {
+			const html = testCases[i][0];
+			const baseUrl = testCases[i][1];
+			const expected = testCases[i][2];
+			expect(htmlUtils.prependBaseUrl(html, baseUrl)).toBe(expected);
+		}
 
 		done();
 	});
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 7174f40d2..5b0fd6c74 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -392,7 +392,7 @@ class NoteTextComponent extends React.Component {
 		}
 
 		const currentNoteId = this.state.note ? this.state.note.id : null;
-		if (this.lastComponentUpdateNoteId_ !== currentNoteId) {
+		if (this.lastComponentUpdateNoteId_ !== currentNoteId && this.editor_) {
 			const undoManager = this.editor_.editor.getSession().getUndoManager();
 			undoManager.reset();
 			this.editor_.editor.getSession().setUndoManager(undoManager);
@@ -670,7 +670,7 @@ class NoteTextComponent extends React.Component {
 		const arg0 = args && args.length >= 1 ? args[0] : null;
 		const arg1 = args && args.length >= 2 ? args[1] : null;
 
-		if (percentScroll !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
+		if (msg !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
 
 		if (msg.indexOf('checkboxclick:') === 0) {
 			// Ugly hack because setting the body here will make the scrollbar
diff --git a/ElectronClient/app/package-lock.json b/ElectronClient/app/package-lock.json
index 28682b58c..bd8ec06c3 100644
--- a/ElectronClient/app/package-lock.json
+++ b/ElectronClient/app/package-lock.json
@@ -2405,7 +2405,8 @@
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -3609,11 +3610,6 @@
       "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3931,164 +3927,6 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "optional": true
     },
-    "jsdom": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz",
-      "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==",
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^6.1.1",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.3.6",
-        "cssstyle": "^1.2.2",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.1.4",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
-          "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "mime-db": {
-          "version": "1.40.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-        },
-        "mime-types": {
-          "version": "2.1.24",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-          "requires": {
-            "mime-db": "1.40.0"
-          }
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          },
-          "dependencies": {
-            "tough-cookie": {
-              "version": "2.4.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-              "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-              "requires": {
-                "psl": "^1.1.24",
-                "punycode": "^1.4.1"
-              }
-            }
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
-        },
-        "tough-cookie": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-          "requires": {
-            "ip-regex": "^2.1.0",
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-              "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-            }
-          }
-        },
-        "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        }
-      }
-    },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -5226,11 +5064,6 @@
         "error-ex": "^1.2.0"
       }
     },
-    "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -5401,11 +5234,6 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
-    "psl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
-    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -6032,14 +5860,6 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
-    "saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
-      "requires": {
-        "xmlchars": "^2.1.1"
-      }
-    },
     "scheduler": {
       "version": "0.13.6",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
@@ -6769,6 +6589,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -6860,16 +6681,6 @@
         "browser-process-hrtime": "^0.1.2"
       }
     },
-    "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
-      "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
     "wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -7017,14 +6828,6 @@
         "signal-exit": "^3.0.2"
       }
     },
-    "ws": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz",
-      "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==",
-      "requires": {
-        "async-limiter": "^1.0.0"
-      }
-    },
     "xdg-basedir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
@@ -7058,11 +6861,6 @@
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
       "dev": true
     },
-    "xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
-    },
     "xmldom": {
       "version": "0.1.27",
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json
index e9989df17..a894ae685 100644
--- a/ElectronClient/app/package.json
+++ b/ElectronClient/app/package.json
@@ -104,7 +104,6 @@
     "image-type": "^3.0.0",
     "joplin-turndown": "^4.0.17",
     "joplin-turndown-plugin-gfm": "^1.0.8",
-    "jsdom": "^15.1.1",
     "jssha": "^2.3.1",
     "katex": "^0.10.0",
     "levenshtein": "^1.0.5",
diff --git a/ReactNativeClient/lib/htmlUtils.js b/ReactNativeClient/lib/htmlUtils.js
index 674c8168b..780d3a4c7 100644
--- a/ReactNativeClient/lib/htmlUtils.js
+++ b/ReactNativeClient/lib/htmlUtils.js
@@ -1,9 +1,12 @@
-const jsdom = require("jsdom");
-const { JSDOM } = jsdom;
 const urlUtils = require('lib/urlUtils.js');
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlentities = (new Entities()).encode;
 
+// [\s\S] instead of . for multiline matching
+// https://stackoverflow.com/a/16119722/561309
+const imageRegex = /<img([\s\S]*?)src=["']([\s\S]*?)["']([\s\S]*?)>/gi
+const anchorRegex = /<a([\s\S]*?)href=["']([\s\S]*?)["']([\s\S]*?)>/gi
+
 class HtmlUtils {
 
 	headAndBodyHtml(doc) {
@@ -16,50 +19,59 @@ class HtmlUtils {
 	extractImageUrls(html) {
 		if (!html) return [];
 
-		const dom = new JSDOM(html);
-		const imgs = dom.window.document.getElementsByTagName('img');
 		const output = [];
-
-		for (const img of imgs) {
-			const src = img.getAttribute('src');
-			if (!src) continue;
-			output.push(src);
+		let matches;
+		while (matches = imageRegex.exec(html)) {
+			output.push(matches[2]);
 		}
 
 		return output;
 	}
 
 	replaceImageUrls(html, callback) {
+		return this.processImageTags(html, data => {
+			const newSrc = callback(data.src);
+			return {
+				type: 'replaceSource',
+				src: newSrc,
+			};
+		});
+	}
+
+	processImageTags(html, callback) {
 		if (!html) return '';
 
-		const dom = new JSDOM(html);
-		const doc = dom.window.document;
-		const imgs = doc.getElementsByTagName('img');
+		return html.replace(imageRegex, (v, before, src, after) => {
+			const action = callback({ src: src });
 
-		for (const img of imgs) {
-			const src = img.getAttribute('src');
-			const newSrc = callback(src);
-			img.setAttribute('src', newSrc);
-		}
+			console.info('src', src);
 
-		// This function returns the head and body but without the <head> and <body>
-		// tag, which for our purpose are not needed and can cause issues when present.
-		return this.headAndBodyHtml(doc);
+			if (!action) return '<img' + before + 'src="' + src + '"' + after + '>';
+
+			if (action.type === 'replaceElement') {
+				return action.html;
+			}
+
+			if (action.type === 'replaceSource') {
+				return '<img' + before + 'src="' + action.src + '"' + after + '>';
+			}
+
+			if (action.type === 'setAttributes') {
+				const attrHtml = this.attributesHtml(action.attrs);
+				return '<img' + before + attrHtml + after + '>';
+			}
+
+			throw new Error('Invalid action: ' + action.type);
+		});
 	}
 
 	prependBaseUrl(html, baseUrl) {
-		const dom = new JSDOM(html);
-		const doc = dom.window.document;
-		const anchors = doc.getElementsByTagName('a');
+		if (!html) return '';
 
-		for (const anchor of anchors) {
-			const href = anchor.getAttribute('href');
-			if (!href) continue;
+		return html.replace(anchorRegex, (v, before, href, after) => {
 			const newHref = urlUtils.prependBaseUrl(href, baseUrl);
-			anchor.setAttribute('href', newHref);
-		}
-
-		return this.headAndBodyHtml(doc);
+			return '<a' + before + 'href="' + newHref + '"' + after + '>';
+		});
 	}
 
 	attributesHtml(attr) {
diff --git a/ReactNativeClient/lib/models/Note.js b/ReactNativeClient/lib/models/Note.js
index 7cb902440..d4cc01832 100644
--- a/ReactNativeClient/lib/models/Note.js
+++ b/ReactNativeClient/lib/models/Note.js
@@ -129,7 +129,7 @@ class Note extends BaseItem {
 		matches = matches.concat(matches2)
 
 		// For example: <img src=":/fcca2938a96a22570e8eae2565bc6b0b"/>
-		const imgRegex = /<img.*?src=["']:\/([a-zA-Z0-9]{32})["']/gi
+		const imgRegex = /<img[\s\S]*?src=["']:\/([a-zA-Z0-9]{32})["'][\s\S]*?>/gi
 		const imgMatches = [];
 		while (true) {
 			const m = imgRegex.exec(body);
@@ -159,7 +159,7 @@ class Note extends BaseItem {
 	}
 
 	static async linkedResourceIds(body) {
-		return await this.linkedItemIdsByType(BaseModel.TYPE_RESOURCE, body);
+		return this.linkedItemIdsByType(BaseModel.TYPE_RESOURCE, body);
 	}
 
 	static async replaceResourceInternalToExternalLinks(body) {
diff --git a/ReactNativeClient/lib/renderers/HtmlToHtml.js b/ReactNativeClient/lib/renderers/HtmlToHtml.js
index 14d0f1392..67b482bbc 100644
--- a/ReactNativeClient/lib/renderers/HtmlToHtml.js
+++ b/ReactNativeClient/lib/renderers/HtmlToHtml.js
@@ -1,8 +1,6 @@
 const Resource = require('lib/models/Resource');
 const htmlUtils = require('lib/htmlUtils');
 const utils = require('./utils');
-const jsdom = require("jsdom");
-const { JSDOM } = jsdom;
 
 class HtmlToHtml {
 
@@ -11,29 +9,27 @@ class HtmlToHtml {
 	}
 
 	render(markup, theme, options) {
-		const dom = new JSDOM(markup);
-		
-		// Replace all the image resource IDs by path to local files
-		const imgs = dom.window.document.getElementsByTagName('img');
-		for (const img of imgs) {
-			if (!img.src) continue;
-			const r = utils.imageReplacement(img.src, options.resources, this.resourceBaseUrl_);
-			if (!r) continue;
+		const html = htmlUtils.processImageTags(markup, data => {
+			if (!data.src) return null;
+
+			const r = utils.imageReplacement(data.src, options.resources, this.resourceBaseUrl_);
+			if (!r) return null;
 
 			if (typeof r === 'string') {
-				img.outerHTML = r;
+				return {
+					type: 'replaceElement',
+					html: r,
+				};
 			} else {
-				for (const n in r) {
-					img.setAttribute(n, r[n]);
-				}
+				return {
+					type: 'setAttributes',
+					attrs: r,
+				};
 			}
-		}
-
-		// We need this extra style so that the images don't overflow
-		const extraStyle = ''; //<style>img {max-width: 100%;height: auto;}</style>'
+		});
 
 		return {
-			html: extraStyle + htmlUtils.headAndBodyHtml(dom.window.document),
+			html: html,
 			cssFiles: [],
 		}
 	}
diff --git a/ReactNativeClient/lib/renderers/utils.js b/ReactNativeClient/lib/renderers/utils.js
index 6605653d6..d9e1cfd32 100644
--- a/ReactNativeClient/lib/renderers/utils.js
+++ b/ReactNativeClient/lib/renderers/utils.js
@@ -1,4 +1,6 @@
 const Resource = require('lib/models/Resource.js');
+const Entities = require('html-entities').AllHtmlEntities;
+const htmlentities = (new Entities()).encode;
 
 const utils = {};
 

From 6436dff94b7cf9e7ea8e32cfa635854c219dc19f Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Sun, 21 Jul 2019 00:31:29 +0100
Subject: [PATCH 18/18] Api: Fixed handling of markup language

---
 ReactNativeClient/lib/services/rest/Api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index 8a45ef43d..71132e87b 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -487,6 +487,9 @@ class Api {
 		if ('user_updated_time' in requestNote) output.user_updated_time = Database.formatValue(Database.TYPE_INT, requestNote.user_updated_time);
 		if ('user_created_time' in requestNote) output.user_created_time = Database.formatValue(Database.TYPE_INT, requestNote.user_created_time);
 		if ('is_todo' in requestNote) output.is_todo = Database.formatValue(Database.TYPE_INT, requestNote.is_todo);
+		if ('markup_language' in requestNote) output.markup_language = Database.formatValue(Database.TYPE_INT, requestNote.markup_language);
+
+		if (!output.markup_language) output.markup_language = Note.MARKUP_LANGUAGE_MARKDOWN;
 
 		return output;
 	}