diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index c0ec6d7901605f63bfae86e9acec402d885313eb..1eaa1861f155ad965f8e689c1f3698c9fed77d96 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2267,7 +2267,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 
     public void updateSendButton() {
         boolean hasAttachments = mediaPreviewAdapter != null && mediaPreviewAdapter.hasAttachments();
-        boolean useSendButtonToIndicateStatus = activity != null && PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("send_button_status", getResources().getBoolean(R.bool.send_button_status));
         final Conversation c = this.conversation;
         final Presence.Status status;
         final String text = this.binding.textinput == null ? "" : this.binding.textinput.getText().toString();
@@ -2277,7 +2276,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         } else {
             action = SendButtonTool.getAction(getActivity(), c, text);
         }
-        if (useSendButtonToIndicateStatus && c.getAccount().getStatus() == Account.State.ONLINE) {
+        if (c.getAccount().getStatus() == Account.State.ONLINE) {
             if (activity != null && activity.xmppConnectionService != null && activity.xmppConnectionService.getMessageArchiveService().isCatchingUp(c)) {
                 status = Presence.Status.OFFLINE;
             } else if (c.getMode() == Conversation.MODE_SINGLE) {
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index a41fcbae279c5bb62cd5e615a7f8709045d18579..bfe8ae95376d8ff1aaf1c7b13c10cc7b1c0de584 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -19,7 +19,6 @@
     <string name="picture_compression">auto</string>
     <string name="theme">light</string>
     <bool name="use_green_background">true</bool>
-    <bool name="send_button_status">false</bool>
     <string name="quick_action">recent</string>
     <bool name="show_dynamic_tags">false</bool>
     <bool name="btbv">true</bool>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 46a6f0311fd6b9e2766179593ba0bb4edce2a89d..75a929e3fe33a73b3943b2b65c479e22cace523d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -281,8 +281,6 @@
     <string name="title_pref_quiet_hours_end_time">End time</string>
     <string name="title_pref_enable_quiet_hours">Enable quiet hours</string>
     <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string>
-    <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <string name="pref_expert_options_other">Other</string>
     <string name="pref_autojoin">Synchronize with bookmarks</string>
     <string name="pref_autojoin_summary">Join and leave group chats according to auto-join flag in your bookmarks.</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index ed67e1be8ba19023a2685b44cabd86ec8b3af720..b071233aa19bca8f2ae1fa4ed8faca5360ea5553 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -156,11 +156,6 @@
             android:key="use_green_background"
             android:summary="@string/pref_use_green_background_summary"
             android:title="@string/pref_use_green_background" />
-        <CheckBoxPreference
-            android:defaultValue="@bool/send_button_status"
-            android:key="send_button_status"
-            android:summary="@string/pref_use_send_button_to_indicate_status_summary"
-            android:title="@string/pref_use_send_button_to_indicate_status" />
         <CheckBoxPreference
             android:defaultValue="@bool/show_dynamic_tags"
             android:key="show_dynamic_tags"