1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 8c132d0..bedc427 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -173,11 +173,15 @@ void ChatController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> me
        }
        boost::shared_ptr<Message> message = messageEvent->getStanza();
        JID from = message->getFrom();
        if (!from.equals(toJID_, JID::WithResource)) {
                if (toJID_.equals(from, JID::WithoutResource)  && toJID_.isBare()){
-                        setToJID(from);
+                        // Bind controller to a full JID if message contains body text or is a typing chat state.
+                        ChatState::ref chatState = message->getPayload<ChatState>();
+                        if (!message->getBody().empty() || (chatState && chatState->getChatState() == ChatState::Composing)) {
+                                setToJID(from);
+                        }
                }
        }
        chatStateTracker_->handleMessageReceived(message);
        chatStateNotifier_->receivedMessageFromContact(!!message->getPayload<ChatState>());