diff --git a/web/templates/me_message.hbs b/web/templates/me_message.hbs
index 8f81300373..e3b1cc3c6f 100644
--- a/web/templates/me_message.hbs
+++ b/web/templates/me_message.hbs
@@ -1,8 +1,6 @@
 <span class="message_sender no-select is_me_message">
-    <span class="sender_info_hover">
-        <span>
-            {{> message_avatar}}
-        </span>
+    <span>
+        {{> message_avatar}}
     </span>
 
     <span class="sender-status">
diff --git a/web/templates/message_avatar.hbs b/web/templates/message_avatar.hbs
index cfc4d57ce7..476495598f 100644
--- a/web/templates/message_avatar.hbs
+++ b/web/templates/message_avatar.hbs
@@ -1,4 +1,4 @@
-<div class="u-{{msg/sender_id}} inline_profile_picture {{#sender_is_guest}} guest-avatar{{/sender_is_guest}} view_user_card_tooltip" aria-hidden="true">
+<div class="u-{{msg/sender_id}} sender_info_hover inline_profile_picture {{#sender_is_guest}} guest-avatar{{/sender_is_guest}} view_user_card_tooltip" aria-hidden="true">
     <img src="{{small_avatar_url}}" alt="" class="no-drag"/>
 </div>
 {{~! remove whitespace ~}}
diff --git a/web/templates/message_body.hbs b/web/templates/message_body.hbs
index 914fe7a1a2..7bea2b27f9 100644
--- a/web/templates/message_body.hbs
+++ b/web/templates/message_body.hbs
@@ -1,9 +1,9 @@
 {{#unless status_message}}
-<span class="message_sender sender_info_hover no-select">
+<span class="message_sender no-select">
     {{#if include_sender}}
     <span>
         {{> message_avatar ~}}
-        <span class="sender_name auto-select" role="button" tabindex="0">
+        <span class="sender_info_hover sender_name auto-select" role="button" tabindex="0">
             <span class="sender_name_padding view_user_card_tooltip"></span>
             <span class="view_user_card_tooltip">{{msg/sender_full_name}}{{> status_emoji msg/status_emoji_info}}</span>
         </span>