diff --git a/src/networkplugin.cpp b/src/networkplugin.cpp
index 7343fa1625fc8b7ed0dcba515bec6f1cd6cb3df3..6d0b88cc3832c6e14c4b5d41839da9e3649ba5d5 100644
--- a/src/networkplugin.cpp
+++ b/src/networkplugin.cpp
@@ -123,6 +123,45 @@ void NetworkPlugin::handleBuddyChanged(const std::string &user, const std::strin
 	send(message);
 }
 
+void NetworkPlugin::handleBuddyTyping(const std::string &user, const std::string &buddyName) {
+	pbnetwork::Buddy buddy;
+	buddy.set_username(user);
+	buddy.set_buddyname(buddyName);
+
+	std::string message;
+	buddy.SerializeToString(&message);
+
+	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_TYPING);
+
+	send(message);
+}
+
+void NetworkPlugin::handleBuddyTyped(const std::string &user, const std::string &buddyName) {
+	pbnetwork::Buddy buddy;
+	buddy.set_username(user);
+	buddy.set_buddyname(buddyName);
+
+	std::string message;
+	buddy.SerializeToString(&message);
+
+	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_TYPED);
+
+	send(message);
+}
+
+void NetworkPlugin::handleBuddyStoppedTyping(const std::string &user, const std::string &buddyName) {
+	pbnetwork::Buddy buddy;
+	buddy.set_username(user);
+	buddy.set_buddyname(buddyName);
+
+	std::string message;
+	buddy.SerializeToString(&message);
+
+	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_STOPPED_TYPING);
+
+	send(message);
+}
+
 void NetworkPlugin::handleConnected(const std::string &user) {
 	std::cout << "LOGIN SENT\n";
 	pbnetwork::Connected d;