diff --git a/core/lib/presentation/utils/html_transformer/sanitize_autolink_filter.dart b/core/lib/presentation/utils/html_transformer/sanitize_autolink_filter.dart
new file mode 100644
index 000000000..a47209eb0
--- /dev/null
+++ b/core/lib/presentation/utils/html_transformer/sanitize_autolink_filter.dart
@@ -0,0 +1,65 @@
+
+import 'dart:convert';
+
+import 'package:core/utils/app_logger.dart';
+import 'package:linkify/linkify.dart';
+
+class SanitizeAutolinkFilter {
+
+  final HtmlEscape htmlEscape;
+  final _linkifyOption = const LinkifyOptions(
+    humanize: true,
+    looseUrl: true,
+    defaultToHttps: true,
+    removeWww: true
+  );
+  final _linkifier = <Linkifier>[
+    const EmailLinkifier(),
+    const UrlLinkifier()
+  ];
+
+  SanitizeAutolinkFilter(this.htmlEscape);
+
+  String process(String inputText) {
+    if (inputText.isEmpty) {
+      return '';
+    }
+
+    final elements = linkify(
+      inputText,
+      options: _linkifyOption,
+      linkifiers: _linkifier
+    );
+    log('AutolinkFilter::process:elements: $elements');
+    final htmlTextBuffer = StringBuffer();
+
+    for (var element in elements) {
+      if (element is TextElement) {
+        final escapedHtml = htmlEscape.convert(element.text);
+        htmlTextBuffer.write(escapedHtml);
+      } else if (element is EmailElement) {
+        final emailLinkTag = _buildEmailLinkTag(
+          mailToLink: element.url,
+          value: element.text
+        );
+        htmlTextBuffer.write(emailLinkTag);
+      } else if (element is UrlElement) {
+        final urlLinkTag = _buildUrlLinkTag(
+          urlLink: element.url,
+          value: element.text
+        );
+        htmlTextBuffer.write(urlLinkTag);
+      }
+    }
+
+    return htmlTextBuffer.toString();
+  }
+
+  String _buildUrlLinkTag({required String urlLink, required String value}) {
+    return '<a href="$urlLink" target="_blank">$value</a>';
+  }
+
+  String _buildEmailLinkTag({required String mailToLink, required String value}) {
+    return '<a href="$mailToLink">$value</a>';
+  }
+}
\ No newline at end of file
diff --git a/core/lib/utils/linkify_html.dart b/core/lib/utils/linkify_html.dart
deleted file mode 100644
index 2c2372500..000000000
--- a/core/lib/utils/linkify_html.dart
+++ /dev/null
@@ -1,78 +0,0 @@
-
-import 'package:core/utils/app_logger.dart';
-
-class LinkifyHtml {
-
-  String generateLinkify(String inputText) {
-    var replacedText = _linkifyUrlAddress(inputText);
-    replacedText = _linkifyMailToAddress(replacedText);
-    return replacedText;
-  }
-
-  RegExp _generateRegExp(String pattern) {
-    return RegExp(pattern, multiLine: true, caseSensitive: false);
-  }
-
-  /// URLs starting with http://, https://, ftp://, or "www." without //.
-  String _linkifyUrlAddress(String inputText) {
-    var replacedText = inputText;
-
-    // URLs starting with http://, https://, ftp://
-    final regexLinkWithHttp = _generateRegExp(r'(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])');
-    final newReplacedTextWithHttp = replacedText.replaceAllMapped(regexLinkWithHttp, (regexMatch) {
-      final link = regexMatch.group(1);
-      log('LinkifyHtml::_linkifyUrlAddress():link: $link');
-      if (link?.isNotEmpty == true) {
-        if (replacedText.contains('<a href="$link"')) {
-          return link!;
-        } else {
-          return '<a href="$link" target="_blank">$link</a>';
-        }
-      } else {
-        return '';
-      }
-    });
-    replacedText = newReplacedTextWithHttp;
-
-    // URLs starting with "www." without // before it or it'd re-link the ones done above.
-    final regexLinkWithWWW = _generateRegExp(r'(^|[^\/])(www\.[\S]+(\b|\$))');
-    final newReplacedTextWithWWW = replacedText.replaceAllMapped(regexLinkWithWWW, (regexMatch) {
-      final previousChar = regexMatch.group(1);
-      log('LinkifyHtml::_linkifyUrlAddress(): previousChar: $previousChar');
-      final link = regexMatch.group(2);
-      log('LinkifyHtml::_linkifyUrlAddress():link: $link');
-      if (link?.isNotEmpty == true) {
-        if (replacedText.contains('<a href="https://$link"') || replacedText.contains('<a href="http://$link"')) {
-          return link!;
-        } else {
-          return '$previousChar<a href="https://$link" target="_blank">$link</a>';
-        }
-      } else {
-        return '';
-      }
-    });
-    replacedText = newReplacedTextWithWWW;
-
-    return replacedText;
-  }
-
-  /// Change email addresses to mailto:: links.
-  String _linkifyMailToAddress(String inputText) {
-    final regexMailTo = _generateRegExp(r'(([a-zA-Z0-9\-\_\.])+@[a-zA-Z\_]+?(\.[a-zA-Z]{2,6})+)');
-
-    final newReplacedTextWitMailTo = inputText.replaceAllMapped(regexMailTo, (regexMatch) {
-      final emailAddress = regexMatch.group(1);
-      if (emailAddress?.isNotEmpty == true) {
-        if (inputText.contains('<a href="mailto:$emailAddress"')) {
-          return emailAddress!;
-        } else {
-          return '<a href="mailto:$emailAddress">$emailAddress</a>';
-        }
-      } else {
-        return '';
-      }
-    });
-
-    return newReplacedTextWitMailTo;
-  }
-}
\ No newline at end of file