diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp
index 2f1ddf4d6..19ae2c3d0 100644
--- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp
@@ -2,68 +2,66 @@
 #include "RsGxsUpdateBroadcastBase.h"
 
 RsGxsUpdateBroadcastWidget::RsGxsUpdateBroadcastWidget(RsGxsIfaceHelper *ifaceImpl, QWidget *parent, Qt::WindowFlags flags)
-	: QWidget(parent, flags)
+    : QWidget(parent, flags)
 {
     mBase = new RsGxsUpdateBroadcastBase(ifaceImpl, this);
-    // The Queued connection is here to circumvent an apparent mutex problem in Qt
-    connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool)),Qt::QueuedConnection);
+    connect(mBase, SIGNAL(fillDisplay(bool)), this, SLOT(fillDisplay(bool)));
 
-	mInterfaceHelper = ifaceImpl;
+    mInterfaceHelper = ifaceImpl;
 }
 
 RsGxsUpdateBroadcastWidget::~RsGxsUpdateBroadcastWidget()
 {
 }
 
-
 void RsGxsUpdateBroadcastWidget::fillComplete()
 {
-	mBase->fillComplete();
+    mBase->fillComplete();
 }
 
 void RsGxsUpdateBroadcastWidget::setUpdateWhenInvisible(bool update)
 {
-	mBase->setUpdateWhenInvisible(update);
+    mBase->setUpdateWhenInvisible(update);
 }
 
-const std::set<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIds()
+const std::list<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIds()
 {
-	return mBase->getGrpIds();
+    return mBase->getGrpIds();
 }
 
-const std::set<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIdsMeta()
+const std::list<RsGxsGroupId> &RsGxsUpdateBroadcastWidget::getGrpIdsMeta()
 {
-	return mBase->getGrpIdsMeta();
+    return mBase->getGrpIdsMeta();
 }
 
-void RsGxsUpdateBroadcastWidget::getAllGrpIds(std::set<RsGxsGroupId> &grpIds)
+void RsGxsUpdateBroadcastWidget::getAllGrpIds(std::list<RsGxsGroupId> &grpIds)
 {
-	mBase->getAllGrpIds(grpIds);
+    mBase->getAllGrpIds(grpIds);
 }
 
-const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &RsGxsUpdateBroadcastWidget::getMsgIds()
+const std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > &RsGxsUpdateBroadcastWidget::getMsgIds()
 {
-	return mBase->getMsgIds();
+    return mBase->getMsgIds();
 }
 
-const std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &RsGxsUpdateBroadcastWidget::getMsgIdsMeta()
+const std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > &RsGxsUpdateBroadcastWidget::getMsgIdsMeta()
 {
-	return mBase->getMsgIdsMeta();
+    return mBase->getMsgIdsMeta();
 }
 
-void RsGxsUpdateBroadcastWidget::getAllMsgIds(std::map<RsGxsGroupId, std::set<RsGxsMessageId> > &msgIds)
+void RsGxsUpdateBroadcastWidget::getAllMsgIds(std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > &msgIds)
 {
-	mBase->getAllMsgIds(msgIds);
+    mBase->getAllMsgIds(msgIds);
 }
 
 void RsGxsUpdateBroadcastWidget::fillDisplay(bool complete)
 {
-	updateDisplay(complete);
-	update(); // Qt flush
+    updateDisplay(complete);
+    update(); // Qt flush
 }
 
 void RsGxsUpdateBroadcastWidget::showEvent(QShowEvent *event)
 {
-	mBase->showEvent(event);
-	QWidget::showEvent(event);
+    mBase->showEvent(event);
+    QWidget::showEvent(event);
 }