1 files changed, 7 insertions, 5 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 802a7cb..df59c2f 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -84,24 +84,26 @@ void ChatControllerBase::setAvailableServerFeatures(boost::shared_ptr<DiscoInfo>
 		request->send();
 		//labelsEnabled_ = true;
 	} else {
 		chatWindow_->setSecurityLabelsEnabled(false);
 		labelsEnabled_ = false;
 	}
 }
 
 void ChatControllerBase::handleAllMessagesRead() {
-	foreach (boost::shared_ptr<MessageEvent> messageEvent, unreadMessages_) {
-		messageEvent->read();
+	if (!unreadMessages_.empty()) {
+		foreach (boost::shared_ptr<MessageEvent> messageEvent, unreadMessages_) {
+			messageEvent->read();
+		}
+		unreadMessages_.clear();
+		chatWindow_->setUnreadMessageCount(0);
+		onUnreadCountChanged();
 	}
-	unreadMessages_.clear();
-	chatWindow_->setUnreadMessageCount(0);
-	onUnreadCountChanged();
 }
 
 int ChatControllerBase::getUnreadCount() {
 	return unreadMessages_.size();
 }
 
 void ChatControllerBase::handleSendMessageRequest(const std::string &body, bool isCorrectionMessage) {
 	if (!stanzaChannel_->isAvailable() || body.empty()) {
 		return;