diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
index 5d614f95cf1..df7b4db61fe 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
@@ -42,7 +42,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index 493e05d5729..e1de620aa65 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -42,7 +42,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-group-info">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 80ef7d52908..6b887668ed9 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2245,3 +2245,7 @@ $switch-transition: .2s all !default;
 .paged-content-page-container {
     min-height: 3.125rem;
 }
+
+.text-decoration-none {
+    text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
+}
\ No newline at end of file
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 8296af2cfcf..37dfb4c635c 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10528,6 +10528,10 @@ div.editor_atto_toolbar button .icon {
 .paged-content-page-container {
   min-height: 3.125rem; }
 
+.text-decoration-none {
+  text-decoration: none !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
 .icon {
   font-size: 16px;
   width: 16px;
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 251435cb49d..d4a8acbadbe 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -2442,4 +2442,8 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     100% {
         background-color: @grayLighter;
     }
+}
+
+.text-decoration-none {
+    text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
 }
\ No newline at end of file
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 243577276cb..29f47c27289 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -4823,6 +4823,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     background-color: #eee;
   }
 }
+.text-decoration-none {
+  text-decoration: none !important;
+  /* stylelint-disable-line declaration-no-important */
+}
 /* admin.less */
 .formtable tbody th {
   font-weight: normal;
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
index ae6f25b68ff..6b341d82010 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
@@ -47,7 +47,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index ff59e716ecb..c13a184fc7d 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -46,7 +46,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-group-info">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img