1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 9ac97f4..2955cee 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -172,7 +172,6 @@ MainController::MainController(
 	idleDetector_->onIdleChanged.connect(boost::bind(&MainController::handleInputIdleChanged, this, _1));
 
 	xmlConsoleController_ = new XMLConsoleController(uiEventStream_, uiFactory_);
-	historyController_ = new HistoryController();
 
 	fileTransferListController_ = new FileTransferListController(uiEventStream_, uiFactory_);
 
@@ -197,7 +196,6 @@ MainController::~MainController() {
 	resetClient();
 	delete fileTransferListController_;
 	delete xmlConsoleController_;
-	delete historyController_;
 	delete xmppURIController_;
 	delete soundEventController_;
 	delete systemTrayController_;
@@ -223,6 +221,8 @@ void MainController::resetClient() {
 	eventWindowController_ = NULL;
 	delete chatsManager_;
 	chatsManager_ = NULL;
+	delete historyController_;
+	historyController_ = NULL;
 	delete historyViewController_;
 	historyViewController_ = NULL;
 	delete ftOverview_;
@@ -301,9 +301,9 @@ void MainController::handleConnected() {
 		 * want to have the user's nick available and this means it will
 		 * be before they receive stanzas that need it (e.g. bookmarks).*/
 		client_->getVCardManager()->requestOwnVCard();
+		historyController_ = new HistoryController(storages_->getHistoryStorage());
 
 		chatsManager_ = new ChatsManager(jid_, client_->getStanzaChannel(), client_->getIQRouter(), eventController_, uiFactory_, uiFactory_, client_->getNickResolver(), client_->getPresenceOracle(), client_->getPresenceSender(), uiEventStream_, uiFactory_, useDelayForLatency_, networkFactories_->getTimerFactory(), client_->getMUCRegistry(), client_->getEntityCapsProvider(), client_->getMUCManager(), uiFactory_, profileSettings_, ftOverview_, client_->getRoster(), !settings_->getSetting(SettingConstants::REMEMBER_RECENT_CHATS), settings_, historyController_);
-
 		historyViewController_ = new HistoryViewController(jid_, uiEventStream_, historyController_, client_->getNickResolver(), client_->getAvatarManager(), client_->getPresenceOracle(), uiFactory_);
 		
 		client_->onMessageReceived.connect(boost::bind(&ChatsManager::handleIncomingMessage, chatsManager_, _1));