3 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 0353cb9..4a9e164 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -161,7 +161,7 @@ void ChatsManager::setOnline(bool enabled) {
 			controllerPair.second->rejoin();
 		}
 	}
-
+	chatListWindow_->setBookmarksEnabled(enabled);
 }
 
 void ChatsManager::handleChatRequest(const String &contact) {
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index 86dfa8f..887d9a4 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -68,6 +68,9 @@ void QtChatListWindow::setupContextMenus() {
 }
 
 void QtChatListWindow::handleItemActivated(const QModelIndex& index) {
+	if (!bookmarksEnabled_) {
+		return;
+	}
 	ChatListItem* item = model_->getItemForIndex(index);
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item);
 	if (mucItem) {
diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h
index 8067b4b..35f5447 100644
--- a/Swiften/MUC/MUCBookmarkManager.h
+++ b/Swiften/MUC/MUCBookmarkManager.h
@@ -27,7 +27,7 @@ namespace Swift {
 			void removeBookmark(const MUCBookmark& bookmark);
 			void replaceBookmark(const MUCBookmark& oldBookmark, const MUCBookmark& newBookmark);
 
-			const std::vector<MUCBookmark>& getBookmarks() const; 
+			const std::vector<MUCBookmark>& getBookmarks() const;
 
 		public:
 			boost::signal<void (const MUCBookmark&)> onBookmarkAdded;