1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 084c27a99..bfdcd41f1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1307,9 +1307,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                 action = SendButtonAction.TEXT;
             }
         }
-        if (activity.useSendButtonToIndicateStatus() && c != null
-                && c.getAccount().getStatus() == Account.State.ONLINE) {
-            if (c.getMode() == Conversation.MODE_SINGLE) {
+        if (activity.useSendButtonToIndicateStatus() && c.getAccount().getStatus() == Account.State.ONLINE) {
+            if (activity.xmppConnectionService != null && activity.xmppConnectionService.getMessageArchiveService().isCatchingUp(c)) {
+                status = Presence.Status.OFFLINE;
+            } else if (c.getMode() == Conversation.MODE_SINGLE) {
                 status = c.getContact().getShownStatus();
             } else {
                 status = c.getMucOptions().online() ? Presence.Status.ONLINE : Presence.Status.OFFLINE;