diff --git a/libretroshare/src/retroshare/rsnotify.h b/libretroshare/src/retroshare/rsnotify.h
index e8c9de614..5d16f5c85 100644
--- a/libretroshare/src/retroshare/rsnotify.h
+++ b/libretroshare/src/retroshare/rsnotify.h
@@ -128,7 +128,6 @@ const uint32_t RS_MESSAGE_CONNECT_ATTEMPT    = 0x0001;
 const int NOTIFY_LIST_NEIGHBOURS             = 1;
 const int NOTIFY_LIST_FRIENDS                = 2;
 const int NOTIFY_LIST_SEARCHLIST             = 4;
-const int NOTIFY_LIST_MESSAGELIST            = 5;
 const int NOTIFY_LIST_CHANNELLIST            = 6;
 const int NOTIFY_LIST_TRANSFERLIST           = 7;
 const int NOTIFY_LIST_CONFIG                 = 8;
diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc
index a031cde91..4dfe57f60 100644
--- a/libretroshare/src/services/p3msgservice.cc
+++ b/libretroshare/src/services/p3msgservice.cc
@@ -220,8 +220,6 @@ void p3MsgService::processIncomingMsg(RsMsgItem *mi)
         for(std::list<RsTlvFileItem>::const_iterator it(mi->attachment.items.begin());it!=mi->attachment.items.end();++it)
             rsFiles->FileRequest((*it).name,(*it).hash,(*it).filesize,std::string(),RS_FILE_REQ_ANONYMOUS_ROUTING,srcIds) ;
     }
-
-	RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD);
 }
 
 bool p3MsgService::checkAndRebuildPartialMessage(RsMsgItem *ci)
@@ -283,16 +281,11 @@ int p3MsgService::incomingMsgs()
 
 void p3MsgService::handleIncomingItem(RsMsgItem *mi)
 {
-	bool changed = false ;
-
 	// only returns true when a msg is complete.
 	if(checkAndRebuildPartialMessage(mi))
 	{
 		processIncomingMsg(mi);
-		changed = true ;
 	}
-	if(changed)
-		RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
 }
 
 void    p3MsgService::statusChange(const std::list<pqiServicePeer> &plist)
@@ -350,7 +343,6 @@ void p3MsgService::checkSizeAndSendMessage(RsMsgItem *msg)
 
 int p3MsgService::checkOutgoingMessages()
 {
-	bool changed = false;
 	std::list<RsMsgItem*> output_queue;
 
 	auto pEvent = std::make_shared<RsMailStatusEvent>();
@@ -400,7 +392,6 @@ int p3MsgService::checkOutgoingMessages()
 				{
 					(mit->second)->msgFlags &= ~RS_MSG_FLAGS_PENDING;
 					toErase.push_back(mit->first);
-					changed = true;
 				}
 				else
 				{
@@ -442,9 +433,6 @@ int p3MsgService::checkOutgoingMessages()
 		else
 			checkSizeAndSendMessage(*it);
 
-	if(changed)
-		RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
-
 	if(rsEvents && !pEvent->mChangedMsgIds.empty())
 		rsEvents->postEvent(pEvent);
 
@@ -954,8 +942,6 @@ bool    p3MsgService::removeMsgId(const std::string &mid)
 
 		setMessageTag(mid, 0, false);
 		setMsgParentId(msgId, 0);
-
-		RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
 	}
 
 	if(rsEvents && !pEvent->mChangedMsgIds.empty())
@@ -968,7 +954,6 @@ bool    p3MsgService::markMsgIdRead(const std::string &mid, bool unreadByUser)
 {
 	std::map<uint32_t, RsMsgItem *>::iterator mit;
 	uint32_t msgId = atoi(mid.c_str());
-	bool changed = false;
 
 	{
 		RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
@@ -992,18 +977,18 @@ bool    p3MsgService::markMsgIdRead(const std::string &mid, bool unreadByUser)
 
 			if (mi->msgFlags != msgFlags)
 			{
-				changed = true;
 				IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
+
+				auto pEvent = std::make_shared<RsMailStatusEvent>();
+				pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_CHANGED;
+				pEvent->mChangedMsgIds.insert(mid);
+				rsEvents->postEvent(pEvent);
 			}
 		} else {
 			return false;
 		}
 	} /* UNLOCKED */
 
-	if (changed) {
-		RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
-	}
-
 	return true;
 }
 
@@ -1012,8 +997,6 @@ bool    p3MsgService::setMsgFlag(const std::string &mid, uint32_t flag, uint32_t
   	std::map<uint32_t, RsMsgItem *>::iterator mit;
 	uint32_t msgId = atoi(mid.c_str());
 
-	bool changed = false;
-
 	{
 		RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
 
@@ -1033,15 +1016,15 @@ bool    p3MsgService::setMsgFlag(const std::string &mid, uint32_t flag, uint32_t
 		mit->second->msgFlags |= flag;
 
 		if (mit->second->msgFlags != oldFlag) {
-			changed = true;
 			IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
+
+			auto pEvent = std::make_shared<RsMailStatusEvent>();
+			pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_CHANGED;
+			pEvent->mChangedMsgIds.insert(mid);
+			rsEvents->postEvent(pEvent);
 		}
 	} /* UNLOCKED */
 
-	if (changed) {
-		RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
-	}
-
 	return true;
 }
 
@@ -1137,7 +1120,10 @@ uint32_t p3MsgService::sendMessage(RsMsgItem* item)
 
     IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
 
-    RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST, NOTIFY_TYPE_ADD);	// deprecated
+	auto pEvent = std::make_shared<RsMailStatusEvent>();
+	pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_SENT;
+	pEvent->mChangedMsgIds.insert(std::to_string(item->msgId));
+	rsEvents->postEvent(pEvent);
 
     return item->msgId;
 }
@@ -1175,8 +1161,11 @@ uint32_t p3MsgService::sendDistantMessage(RsMsgItem *item, const RsGxsId& from)
 
 	IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
 
-	RsServer::notify()->notifyListChange( NOTIFY_LIST_MESSAGELIST,
-	                                      NOTIFY_TYPE_ADD );
+	auto pEvent = std::make_shared<RsMailStatusEvent>();
+	pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_SENT;
+	pEvent->mChangedMsgIds.insert(std::to_string(item->msgId));
+	rsEvents->postEvent(pEvent);
+
 	return item->msgId;
 }
 
@@ -1210,8 +1199,6 @@ bool 	p3MsgService::MessageSend(MessageInfo &info)
 		// Update info for caller
 		info.msgId = std::to_string(msg->msgId);
 		info .msgflags = msg->msgFlags;
-
-        RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_ADD);// deprecated. Should be removed. Oct. 28, 2020
 	}
 
     auto pEvent = std::make_shared<RsMailStatusEvent>();
@@ -1418,8 +1405,6 @@ bool p3MsgService::MessageToDraft(MessageInfo &info, const std::string &msgParen
 
         IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
 
-    //	  RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
-
     auto pEvent = std::make_shared<RsMailStatusEvent>();
     pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_SENT;
     pEvent->mChangedMsgIds.insert(std::to_string(msg->msgId));
@@ -1688,8 +1673,9 @@ bool p3MsgService::MessageToTrash(const std::string &mid, bool bTrash)
     std::map<uint32_t, RsMsgItem *>::iterator mit;
     uint32_t msgId = atoi(mid.c_str());
 
-    bool bChanged = false;
     bool bFound = false;
+    auto pEvent = std::make_shared<RsMailStatusEvent>();
+    pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_CHANGED;
 
     {
         RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
@@ -1712,23 +1698,25 @@ bool p3MsgService::MessageToTrash(const std::string &mid, bool bTrash)
             if (bTrash) {
                 if ((mi->msgFlags & RS_MSG_FLAGS_TRASH) == 0) {
                     mi->msgFlags |= RS_MSG_FLAGS_TRASH;
-                    bChanged = true;
+                    pEvent->mChangedMsgIds.insert(std::to_string(mi->msgId));
                 }
             } else {
                 if (mi->msgFlags & RS_MSG_FLAGS_TRASH) {
                     mi->msgFlags &= ~RS_MSG_FLAGS_TRASH;
-                    bChanged = true;
+                    pEvent->mChangedMsgIds.insert(std::to_string(mi->msgId));
                 }
             }
         }
     }
 
-    if (bChanged) {
+    if (!pEvent->mChangedMsgIds.empty()) {
         IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
 
         checkOutgoingMessages();
 
-		  RsServer::notify()->notifyListChange(NOTIFY_LIST_MESSAGELIST,NOTIFY_TYPE_MOD);
+        if(rsEvents) {
+            rsEvents->postEvent(pEvent);
+        }
     }
 
     return bFound;
@@ -2112,8 +2100,6 @@ void p3MsgService::notifyDataStatus( const GRouterMsgPropagationId& id,
 		msgOutgoing.erase(it2);
 #endif
 
-		RsServer::notify()->notifyListChange( NOTIFY_LIST_MESSAGELIST,
-		                                      NOTIFY_TYPE_ADD );
 		IndicateConfigChanged();
 
 		if(rsEvents)
@@ -2268,8 +2254,6 @@ bool p3MsgService::notifyGxsTransSendStatus( RsGxsTransId mailId,
 			}
 		}
 
-		RsServer::notify()->notifyListChange( NOTIFY_LIST_MESSAGELIST,
-		                                      NOTIFY_TYPE_ADD );
 		IndicateConfigChanged();
 	}
 	else if( status >= GxsTransSendStatus::FAILED_RECEIPT_SIGNATURE )
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp
index 66ae5f49b..6a47c9c22 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@@ -31,6 +31,7 @@
 #include "gui/common/AvatarDefs.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/notifyqt.h"
+#include "util/qtthreadsutils.h"
 
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>
@@ -59,12 +60,13 @@ MsgItem::MsgItem(FeedHolder *parent, uint32_t feedId, const std::string &msgId,
   //connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
 
   /* specific ones */
-  connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(checkMessageReadStatus()));
   connect( playButton, SIGNAL( clicked( void ) ), this, SLOT( playMedia ( void ) ) );
   connect( deleteButton, SIGNAL( clicked( void ) ), this, SLOT( deleteMsg ( void ) ) );
   connect( replyButton, SIGNAL( clicked( void ) ), this, SLOT( replyMsg ( void ) ) );
   connect( sendinviteButton, SIGNAL( clicked( void ) ), this, SLOT( sendInvite ( void ) ) );
 
+  mEventHandlerId = 0;
+  rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }); }, mEventHandlerId, RsEventType::MAIL_STATUS );
 
   expandFrame->hide();
   info_Frame_Invite->hide();
@@ -73,6 +75,57 @@ MsgItem::MsgItem(FeedHolder *parent, uint32_t feedId, const std::string &msgId,
   updateItem();
 }
 
+MsgItem::~MsgItem()
+{
+	rsEvents->unregisterEventsHandler(mEventHandlerId);
+}
+
+void MsgItem::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+	if(event->mType != RsEventType::MAIL_STATUS) {
+		return;
+	}
+
+	const RsMailStatusEvent *fe = dynamic_cast<const RsMailStatusEvent*>(event.get());
+	if (!fe) {
+		return;
+	}
+
+	switch (fe->mMailStatusEventCode) {
+	case RsMailStatusEventCode::MESSAGE_CHANGED:
+		if (fe->mChangedMsgIds.find(mMsgId) != fe->mChangedMsgIds.end()) {
+			MessageInfo msgInfo;
+
+			if (!rsMail->getMessage(mMsgId, msgInfo)) {
+				removeItem();
+				break;
+			}
+
+			if (!mCloseOnRead) {
+				break;
+			}
+
+			if (msgInfo.msgflags & RS_MSG_NEW) {
+				/* Message status is still "new" */
+				break;
+			}
+
+			removeItem();
+		}
+		break;
+	case RsMailStatusEventCode::MESSAGE_REMOVED:
+		if (fe->mChangedMsgIds.find(mMsgId) != fe->mChangedMsgIds.end()) {
+			removeItem();
+		}
+		break;
+	case RsMailStatusEventCode::MESSAGE_SENT:
+	case RsMailStatusEventCode::NEW_MESSAGE:
+	case RsMailStatusEventCode::MESSAGE_RECEIVED_ACK:
+	case RsMailStatusEventCode::SIGNATURE_FAILED:
+		break;
+	}
+}
+
 void MsgItem::updateItemStatic()
 {
 	/* fill in */
@@ -246,7 +299,6 @@ void MsgItem::doExpand(bool open)
 
 		mCloseOnRead = false;
 		rsMail->MessageRead(mMsgId, false);
-		mCloseOnRead = true;
 	}
 	else
 	{
@@ -332,26 +384,6 @@ void MsgItem::toggle()
 	expand(expandFrame->isHidden());
 }
 
-void MsgItem::checkMessageReadStatus()
-{
-	if (!mCloseOnRead) {
-		return;
-	}
-
-	MessageInfo msgInfo;
-	if (!rsMail->getMessage(mMsgId, msgInfo)) {
-		std::cerr << "MsgItem::checkMessageReadStatus() Couldn't find Msg" << std::endl;
-		return;
-	}
-
-	if (msgInfo.msgflags & RS_MSG_NEW) {
-		/* Message status is still "new" */
-		return;
-	}
-
-	removeItem();
-}
-
 void MsgItem::sendInvite()
 {
 	MessageInfo mi;
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.h b/retroshare-gui/src/gui/feeds/MsgItem.h
index 32824ca23..2cb8645ba 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.h
+++ b/retroshare-gui/src/gui/feeds/MsgItem.h
@@ -24,6 +24,7 @@
 #include "ui_MsgItem.h"
 #include "FeedItem.h"
 #include <stdint.h>
+#include <retroshare/rsevents.h>
 
 class FeedHolder;
 class SubFileItem;
@@ -35,6 +36,7 @@ class MsgItem : public FeedItem, private Ui::MsgItem
 public:
 	/** Default Constructor */
 	MsgItem(FeedHolder *parent, uint32_t feedId, const std::string &msgId, bool isHome);
+	virtual ~MsgItem();
 
 	void updateItemStatic();
 
@@ -46,6 +48,7 @@ protected:
 
 private:
 	void fillExpandFrame();
+	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
 private slots:
 	/* default stuff */
@@ -56,7 +59,6 @@ private slots:
 	void deleteMsg();
 	void replyMsg();
 	void sendInvite();
-	void checkMessageReadStatus();
 
 	void updateItem();
 
@@ -66,6 +68,7 @@ private:
 
 	bool mIsHome;
 	bool mCloseOnRead;
+	RsEventsHandlerId_t mEventHandlerId;
 
 	std::list<SubFileItem *> mFileItems;
 };
diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
index 071f794ff..e97ff96c0 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
@@ -22,13 +22,20 @@
 #include "MessageUserNotify.h"
 #include "gui/notifyqt.h"
 #include "gui/MainWindow.h"
+#include "util/qtthreadsutils.h"
 
 #include "gui/msgs/MessageInterface.h"
 
 MessageUserNotify::MessageUserNotify(QObject *parent) :
 	UserNotify(parent)
 {
-	connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(updateIcon()));
+	mEventHandlerId = 0;
+	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }); }, mEventHandlerId, RsEventType::MAIL_STATUS );
+}
+
+MessageUserNotify::~MessageUserNotify()
+{
+	rsEvents->unregisterEventsHandler(mEventHandlerId);
 }
 
 bool MessageUserNotify::hasSetting(QString *name, QString *group)
@@ -72,3 +79,27 @@ void MessageUserNotify::iconClicked()
 {
 	MainWindow::showWindow(MainWindow::Messages);
 }
+
+void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+	if(event->mType != RsEventType::MAIL_STATUS) {
+		return;
+	}
+
+	const RsMailStatusEvent *fe = dynamic_cast<const RsMailStatusEvent*>(event.get());
+	if (!fe) {
+		return;
+	}
+
+	switch (fe->mMailStatusEventCode) {
+	case RsMailStatusEventCode::NEW_MESSAGE:
+	case RsMailStatusEventCode::MESSAGE_CHANGED:
+	case RsMailStatusEventCode::MESSAGE_REMOVED:
+		updateIcon();
+		break;
+	case RsMailStatusEventCode::MESSAGE_SENT:
+	case RsMailStatusEventCode::MESSAGE_RECEIVED_ACK:
+	case RsMailStatusEventCode::SIGNATURE_FAILED:
+		break;
+	}
+}
diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.h b/retroshare-gui/src/gui/msgs/MessageUserNotify.h
index 58b30e8fc..f9b7458ab 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.h
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.h
@@ -21,6 +21,7 @@
 #ifndef MESSAGEUSERNOTIFY_H
 #define MESSAGEUSERNOTIFY_H
 
+#include <retroshare/rsevents.h>
 #include "gui/common/UserNotify.h"
 
 class MessageUserNotify : public UserNotify
@@ -29,6 +30,7 @@ class MessageUserNotify : public UserNotify
 
 public:
 	MessageUserNotify(QObject *parent = 0);
+	virtual ~MessageUserNotify();
 
 	virtual bool hasSetting(QString *name, QString *group) override;
 
@@ -41,6 +43,11 @@ private:
 	virtual QString getNotifyMessage(bool plural) override;
 
 	virtual void iconClicked() override;
+
+	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
+
+private:
+	RsEventsHandlerId_t mEventHandlerId;
 };
 
 #endif // MESSAGEUSERNOTIFY_H
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index e614eeca0..39e157036 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -46,6 +46,7 @@
 #include "util/HandleRichText.h"
 #include "util/DateTime.h"
 #include "util/QtVersion.h"
+#include "util/qtthreadsutils.h"
 
 #include <retroshare/rspeers.h>
 #include <retroshare/rsfiles.h>
@@ -160,7 +161,6 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
 	connect(viewsource, SIGNAL(triggered()), this, SLOT(viewSource()));
 
 	connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged()));
-	connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), this, SLOT(messagesChanged()));
 
 	ui.imageBlockWidget->addButtonAction(tr("Load images always for this message"), this, SLOT(loadImagesAlways()), true);
 	ui.msgText->setImageBlockWidget(ui.imageBlockWidget);
@@ -211,6 +211,9 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
 	ui.dateText-> setText("");
 	
 	ui.info_Frame_Invite->hide();
+
+	mEventHandlerId = 0;
+	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }); }, mEventHandlerId, RsEventType::MAIL_STATUS );
 }
 
 MessageWidget::~MessageWidget()
@@ -218,6 +221,44 @@ MessageWidget::~MessageWidget()
 	if (isControlled == false) {
 		processSettings("MessageWidget", false);
 	}
+
+	rsEvents->unregisterEventsHandler(mEventHandlerId);
+}
+
+void MessageWidget::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+	if(event->mType != RsEventType::MAIL_STATUS) {
+		return;
+	}
+
+	const RsMailStatusEvent *fe = dynamic_cast<const RsMailStatusEvent*>(event.get());
+	if (!fe) {
+		return;
+	}
+
+	switch (fe->mMailStatusEventCode) {
+	case RsMailStatusEventCode::MESSAGE_REMOVED:
+		if (fe->mChangedMsgIds.find(currMsgId) != fe->mChangedMsgIds.end()) {
+			if (isControlled) {
+				/* processed by MessagesDialog */
+				return;
+			}
+
+			/* messages was removed */
+			if (isWindow) {
+				window()->close();
+			} else {
+				deleteLater();
+			}
+		}
+		break;
+	case RsMailStatusEventCode::MESSAGE_SENT:
+	case RsMailStatusEventCode::MESSAGE_CHANGED:
+	case RsMailStatusEventCode::NEW_MESSAGE:
+	case RsMailStatusEventCode::MESSAGE_RECEIVED_ACK:
+	case RsMailStatusEventCode::SIGNATURE_FAILED:
+		break;
+	}
 }
 
 void MessageWidget::connectAction(enumActionType actionType, QToolButton* button)
@@ -407,25 +448,6 @@ void MessageWidget::messagesTagsChanged()
     showTagLabels();
 }
 
-void MessageWidget::messagesChanged()
-{
-	if (isControlled) {
-		/* processed by MessagesDialog */
-		return;
-	}
-
-	/* test Message */
-	MessageInfo msgInfo;
-	if (rsMail->getMessage(currMsgId, msgInfo) == false) {
-		/* messages was removed */
-		if (isWindow) {
-			window()->close();
-		} else {
-			deleteLater();
-		}
-	}
-}
-
 void MessageWidget::clearTagLabels()
 {
 	/* clear all tags */
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.h b/retroshare-gui/src/gui/msgs/MessageWidget.h
index 5acf627f6..12438e55c 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.h
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.h
@@ -22,6 +22,7 @@
 #define _MESSAGEWIDGET_H
 
 #include <QWidget>
+#include <retroshare/rsevents.h>
 #include "ui_MessageWidget.h"
 
 class QToolButton;
@@ -75,7 +76,6 @@ private slots:
 
 	void msgfilelistWidgetCostumPopupMenu(QPoint);
 	void messagesTagsChanged();
-	void messagesChanged();
 
 	void togglefileview(bool noUpdate = false);
 	void getcurrentrecommended();
@@ -93,11 +93,14 @@ private:
 	void showTagLabels();
 	void setToolbarButtonStyle(Qt::ToolButtonStyle style);
 
+	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
+
 	bool isControlled;
 	bool isWindow;
 	std::string currMsgId;
 	unsigned int currMsgFlags;
 	bool expandFiles;
+	RsEventsHandlerId_t mEventHandlerId;
 
 	QList<QLabel*> tagLabels;
 
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 261402c99..ac829de8d 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -268,7 +268,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
 	 registerHelpButton(ui.helpButton,help_str,"MessagesDialog") ;
 
-    connect(NotifyQt::getInstance(), SIGNAL(messagesChanged()), mMessageModel, SLOT(updateMessages()));
     connect(NotifyQt::getInstance(), SIGNAL(messagesTagsChanged()), this, SLOT(messagesTagsChanged()));
 
     connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
@@ -310,10 +309,12 @@ void MessagesDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> even
     case RsMailStatusEventCode::MESSAGE_SENT:
     case RsMailStatusEventCode::MESSAGE_REMOVED:
     case RsMailStatusEventCode::NEW_MESSAGE:
+    case RsMailStatusEventCode::MESSAGE_CHANGED:
         mMessageModel->updateMessages();
         updateMessageSummaryList();
         break;
-    default:
+    case RsMailStatusEventCode::MESSAGE_RECEIVED_ACK:
+    case RsMailStatusEventCode::SIGNATURE_FAILED:
         break;
     }
 }
diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index d0fcea506..7211c10bc 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -563,12 +563,6 @@ void NotifyQt::notifyListChange(int list, int type)
 			break;
 		case NOTIFY_LIST_SEARCHLIST:
 			break;
-		case NOTIFY_LIST_MESSAGELIST:
-#ifdef NOTIFY_DEBUG
-			std::cerr << "received msg changed" << std::endl ;
-#endif
-			emit messagesChanged() ;
-			break;
 		case NOTIFY_LIST_MESSAGE_TAGS:
 #ifdef NOTIFY_DEBUG
 			std::cerr << "received msg tags changed" << std::endl ;
@@ -663,8 +657,6 @@ void NotifyQt::notifyListPreChange(int list, int /*type*/)
 			break;
 		case NOTIFY_LIST_SEARCHLIST:
 			break;
-		case NOTIFY_LIST_MESSAGELIST:
-			break;
 		case NOTIFY_LIST_CHANNELLIST:
 			break;
 		case NOTIFY_LIST_TRANSFERLIST:
@@ -697,7 +689,6 @@ void NotifyQt::UpdateGUI()
 														// the gui is running, then they get updated by callbacks.
 	if(!already_updated)
 	{
-		emit messagesChanged() ;
 		emit neighboursChanged();
 		emit configChanged();
 
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index 069ae8056..a72493a3a 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -109,7 +109,6 @@ class NotifyQt: public QObject, public NotifyClient
 		void lobbyListChanged() const ;
         void chatLobbyEvent(qulonglong,int,const RsGxsId&,const QString&) ;
 		void neighboursChanged() const ;
-		void messagesChanged() const ;
 		void messagesTagsChanged() const;
 		void configChanged() const ;
 		void logInfoChanged(const QString&) const ;