diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 7dcc767b8..7c55931fa 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -773,7 +773,7 @@ QIcon PostedListWidgetWithModel::groupIcon()
 	return QIcon(postedImage);
 }
 
-void PostedListWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t &/*token*/)
+void PostedListWidgetWithModel::setAllMessagesReadDo(bool read)
 {
     if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
         return;
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
index a38e0d036..a447424e8 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
@@ -130,7 +130,7 @@ protected:
 #endif
 
 	/* GxsMessageFrameWidget */
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token) override;
+    virtual void setAllMessagesReadDo(bool read) override;
 
 private slots:
 #ifdef TO_REMOVE
diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
index 8d9a89a47..1f55f514f 100644
--- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
@@ -28,7 +28,6 @@ GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidge
 {
 	mNextTokenType = 0;
 
-	mTokenQueue = new TokenQueue(ifaceImpl->getTokenService(), this);
 	mStateHelper = new UIStateHelper(this);
 
 	/* Set read status */
@@ -46,8 +45,6 @@ GxsMessageFrameWidget::~GxsMessageFrameWidget()
 
 		emit waitingChanged(this);
 	}
-
-	delete(mTokenQueue);
 }
 
 const RsGxsGroupId &GxsMessageFrameWidget::groupId()
@@ -95,34 +92,6 @@ void GxsMessageFrameWidget::setGroupId(const RsGxsGroupId &groupId)
 
 void GxsMessageFrameWidget::setAllMessagesRead(bool read)
 {
-	uint32_t token = 0;
-	setAllMessagesReadDo(read, token);
-
-	if (token) {
-		/* Wait for acknowlegde of the token */
-		mAcknowledgeReadStatusToken = token;
-		mTokenQueue->queueRequest(mAcknowledgeReadStatusToken, 0, 0, mTokenTypeAcknowledgeReadStatus);
-		mStateHelper->setLoading(mTokenTypeAcknowledgeReadStatus, true);
-
-		emit waitingChanged(this);
-	}
+    setAllMessagesReadDo(read);
 }
 
-void GxsMessageFrameWidget::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-{
-	if (queue == mTokenQueue)
-	{
-		if (req.mUserType == mTokenTypeAcknowledgeReadStatus) {
-			if (mAcknowledgeReadStatusToken == req.mToken) {
-				/* Set read status is finished */
-				mStateHelper->setLoading(mTokenTypeAcknowledgeReadStatus, false);
-
-				emit waitingChanged(this);
-			}
-			return;
-		}
-	}
-
-	std::cerr << "GxsMessageFrameWidget::loadRequest() ERROR: INVALID TYPE";
-	std::cerr << std::endl;
-}
diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
index 36c2f4f67..758088595 100644
--- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
@@ -22,12 +22,11 @@
 #define GXSMESSAGEFRAMEWIDGET_H
 
 #include "gui/gxs/RsGxsUpdateBroadcastWidget.h"
-#include "util/TokenQueue.h"
 
 struct RsGxsIfaceHelper;
 class UIStateHelper;
 
-class GxsMessageFrameWidget : public QWidget, public TokenResponse
+class GxsMessageFrameWidget : public QWidget
 {
 	Q_OBJECT
 
@@ -49,7 +48,6 @@ public:
 
 	/* GXS functions */
 	uint32_t nextTokenType() { return ++mNextTokenType; }
-	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
 
 signals:
 	void groupChanged(QWidget *widget);
@@ -58,10 +56,9 @@ signals:
     void groupDataLoaded();
 
 protected:
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token) = 0;
+    virtual void setAllMessagesReadDo(bool read) = 0;
 
 protected:
-	TokenQueue *mTokenQueue;
 	UIStateHelper *mStateHelper;
 
 	/* Set read status */
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index d3c4070b0..129a6a1bf 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -1432,7 +1432,7 @@ public:
 	uint32_t mLastToken;
 };
 
-void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t& /*token*/)
+void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read)
 {
 	if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
 		return;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index eaac53c0f..d37b83f22 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -137,7 +137,7 @@ protected:
 #endif
 
 	/* GxsMessageFrameWidget */
-    virtual void setAllMessagesReadDo(bool read, uint32_t &token) override;
+    virtual void setAllMessagesReadDo(bool read) override;
 
 private slots:
 	void showPostDetails();
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index e965dff4f..5ea514a54 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -1503,7 +1503,7 @@ void GxsForumThreadWidget::markMsgAsUnreadChildren()
     markMsgAsReadUnread(false, true, false);
 }
 
-void GxsForumThreadWidget::setAllMessagesReadDo(bool read, uint32_t &/*token*/)
+void GxsForumThreadWidget::setAllMessagesReadDo(bool read)
 {
     markMsgAsReadUnread(read, true, true);
 }
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
index 6ca892e54..8e64c2b75 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
@@ -102,7 +102,7 @@ protected:
 	virtual void updateDisplay(bool complete);
 
 	/* GxsMessageFrameWidget */
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token);
+    virtual void setAllMessagesReadDo(bool read);
     
 	void setMessageLoadingError(const QString& error);
 private slots: