1 files changed, 8 insertions, 5 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 09bab05ac..220db6802 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -1427,11 +1427,14 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 Status statusFromUser = statusList.get(position - 1);
                 Account accountFromUser = statusFromUser.account;
                 statusFromUser.pronouns = null;
-                if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) {
-                    for (Field field : accountFromUser.fields) {
-                        if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) {
-                            statusList.get(position).pronouns = Helper.parseHtml(field.value);
-                            break;
+                boolean pronounsSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_PRONOUNS_SUPPORT), true);
+                if(pronounsSupport) {
+                    if (accountFromUser.fields != null && accountFromUser.fields.size() > 0) {
+                        for (Field field : accountFromUser.fields) {
+                            if (PronounsHelper.pronouns.contains(field.name.toLowerCase().trim())) {
+                                statusList.get(position).pronouns = Helper.parseHtml(field.value);
+                                break;
+                            }
                         }
                     }
                 }