diff --git a/src/modules/helpers/marketplace.js b/src/modules/helpers/marketplace.js
index 50233f1a..95c8a1ac 100644
--- a/src/modules/helpers/marketplace.js
+++ b/src/modules/helpers/marketplace.js
@@ -12,8 +12,15 @@ function sleep(ms) {
 // based on https://stackoverflow.com/questions/37684/how-to-replace-plain-urls-with-links
 export function urlParser(input) {
   const urlPattern =
-    /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,63}\b([-a-zA-Z0-9()!@:%_+.~#?&//=]*)/;
-  return input.replace(urlPattern, '<br/><a class="link" href="$&" target="_blank">$&</a>');
+    /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,63}\b([-a-zA-Z0-9()!@:%_+.~#?&//=]*)/g;
+  const emailPattern = /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b/g;
+
+  const replaceUrl = (url) => `<br/><a class="link" href="${url}" target="_blank">${url}</a>`;
+  const replaceEmail = (email) => `<a class="link" href="mailto:${email}">${email}</a>`;
+
+  const replacedUrls = input.replace(urlPattern, replaceUrl);
+  const replacedEmails = replacedUrls.replace(emailPattern, replaceEmail);
+  return replacedEmails;
 }
 
 export function install(type, input, sideload) {