Remove color from /me name, remove use_markup from sender label

2 files changed, 2 insertions, 4 deletions

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);