2 files changed, 19 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index 8503609..12c6777 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -188,19 +188,36 @@ void UserSearchController::handleSearchResponse(boost::shared_ptr<SearchPayload>
 void UserSearchController::handleNameSuggestionRequest(const JID &jid) {
 	suggestionsJID_= jid;
 	VCard::ref vcard = vcardManager_->getVCardAndRequestWhenNeeded(jid);
 	if (vcard) {
 		handleVCardChanged(jid, vcard);
 	}
 }
 
 void UserSearchController::handleContactSuggestionsRequested(std::string text) {
-	window_->setContactSuggestions(contactSuggester_->getSuggestions(text));
+	const std::vector<JID> existingJIDs = window_->getJIDs();
+	std::vector<Contact::ref> suggestions = contactSuggester_->getSuggestions(text);
+	std::vector<Contact::ref>::iterator i = suggestions.begin();
+	while (i != suggestions.end()) {
+		bool found = false;
+		foreach (const JID& jid, existingJIDs) {
+			if ((*i)->jid == jid) {
+				found = true;
+				break;
+			}
+		}
+		if (found) {
+			i = suggestions.erase(i);
+		} else {
+			i++;
+		}
+	}
+	window_->setContactSuggestions(suggestions);
 }
 
 void UserSearchController::handleVCardChanged(const JID& jid, VCard::ref vcard) {
 	if (jid == suggestionsJID_) {
 		window_->setNameSuggestions(ContactEditController::nameSuggestionsFromVCard(vcard));
 		suggestionsJID_ = JID();
 	}
 	handleJIDUpdateRequested(std::vector<JID>(1, jid));
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index ed76a6f..325edef 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -25,19 +25,19 @@
 #include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
  
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/Roster/RosterModel.h>
 #include <QtSwiftUtil.h>
 
 namespace Swift {
 
-QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget messageTarget, QWidget* parent) : QTreeView(parent), messageTarget_(messageTarget), tooltipShown_(false) {
+QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget messageTarget, QWidget* parent) : QTreeView(parent), tooltipShown_(false), messageTarget_(messageTarget) {
 	eventStream_ = eventStream;
 	settings_ = settings;
 	model_ = new RosterModel(this, settings_->getSetting(QtUISettingConstants::USE_SCREENREADER));
 	setModel(model_);
 	delegate_ = new RosterDelegate(this, settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
 	setItemDelegate(delegate_);
 	setHeaderHidden(true);
 #ifdef SWIFT_PLATFORM_MACOSX
 	setAlternatingRowColors(true);