Index: win32/AppearancePage.cpp
===================================================================
--- win32/AppearancePage.cpp	(revision 995)
+++ win32/AppearancePage.cpp	(working copy)
@@ -44,7 +44,7 @@
 
 PropPage::ListItem AppearancePage::listItems[] = {
 	{ SettingsManager::ALT_SORT_ORDER, N_("Sort all downloads first") },
-	{ SettingsManager::FILTER_MESSAGES, N_("Filter kick and NMDC debug messages") },
+	{ SettingsManager::FILTER_MESSAGES, N_("Filter kick messages") },
 	{ SettingsManager::MINIMIZE_TRAY, N_("Minimize to tray") },
 	{ SettingsManager::TIME_STAMPS, N_("Show timestamps in chat by default") },
 	{ SettingsManager::STATUS_IN_CHAT, N_("View status messages in main chat") },
Index: win32/HubFrame.cpp
===================================================================
--- win32/HubFrame.cpp	(revision 995)
+++ win32/HubFrame.cpp	(working copy)
@@ -881,23 +881,23 @@
 }
 
 void HubFrame::on(Message, Client*, const OnlineUser& from, const string& msg, bool thirdPerson) throw() {
-	speak(ADD_CHAT_LINE, Util::formatMessage(from.getIdentity().getNick(), msg, thirdPerson));
-}
-
-void HubFrame::on(StatusMessage, Client*, const string& line) throw() {
 	if(SETTING(FILTER_MESSAGES)) {
-		if((line.find("Hub-Security") != string::npos) && (line.find("was kicked by") != string::npos)) {
+		if((msg.find("Hub-Security") != string::npos) && (msg.find("was kicked by") != string::npos)) {
 			// Do nothing...
-		} else if((line.find("is kicking") != string::npos) && (line.find("because:") != string::npos)) {
-			speak(ADD_SILENT_STATUS_LINE, Text::toDOS(line));
+		} else if((msg.find("is kicking") != string::npos) && (msg.find("because:") != string::npos)) {
+			speak(ADD_SILENT_STATUS_LINE, msg);
 		} else {
-			speak(ADD_CHAT_LINE, Text::toDOS(line));
+			speak(ADD_CHAT_LINE, Util::formatMessage(from.getIdentity().getNick(), msg, thirdPerson));
 		}
 	} else {
-		speak(ADD_CHAT_LINE, Text::toDOS(line));
+		speak(ADD_CHAT_LINE, Util::formatMessage(from.getIdentity().getNick(), msg, thirdPerson));
 	}
 }
 
+void HubFrame::on(StatusMessage, Client*, const string& line) throw() {
+	speak(ADD_CHAT_LINE, Text::toDOS(line));
+}
+
 void HubFrame::on(PrivateMessage, Client*, const OnlineUser& from, const OnlineUser& to, const OnlineUser& replyTo, const string& line, bool thirdPerson) throw() {
 	speak(from, to, replyTo, Util::formatMessage(from.getIdentity().getNick(), line, thirdPerson));
 }