diff --git a/main/data/conversation_content_view/item_metadata_header.ui b/main/data/conversation_content_view/item_metadata_header.ui
index a24b27fa..c146aff1 100644
--- a/main/data/conversation_content_view/item_metadata_header.ui
+++ b/main/data/conversation_content_view/item_metadata_header.ui
@@ -5,7 +5,6 @@
         <property name="orientation">horizontal</property>
         <child>
             <object class="GtkLabel" id="name_label">
-                <property name="use_markup">True</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <property name="valign">baseline</property>
diff --git a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
index a14e9019..077440d6 100644
--- a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
+++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
@@ -216,7 +216,7 @@ public class ItemMetaDataHeader : Box {
     }
 
     private void update_name_label() {
-        name_label.label = Markup.escape_text(Util.get_participant_display_name(stream_interactor, conversation, item.jid));
+        name_label.label = Util.get_participant_display_name(stream_interactor, conversation, item.jid);
     }
 
     private void update_received_mark() {
diff --git a/main/src/ui/conversation_content_view/message_widget.vala b/main/src/ui/conversation_content_view/message_widget.vala
index ead9a570..8868a8ce 100644
--- a/main/src/ui/conversation_content_view/message_widget.vala
+++ b/main/src/ui/conversation_content_view/message_widget.vala
@@ -205,9 +205,7 @@ public class MessageItemWidget : SizeRequestBin {
 
         if (message.body.has_prefix("/me ")) {
             string display_name = Util.get_participant_display_name(stream_interactor, conversation, message.from);
-            string color = Util.get_name_hex_color(stream_interactor, conversation.account, message.real_jid ?? message.from, Util.is_dark_theme(label));
-            markup_text = @"<span color=\"#$(color)\">$(Markup.escape_text(display_name))</span> " + markup_text;
-            theme_dependent = true;
+            markup_text = @"<i><b>$(Markup.escape_text(display_name))</b> " + markup_text + "</i>";
         }
 
         int only_emoji_count = Util.get_only_emoji_count(markup_text);
diff --git a/main/src/ui/global_search.vala b/main/src/ui/global_search.vala
index 289dd072..30f8f65a 100644
--- a/main/src/ui/global_search.vala
+++ b/main/src/ui/global_search.vala
@@ -261,7 +261,7 @@ public class GlobalSearch : Overlay {
         grid.attach(image, 0, 0, 1, 2);
 
         string display_name = Util.get_participant_display_name(stream_interactor, item.conversation, item.jid);
-        Label name_label = new Label(display_name) { ellipsize=EllipsizeMode.END, use_markup=true, xalign=0, visible=true };
+        Label name_label = new Label(display_name) { ellipsize=EllipsizeMode.END, xalign=0, visible=true };
         name_label.attributes = new AttrList();
         name_label.attributes.insert(attr_weight_new(Weight.BOLD));
         grid.attach(name_label, 1, 0, 1, 1);