diff --git a/core/lib/presentation/utils/html_transformer/text/convert_url_string_to_html_links_transformers.dart b/core/lib/presentation/utils/html_transformer/text/convert_url_string_to_html_links_transformers.dart
deleted file mode 100644
index 5f9f3d0cb..000000000
--- a/core/lib/presentation/utils/html_transformer/text/convert_url_string_to_html_links_transformers.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-
-import 'package:core/presentation/utils/html_transformer/base/text_transformer.dart';
-import 'package:core/utils/linkify_html.dart';
-
-class ConvertUrlStringToHtmlLinksTransformers extends TextTransformer {
-
-  const ConvertUrlStringToHtmlLinksTransformers();
-
-  @override
-  String process(String text) {
-    final texValid = LinkifyHtml().generateLinkify(text);
-    return texValid;
-  }
-}
\ No newline at end of file
diff --git a/core/lib/presentation/utils/html_transformer/text/sanitize_autolink_html_transformers.dart b/core/lib/presentation/utils/html_transformer/text/sanitize_autolink_html_transformers.dart
new file mode 100644
index 000000000..e1bcbb30c
--- /dev/null
+++ b/core/lib/presentation/utils/html_transformer/text/sanitize_autolink_html_transformers.dart
@@ -0,0 +1,15 @@
+
+import 'dart:convert';
+
+import 'package:core/presentation/utils/html_transformer/sanitize_autolink_filter.dart';
+import 'package:core/presentation/utils/html_transformer/base/text_transformer.dart';
+
+class SanitizeAutolinkHtmlTransformers extends TextTransformer {
+
+  final HtmlEscape htmlEscape;
+
+  SanitizeAutolinkHtmlTransformers(this.htmlEscape);
+
+  @override
+  String process(String text) => SanitizeAutolinkFilter(htmlEscape).process(text);
+}
\ No newline at end of file
diff --git a/core/lib/presentation/utils/html_transformer/text/sanitize_html_transformers.dart b/core/lib/presentation/utils/html_transformer/text/sanitize_html_transformers.dart
deleted file mode 100644
index baf2b9cd7..000000000
--- a/core/lib/presentation/utils/html_transformer/text/sanitize_html_transformers.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-
-import 'dart:convert';
-
-import 'package:core/presentation/utils/html_transformer/base/text_transformer.dart';
-import 'package:core/utils/app_logger.dart';
-
-class SanitizeHtmlTransformers extends TextTransformer {
-
-  const SanitizeHtmlTransformers();
-
-  @override
-  String process(String text) {
-    final htmlEncoded = const HtmlEscape().convert(text);
-    log('HtmlSanitizerTransformers::process:htmlEncoded: $htmlEncoded');
-    return htmlEncoded;
-  }
-}
\ No newline at end of file