1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/EventWindowController.cpp b/Swift/Controllers/EventWindowController.cpp
index fbe9a8a..47554ce 100644
--- a/Swift/Controllers/EventWindowController.cpp
+++ b/Swift/Controllers/EventWindowController.cpp
@@ -27,8 +27,11 @@ void EventWindowController::handleEventQueueEventAdded(boost::shared_ptr<StanzaE
 	if (event->getConcluded()) {
 		handleEventConcluded(event);
 	} else {
-		event->onConclusion.connect(boost::bind(&EventWindowController::handleEventConcluded, this, event));
-		window_->addEvent(event, true);
+		boost::shared_ptr<MessageEvent> message = boost::dynamic_pointer_cast<MessageEvent>(event);
+		if (!(message && message->isReadable())) {
+			event->onConclusion.connect(boost::bind(&EventWindowController::handleEventConcluded, this, event));
+			window_->addEvent(event, true);
+		}
 	}
 }