diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 314b8fe73..2bff31edb 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2592,7 +2592,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.COMPOSING)) {
             service.sendChatState(conversation);
         }
-        updateSendButton();
+        runOnUiThread(this::updateSendButton);
     }
 
     @Override
@@ -2618,15 +2618,15 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             service.sendChatState(conversation);
         }
         if (storeNextMessage()) {
-            activity.onConversationsListItemUpdated();
+            runOnUiThread(() -> activity.onConversationsListItemUpdated());
         }
-        updateSendButton();
+        runOnUiThread(this::updateSendButton);
     }
 
     @Override
     public void onTextChanged() {
         if (conversation != null && conversation.getCorrectingMessage() != null) {
-            updateSendButton();
+            runOnUiThread(this::updateSendButton);
         }
     }