diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index ea49430b08beb5b3922ab044695c85471a6cccd0..e2b3d01e1b60696085ade911b640d865552b4f72 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -99,6 +99,46 @@ void RosterManager::setBuddy(Buddy *buddy) {
 	setBuddyCallback(buddy);
 }
 
+void RosterManager::removeBuddy(const std::string &name) {
+	Buddy *buddy = getBuddy(name);
+	if (!buddy) {
+		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to remove unknown buddy " << name);
+		return;
+	}
+
+	if (m_component->inServerMode() || m_remoteRosterRequest) {
+		sendBuddyRosterRemove(buddy);
+	}
+	else {
+		sendBuddyUnsubscribePresence(buddy);
+	}
+
+	unsetBuddy(buddy);
+	delete buddy;
+}
+
+void RosterManager::sendBuddyRosterRemove(Buddy *buddy) {
+	Swift::RosterPayload::ref p = Swift::RosterPayload::ref(new Swift::RosterPayload());
+	Swift::RosterItemPayload item;
+	item.setJID(buddy->getJID().toBare());
+	item.setSubscription(Swift::RosterItemPayload::Remove);
+
+	p->addItem(item);
+
+	// In server mode we have to send pushes to all resources, but in gateway-mode we send it only to bare JID
+	if (m_component->inServerMode()) {
+		std::vector<Swift::Presence::ref> presences = m_component->getPresenceOracle()->getAllPresence(m_user->getJID().toBare());
+		BOOST_FOREACH(Swift::Presence::ref presence, presences) {
+			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(p, presence->getFrom(), m_component->getIQRouter());
+			request->send();
+		}
+	}
+	else {
+		Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(p, m_user->getJID().toBare(), m_component->getIQRouter());
+		request->send();
+	}
+}
+
 void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	// user can't receive anything in server mode if he's not logged in.
 	// He will ask for roster later (handled in rosterreponsder.cpp)
@@ -142,6 +182,20 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	}
 }
 
+void RosterManager::sendBuddyUnsubscribePresence(Buddy *buddy) {
+	Swift::Presence::ref response = Swift::Presence::create();
+	response->setTo(m_user->getJID());
+	response->setFrom(buddy->getJID());
+	response->setType(Swift::Presence::Unsubscribe);
+	m_component->getStanzaChannel()->sendPresence(response);
+
+	response = Swift::Presence::create();
+	response->setTo(m_user->getJID());
+	response->setFrom(buddy->getJID());
+	response->setType(Swift::Presence::Unsubscribed);
+	m_component->getStanzaChannel()->sendPresence(response);
+}
+
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
@@ -152,9 +206,6 @@ void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 }
 
 void RosterManager::handleBuddyChanged(Buddy *buddy) {
-	if (m_rosterStorage) {
-		m_rosterStorage->storeBuddy(buddy);
-	}
 }
 
 void RosterManager::setBuddyCallback(Buddy *buddy) {
@@ -235,7 +286,10 @@ void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPa
 		if (m_buddies.find(legacyName) != m_buddies.end()) {
 			continue;
 		}
-		std::cout << "LEGACYNAME " << legacyName << "\n";
+
+		if (legacyName.empty()) {
+			continue;
+		}
 
 		BuddyInfo buddyInfo;
 		buddyInfo.id = -1;
@@ -243,6 +297,7 @@ void RosterManager::handleRemoteRosterResponse(boost::shared_ptr<Swift::RosterPa
 		buddyInfo.legacyName = legacyName;
 		buddyInfo.subscription = "both";
 		buddyInfo.flags = Buddy::buddFlagsFromJID(item.getJID());
+		buddyInfo.groups = item.getGroups();
 
 		Buddy *buddy = m_component->getFactory()->createBuddy(this, buddyInfo);
 		setBuddy(buddy);
@@ -294,6 +349,10 @@ void RosterManager::sendRIE() {
 
 void RosterManager::handleSubscription(Swift::Presence::ref presence) {
 	std::string legacyName = Buddy::JIDToLegacyName(presence->getTo());
+	if (legacyName.empty()) {
+		return;
+	}
+	
 	// For server mode the subscription changes are handler in rosterresponder.cpp
 	// using roster pushes.
 	if (m_component->inServerMode()) {