diff --git a/core/lib/presentation/utils/html_transformer/dom/sanitize_tag_a_in_html_transformers.dart b/core/lib/presentation/utils/html_transformer/dom/sanitize_hyper_link_tag_in_html_transformers.dart
similarity index 93%
rename from core/lib/presentation/utils/html_transformer/dom/sanitize_tag_a_in_html_transformers.dart
rename to core/lib/presentation/utils/html_transformer/dom/sanitize_hyper_link_tag_in_html_transformers.dart
index 4e2e67555..b710645bc 100644
--- a/core/lib/presentation/utils/html_transformer/dom/sanitize_tag_a_in_html_transformers.dart
+++ b/core/lib/presentation/utils/html_transformer/dom/sanitize_hyper_link_tag_in_html_transformers.dart
@@ -4,11 +4,11 @@ import 'package:core/presentation/utils/html_transformer/sanitize_url.dart';
 import 'package:core/utils/html/html_template.dart';
 import 'package:html/dom.dart';
 
-class SanitizeTagAInHtmlTransformer extends DomTransformer {
+class SanitizeHyperLinkTagInHtmlTransformer extends DomTransformer {
   final _sanitizeUrl = SanitizeUrl();
   final bool useTooltip;
-  
-  SanitizeTagAInHtmlTransformer({this.useTooltip = false});
+
+  SanitizeHyperLinkTagInHtmlTransformer({this.useTooltip = false});
 
   @override
   Future<void> process({
diff --git a/core/lib/presentation/utils/html_transformer/transform_configuration.dart b/core/lib/presentation/utils/html_transformer/transform_configuration.dart
index f89419aa7..eea5f86cf 100644
--- a/core/lib/presentation/utils/html_transformer/transform_configuration.dart
+++ b/core/lib/presentation/utils/html_transformer/transform_configuration.dart
@@ -12,7 +12,7 @@ import 'package:core/presentation/utils/html_transformer/dom/remove_lazy_loading
 import 'package:core/presentation/utils/html_transformer/dom/remove_max_width_in_image_style_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/remove_style_tag_outside_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/remove_tooltip_link_transformers.dart';
-import 'package:core/presentation/utils/html_transformer/dom/sanitize_tag_a_in_html_transformers.dart';
+import 'package:core/presentation/utils/html_transformer/dom/sanitize_hyper_link_tag_in_html_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/script_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/signature_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/text/sanitize_autolink_html_transformers.dart';
@@ -56,7 +56,7 @@ class TransformConfiguration {
       const RemoveScriptTransformer(),
       const BlockQuotedTransformer(),
       const BlockCodeTransformer(),
-      SanitizeTagAInHtmlTransformer(useTooltip: true),
+      SanitizeHyperLinkTagInHtmlTransformer(useTooltip: true),
       const ImageTransformer(),
       const AddLazyLoadingForBackgroundImageTransformer(),
       const RemoveCollapsedSignatureButtonTransformer(),
@@ -108,7 +108,7 @@ class TransformConfiguration {
     const RemoveScriptTransformer(),
     const BlockQuotedTransformer(),
     const BlockCodeTransformer(),
-    SanitizeTagAInHtmlTransformer(),
+    SanitizeHyperLinkTagInHtmlTransformer(),
     const ImageTransformer(),
     const AddLazyLoadingForBackgroundImageTransformer(),
     const RemoveCollapsedSignatureButtonTransformer(),
diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
index 4aa93309f..c3ac17d67 100644
--- a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
+++ b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
@@ -145,7 +145,6 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
     final webViewActionScripts = '''
       <script type="text/javascript">
         window.parent.addEventListener('message', handleMessage, false);
-        window.addEventListener('click', handleOnClickLink, true);
         window.addEventListener('load', handleOnLoad);
         window.addEventListener('pagehide', (event) => {
           window.parent.removeEventListener('message', handleMessage, false);
@@ -174,34 +173,21 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
           }
         }
         
-        function handleOnClickLink(e) {
-           let link = e.target;
-           let textContent = e.target.textContent;
-           if (link && isValidMailtoLink(link)) {
-              window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "type": "toDart: OpenLink", "url": "" + link}), "*");
-              e.preventDefault();
-           } else if (textContent && isValidMailtoLink(textContent)) {
-              window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "type": "toDart: OpenLink", "url": "" + textContent}), "*");
-              e.preventDefault();
-           }
+        function handleOnClickEmailLink(e) {
+           var href = this.href;
+           window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "type": "toDart: OpenLink", "url": "" + href}), "*");
+           e.preventDefault();
         }
         
-        function isValidMailtoLink(string) {
-          let url;
-          
-          try {
-            url = new URL(string);
-          } catch (_) {
-            return false;  
-          }
-        
-          return url.protocol === "mailto:";
-        }
-
         function handleOnLoad() {
           window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "message": "$iframeOnLoadMessage"}), "*");
           window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "type": "toIframe: getHeight"}), "*");
           window.parent.postMessage(JSON.stringify({"view": "$_createdViewId", "type": "toIframe: getWidth"}), "*");
+          
+          var emailLinks = document.querySelectorAll('a[href^="mailto:"]');
+          for(var i=0; i < emailLinks.length; i++){
+              emailLinks[i].addEventListener('click', handleOnClickEmailLink);
+          }
         }
       </script>
     ''';
diff --git a/lib/features/manage_account/data/datasource_impl/identity_data_source_impl.dart b/lib/features/manage_account/data/datasource_impl/identity_data_source_impl.dart
index 046b23b36..824148373 100644
--- a/lib/features/manage_account/data/datasource_impl/identity_data_source_impl.dart
+++ b/lib/features/manage_account/data/datasource_impl/identity_data_source_impl.dart
@@ -1,7 +1,7 @@
 import 'package:core/presentation/utils/html_transformer/dom/block_code_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/block_quoted_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/image_transformers.dart';
-import 'package:core/presentation/utils/html_transformer/dom/sanitize_tag_a_in_html_transformers.dart';
+import 'package:core/presentation/utils/html_transformer/dom/sanitize_hyper_link_tag_in_html_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/script_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/html_transform.dart';
 import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
@@ -66,7 +66,7 @@ class IdentityDataSourceImpl extends IdentityDataSource {
           const RemoveScriptTransformer(),
           const BlockQuotedTransformer(),
           const BlockCodeTransformer(),
-          SanitizeTagAInHtmlTransformer(useTooltip: PlatformInfo.isWeb),
+          SanitizeHyperLinkTagInHtmlTransformer(useTooltip: PlatformInfo.isWeb),
           const ImageTransformer(),
         ]));
       return signatureUnescape;