1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index ca1509e..8fcef8c 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -334,19 +334,19 @@ void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> mes
 		std::string nick = message->getFrom().getResource();
 		if (nick != nick_ && currentOccupants_.find(nick) != currentOccupants_.end()) {
 			completer_->addWord(nick);
 		}
 	}
 	/*Buggy implementations never send the status code, so use an incoming message as a hint that joining's done (e.g. the old ejabberd on psi-im.org).*/
 	receivedActivity();
 	joined_ = true;
 
-	if (!message->getSubject().empty() && message->getBody().empty()) {
+	if (message->hasSubject() && message->getBody().empty()) {
 		chatWindow_->addSystemMessage(str(format(QT_TRANSLATE_NOOP("", "The room subject is now: %1%")) % message->getSubject()));;
 		chatWindow_->setSubject(message->getSubject());
 		doneGettingHistory_ = true;
 	}
 
 	if (!doneGettingHistory_ && !message->getPayload<Delay>()) {
 		doneGettingHistory_ = true;
 	}