1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index 1dfc80e3c..619c2b3f2 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -51,8 +51,10 @@ import de.pixart.messenger.ui.adapter.MediaAdapter;
 import de.pixart.messenger.ui.interfaces.OnMediaLoaded;
 import de.pixart.messenger.ui.util.Attachment;
 import de.pixart.messenger.ui.util.GridManager;
+import de.pixart.messenger.ui.util.JidDialog;
 import de.pixart.messenger.utils.Compatibility;
 import de.pixart.messenger.utils.CryptoHelper;
+import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.IrregularUnicodeDetector;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
 import de.pixart.messenger.utils.Namespace;
@@ -393,7 +395,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 ab.setDisplayShowCustomEnabled(true);
                 TextView abtitle = findViewById(android.R.id.text1);
                 TextView absubtitle = findViewById(android.R.id.text2);
-                abtitle.setText(contact.getDisplayName());
+                abtitle.setText(EmojiWrapper.transform(contact.getDisplayName()));
                 abtitle.setSelected(true);
                 abtitle.setClickable(false);
                 absubtitle.setVisibility(View.GONE);
@@ -419,10 +421,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
             binding.addContactButton.setOnClickListener(view -> {
                 final AlertDialog.Builder deleteFromRosterDialog = new AlertDialog.Builder(ContactDetailsActivity.this);
-                deleteFromRosterDialog.setNegativeButton(getString(R.string.cancel), null);
-                deleteFromRosterDialog.setTitle(getString(R.string.action_delete_contact));
-                deleteFromRosterDialog.setMessage(getString(R.string.remove_contact_text, contact.getJid().toString()));
-                deleteFromRosterDialog.setPositiveButton(getString(R.string.delete), removeFromRoster).create().show();
+                deleteFromRosterDialog.setNegativeButton(getString(R.string.cancel), null)
+                .setTitle(getString(R.string.action_delete_contact))
+                .setMessage(JidDialog.style(this, R.string.remove_contact_text, contact.getJid().toEscapedString()))
+                .setPositiveButton(getString(R.string.delete), removeFromRoster).create().show();
             });
             binding.detailsSendPresence.setOnCheckedChangeListener(null);
             binding.detailsReceivePresence.setOnCheckedChangeListener(null);
@@ -443,7 +445,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                         builder.append("\n");
                     }
                 }
-                binding.statusMessage.setText(builder);
+                binding.statusMessage.setText(EmojiWrapper.transform(builder));
             }
 
             String resources = contact.getPresences().getMostAvailableResource();