diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0d921d733a328c8422b126cd15cad85a55883e18..0b6086168dcb87e5a911657e5eb2a127ab68b123 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2543,7 +2543,9 @@ public class ConversationFragment extends XmppFragment
             } else {
                 if (conversation.getMode() == Conversation.MODE_MULTI) {
                     if (activity == null || activity.xmppConnectionService == null) return;
-                    if (!activity.xmppConnectionService.getBooleanPreference("follow_thread_in_channel", R.bool.follow_thread_in_channel)) return;
+                    if (message.getStatus() < Message.STATUS_SEND) {
+                        if (!activity.xmppConnectionService.getBooleanPreference("follow_thread_in_channel", R.bool.follow_thread_in_channel)) return;
+                    }
                 }
 
                 setThread(message.getThread());