diff --git a/client/src/session/local/events.cc b/client/src/session/local/events.cc
index a60f670..311106c 100644
--- a/client/src/session/local/events.cc
+++ b/client/src/session/local/events.cc
@@ -37,6 +37,7 @@
  */
 
  #include "private.h"
+ #include <lib3270/popup.h>
 
  extern "C" {
 	 #include <lib3270/actions.h>
@@ -79,7 +80,7 @@
  namespace TN3270 {
 
 	/// @brief Popup Handler.
-	void Local::Session::popupHandler(H3270 *h3270, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg) {
+	int Local::Session::popupHandler(H3270 *h3270, const LIB3270_POPUP *popup, unsigned char wait) {
 
 		Local::Session * session = (Local::Session *) lib3270_get_user_data(h3270);
 
@@ -91,35 +92,27 @@
 		private:
 			LIB3270_NOTIFY type;
 			string title;
-			string msg;
-			string description;
+			string summary;
+			string body;
 
 		public:
-			PopupEvent(LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg) : Event(Event::Popup) {
+			PopupEvent(LIB3270_NOTIFY type, const char *title, const char *summary, const char *body) : Event(Event::Popup) {
 
 				this->type = type;
-				this->title = title;
-				this->msg = msg;
 
-				char * buffer = NULL;
-#ifdef _WIN32
-				if(win32_vasprintf(&buffer,fmt,arg) != -1) {
-					this->description = buffer;
-					free(buffer);
-				}
-#else
-				if(vasprintf(&buffer,fmt,arg) != -1) {
-					this->description = buffer;
-					free(buffer);
-				}
-#endif
+				if(title)
+					this->title = title;
 
-#ifdef DEBUG
-				std::cerr	<< "Popup:"				<< std::endl
-							<<	"\t" << title		<< std::endl
-							<<	"\t" << msg			<< std::endl
-							<<	"\t" <<	description	<< std::endl;
-#endif // DEBUG
+				if(summary)
+					this->summary = summary;
+
+				if(body)
+					this->body = body;
+
+				std::clog	<< "Popup:"					<< std::endl
+							<<	"\t" << this->title		<< std::endl
+							<<	"\t" << this->summary	<< std::endl
+							<<	"\t" <<	this->body		<< std::endl;
 
 			}
 
@@ -128,13 +121,15 @@
 
 			/// @brief Get event description.
 			std::string toString() const override {
-				return msg;
+				return summary;
 			}
 
 
         };
 
-        session->fire(PopupEvent(type,title,msg,fmt,arg));
+        session->fire(PopupEvent(popup->type,popup->title,popup->summary,popup->body));
+
+        return ECANCELED;
 
 	}
 
diff --git a/client/src/session/local/init.cc b/client/src/session/local/init.cc
index 88292cc..4507923 100644
--- a/client/src/session/local/init.cc
+++ b/client/src/session/local/init.cc
@@ -69,7 +69,7 @@
 
 		this->setCharSet(charset);
 
-		lib3270_set_popup_handler(this->hSession, popupHandler);
+		lib3270_set_popup_handler(this->hSession, &popupHandler);
 
 		// Setup callbacks
 		struct lib3270_session_callbacks *cbk;
diff --git a/client/src/session/local/private.h b/client/src/session/local/private.h
index 744cdd3..402b717 100644
--- a/client/src/session/local/private.h
+++ b/client/src/session/local/private.h
@@ -48,6 +48,7 @@
 	#include <lib3270/ipc/action.h>
 	#include <string>
 	#include <lib3270.h>
+	#include <lib3270/popup.h>
 	#include <stdexcept>
 
 	using std::string;
@@ -83,7 +84,7 @@
 				std::mutex sync;
 
 				/// @brief Popup Handler.
-				static void popupHandler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg);
+				static int popupHandler(H3270 *session, const LIB3270_POPUP *popup, unsigned char wait);
 
 				/// @brief Connect Handler.
 				static void connectHandler(H3270 *session, unsigned char connected);
--
libgit2 0.21.2