diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index fc1dc6a7..402ad6ca 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -592,7 +592,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
 
     private fun updateProfiles() {
         val profiles: MutableList<IProfile> = accountManager.getAllAccountsOrderedByActive().map { acc ->
-            val emojifiedName = EmojiCompat.get().process(acc.displayName.emojify(acc.emojis, header))
+            val emojifiedName = EmojiCompat.get().process(acc.displayName.emojify(acc.emojis, header, true))
 
             ProfileDrawerItem().apply {
                 isSelected = acc.isActive
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 2ecf6faf..d1c29801 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -81,6 +81,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
diff --git a/app/src/main/res/values-de/husky.xml b/app/src/main/res/values-de/husky.xml
index 35416f35..298ef5eb 100644
--- a/app/src/main/res/values-de/husky.xml
+++ b/app/src/main/res/values-de/husky.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="action_unmute_conversation">Gesprächstummhaltung aufheben</string>
+    <!--<string name="action_unmute_conversation">Gesprächstummhaltung aufheben</string>-->
     <string name="action_disable_formatting_syntax">%s deaktivieren</string>
     <string name="action_emoji_react">Reagieren</string>
     <string name="action_emoji_unreact">Reaktion entfernen</string>
@@ -17,7 +17,7 @@
     <string name="notification_emoji_description">Benachrictigungen über neue Emojireaktionen</string>
     <string name="pref_title_default_formatting">Standardformatierungssyntax (wenn von der Instanz unterstützt)</string>
     <string name="pref_title_hide_muted_users">Ignorierte Nutzer verstecken</string>
-    <string name="action_mute_conversation">Gespräch stummschalten</string>
+    <!--<string name="action_mute_conversation">Gespräch stummschalten</string>-->
     <string name="pref_title_notification_filter_emoji">Reaktionen auf meine Nachrichten</string>
     <string name="action_reply_to">Antwort auf</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/husky.xml b/app/src/main/res/values-fr/husky.xml
index 767df0c5..7ed624a1 100644
--- a/app/src/main/res/values-fr/husky.xml
+++ b/app/src/main/res/values-fr/husky.xml
@@ -6,7 +6,7 @@
     <string name="hint_website">Site internet de l\'application</string>
     <string name="pref_title_notification_filter_emoji">mes messages peuvent recevoir des réactions</string>
     <string name="action_reply_to">Répondre à</string>
-    <string name="action_unmute_conversation">Afficher la conversation</string>
+    <!--<string name="action_unmute_conversation">Afficher la conversation</string>-->
     <string name="action_emoji_react">Réagir</string>
     <string name="action_emoji_unreact">Supprimer la réaction</string>
     <string name="action_emoji_reacted_by">Réaction de</string>
@@ -17,7 +17,7 @@
     <string name="error_media_upload_size">La taille du fichier dépasse la limite de l\'instance</string>
     <string name="action_enable_formatting_syntax">Activer %s</string>
     <string name="action_disable_formatting_syntax">Désactiver %s</string>
-    <string name="action_mute_conversation">Masquer la conversation</string>
+    <!--<string name="action_mute_conversation">Masquer la conversation</string>-->
     <string name="admin">Administrateur•rice</string>
     <string name="pref_title_default_formatting">Syntaxe de formatage par défaut (si supportée par l\'instance)</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/husky.xml b/app/src/main/res/values-ru/husky.xml
index 6471c5be..7149221f 100644
--- a/app/src/main/res/values-ru/husky.xml
+++ b/app/src/main/res/values-ru/husky.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_reply_to">Ответ на</string>
-    <string name="action_mute_conversation">Заглушить разговор</string>
-    <string name="action_unmute_conversation">Отменить глушение разговора</string>
+    <!--<string name="action_mute_conversation">Заглушить разговор</string>
+    <string name="action_unmute_conversation">Отменить глушение разговора</string>-->
     <string name="action_emoji_react">Добавить реакцию</string>
     <string name="action_emoji_unreact">Удалить реакцию</string>
     <string name="action_emoji_reacted_by">Реакции</string>
@@ -20,4 +20,4 @@
     <string name="pref_title_default_formatting">Синтаксис форматирования по умолчанию(если поддерживается)</string>
     <string name="pref_title_notification_filter_emoji">на мои посты отреагировали</string>
     <string name="pref_title_hide_muted_users">Скрывать заглушенных пользователей</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/husky.xml b/app/src/main/res/values/husky.xml
index cc0dff0e..a9ceb7b4 100644
--- a/app/src/main/res/values/husky.xml
+++ b/app/src/main/res/values/husky.xml
@@ -1,8 +1,8 @@
 <resources>
     
     <string name="action_reply_to">Reply to</string>
-    <string name="action_mute_conversation">Mute conversation</string>
-    <string name="action_unmute_conversation">Unmute conversation</string>
+    <!--<string name="action_mute_conversation">Mute conversation</string>
+    <string name="action_unmute_conversation">Unmute conversation</string>-->
     <string name="action_emoji_react">React</string>
     <string name="action_emoji_unreact">Remove reaction</string>
     <string name="action_emoji_reacted_by">Who reacted</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04c7230d..37104d2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,6 +109,8 @@
     <string name="action_mute">Mute</string>
     <string name="action_unmute">Unmute</string>
     <string name="action_mute_domain">Mute %s</string>
+    <string name="action_mute_conversation">Mute conversation</string>
+    <string name="action_unmute_conversation">Unmute conversation</string>
     <string name="action_mention">Mention</string>
     <string name="action_hide_media">Hide media</string>
     <string name="action_open_drawer">Open drawer</string>