3 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 519deda..2c2540c 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -48,18 +48,19 @@ ChatControllerBase::ChatControllerBase(const JID& self, StanzaChannel* stanzaCha
 	chatWindow_->onSendMessageRequest.connect(boost::bind(&ChatControllerBase::handleSendMessageRequest, this, _1, _2));
 	chatWindow_->onLogCleared.connect(boost::bind(&ChatControllerBase::handleLogCleared, this));
 	entityCapsProvider_->onCapsChanged.connect(boost::bind(&ChatControllerBase::handleCapsChanged, this, _1));
 	highlighter_ = highlightManager->createHighlighter();
 	setOnline(stanzaChannel->isAvailable() && iqRouter->isAvailable());
 	createDayChangeTimer();
 }
 
 ChatControllerBase::~ChatControllerBase() {
+	delete highlighter_;
 	delete chatWindow_;
 }
 
 void ChatControllerBase::handleLogCleared() {
 	cancelReplaces();
 }
 
 ChatWindow* ChatControllerBase::detachChatWindow() {
 	ChatWindow* chatWindow = chatWindow_;
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index a81d587..392a426 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -95,21 +95,23 @@ class RosterControllerTest : public CppUnit::TestFixture {
 			mainWindow_ = mainWindowFactory_->last;
 		}
 
 		void tearDown() {
 			delete rosterController_;
 			delete vcardManager_;
 			delete vcardStorage_;
 			delete crypto_;
 			delete clientBlockListManager_;
+			delete ftOverview_;
 			delete ftManager_;
 			delete jingleSessionManager_;
-			
+			delete entityCapsManager_;
+			delete capsProvider_;
 			delete nickManager_;
 			delete nickResolver_;
 			delete mucRegistry_;
 			delete mainWindowFactory_;
 			delete avatarManager_;
 			delete router_;
 			delete channel_;
 			delete eventController_;
 			delete subscriptionManager_;
diff --git a/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp b/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
index 9489e5b..0ccbc4a 100644
--- a/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
+++ b/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
@@ -24,19 +24,19 @@ public:
 		store_ = new PreviousStatusStore();
 		store_->addStatus(StatusShow::Online, "At home in the study");
 		store_->addStatus(StatusShow::DND, "In a meeting");
 		store_->addStatus(StatusShow::DND, "With a client");
 		store_->addStatus(StatusShow::Away, "Walking the elephant");
 		store_->addStatus(StatusShow::Online, "In the office, at my desk");
 	}
 
 	void tearDown() {
-		
+		delete store_;
 	}
 
 	void testGetAll() {
 
 	}
 
 private:
 	PreviousStatusStore* store_;
 };