diff --git a/.vscode/settings.json b/.vscode/settings.json
index 144f7d38..8b8689b9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,6 +3,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll": true
   },
+  "editor.wordWrap": "on",
   "markdownlint.config": {
     "single-h1": false,
     "no-inline-html": false,
diff --git a/assets/customize.js b/assets/customize.js
index 9bb36bf5..f741fcb2 100644
--- a/assets/customize.js
+++ b/assets/customize.js
@@ -1,5 +1,3 @@
-document.querySelectorAll('a[data-href]').forEach((element) => {
-  element.href = atob(element.dataset.href);
-  delete element.dataset.href;
-})
-
+document.querySelectorAll('a[href^="mailto:"]').forEach((element) => {
+  element.href = atob(element.href.replace(/^mailto:/, ''));
+});
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index 7bc9dd2e..6da14f33 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1,7 +1,7 @@
 {{- if hasPrefix .Destination "mailto:" -}}
 {{- $text := replace (replace .Text "-" "--") "_" "__" -}}
 {{- $icon := resources.GetRemote (printf "https://img.shields.io/badge/email-%s-blue.svg?style=flat-square" $text) -}}
-<a class="email" data-href="{{ .Destination | base64Encode }}"><img class="shields-icon" src="{{ $icon.Permalink }}" /></a>
+<a href="mailto:{{ .Destination | base64Encode }}"><img class="shields-icon" src="{{ $icon.Permalink }}" /></a>
 {{- else -}}
 <a href="{{ .Destination }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if hasPrefix .Destination "http" }} target="_blank"{{ end }}>
 {{- .Text | safeHTML -}}