diff --git a/protocols/yahoo/Yahoo.cpp b/protocols/yahoo/Yahoo.cpp
index 794cb5c..33f19ba 100644
--- a/protocols/yahoo/Yahoo.cpp
+++ b/protocols/yahoo/Yahoo.cpp
@@ -86,6 +86,42 @@ Yahoo::Init( CayaProtocolMessengerInterface* msgr )
 	return B_OK;
 }
 
+void
+Yahoo::_NotifyProgress(const char* title, const char* message, float progress)
+{
+	BMessage msg(IM_MESSAGE);
+	msg.AddInt32("im_what", IM_PROGRESS);
+	msg.AddString("title", title);
+	msg.AddString("message", message);
+	msg.AddFloat("progress", progress);
+	_SendMessage(&msg);
+}
+
+
+void
+Yahoo::_Notify(notification_type type, const char* title, const char* message)
+{
+	BMessage msg(IM_MESSAGE);
+	msg.AddInt32("im_what", IM_NOTIFICATION);
+	msg.AddInt32("type", (int32)type);
+	msg.AddString("title", title);
+	msg.AddString("message", message);
+	_SendMessage(&msg);
+}
+
+
+void
+Yahoo::_SendMessage(BMessage* msg)
+{
+	// Skip invalid messages
+	if (!msg)
+		return;
+
+	msg->AddString("protocol", kProtocolSignature);
+	fServerMsgr->SendMessage(msg);
+}
+
+
 
 status_t
 Yahoo::Shutdown()
@@ -347,6 +383,11 @@ Yahoo::LoggedIn()
 	msg.AddInt32("im_what", IM_OWN_STATUS_SET);
 	msg.AddString("protocol", kProtocolSignature);
 	msg.AddInt32("status", CAYA_ONLINE);
+	BString content(fYahooID);
+	content << " has logged in!";
+	_Notify(B_INFORMATION_NOTIFICATION, "Connected",
+		content.String());
+
 
 	fServerMsgr->SendMessage( &msg );
 }
@@ -386,6 +427,11 @@ Yahoo::LoggedOut()
 		fYahoo = NULL;
 		delete oldYahoo;
 	}
+	BString content(fYahooID);
+	content << " has logged out!";
+	_Notify(B_INFORMATION_NOTIFICATION, "Disconnected",
+			content.String());
+
 }
 
 
diff --git a/protocols/yahoo/Yahoo.h b/protocols/yahoo/Yahoo.h
index c0cec42..c5bdc64 100644
--- a/protocols/yahoo/Yahoo.h
+++ b/protocols/yahoo/Yahoo.h
@@ -3,6 +3,7 @@
 
 #include <String.h>
 #include <Messenger.h>
+#include <Notification.h>
 
 #include <CayaProtocol.h>
 #include <CayaConstants.h>
@@ -67,6 +68,12 @@ class Yahoo : public CayaProtocol, public YahooManager
 		BString		fPassword;
 
 		YahooConnection *	fYahoo;
+		void		_NotifyProgress(const char* title,
+						const char* message, float progress);
+		void		_Notify(notification_type type, 
+						const char* title, const char* message);
+		void		_SendMessage(BMessage* msg);
+
 };
 
 #endif