diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 3e84c23cc..c6eea5203 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -26,7 +26,7 @@
 #include "GxsForumThreadWidget.h"
 #include "ui_GxsForumThreadWidget.h"
 #include "GxsForumsFillThread.h"
-#include "gui/GxsForumsDialog.h"
+#include "GxsForumsDialog.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/common/RSItemDelegate.h"
diff --git a/retroshare-gui/src/gui/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
similarity index 95%
rename from retroshare-gui/src/gui/GxsForumsDialog.cpp
rename to retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index 4954eb609..02ff14fd6 100644
--- a/retroshare-gui/src/gui/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -23,14 +23,14 @@
 #include <QMessageBox>
 
 #include "GxsForumsDialog.h"
-#include "gxsforums/GxsForumGroupDialog.h"
-#include "gxsforums/GxsForumThreadWidget.h"
+#include "GxsForumGroupDialog.h"
+#include "GxsForumThreadWidget.h"
 
-#include "settings/rsharesettings.h"
-#include "RetroShareLink.h"
-#include "channels/ShareKey.h"
-#include "common/RSTreeWidget.h"
-#include "notifyqt.h"
+#include "gui/settings/rsharesettings.h"
+#include "gui/RetroShareLink.h"
+#include "gui/channels/ShareKey.h"
+#include "gui/common/RSTreeWidget.h"
+#include "gui/notifyqt.h"
 //#include "gui/common/UIStateHelper.h"
 
 // These should be in retroshare/ folder.
@@ -51,8 +51,9 @@
 #define IMAGE_FORUMAUTHD     ":/images/konv_message2.png"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 
-#define TOKEN_TYPE_LISTING       1
-//#define TOKEN_TYPE_CURRENTFORUM  2
+#define TOKEN_TYPE_LISTING          1
+#define TOKEN_TYPE_SUBSCRIBE_CHANGE 2
+//#define TOKEN_TYPE_CURRENTFORUM   3
 
 /*
  * Transformation Notes:
@@ -88,8 +89,6 @@ GxsForumsDialog::GxsForumsDialog(QWidget *parent)
 	connect(NotifyQt::getInstance(), SIGNAL(forumMsgReadSatusChanged(QString,QString,int)), this, SLOT(forumMsgReadSatusChanged(QString,QString,int)));
 	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
-	// HACK - TEMPORARY HIJACKING THIS BUTTON FOR REFRESH.
-	connect(ui.refreshButton, SIGNAL(clicked()), this, SLOT(forceUpdateDisplay()));
 	connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo()));
 
 	/* Initialize group tree */
@@ -129,7 +128,6 @@ void GxsForumsDialog::todo()
 {
 	QMessageBox::information(this, "Todo",
 							 "<b>Open points:</b><ul>"
-							 "<li>Automatic refresh after subscribe/unsubscibe"
 							 "<li>Restore forum keys"
 							 "<li>Display AUTHD"
 							 "<li>Copy/navigate forum link"
@@ -265,16 +263,6 @@ void GxsForumsDialog::updateDisplay(bool /*initialFill*/)
 	insertForums();
 }
 
-// HACK until update works.
-void GxsForumsDialog::forceUpdateDisplay()
-{
-	std::cerr << "GxsForumsDialog::forceUpdateDisplay()";
-	std::cerr << std::endl;
-
-	/* update Forums List */
-	insertForums();
-}
-
 void GxsForumsDialog::forumInfoToGroupItemInfo(const RsGroupMetaData &forumInfo, GroupItemInfo &groupItemInfo)
 {
 	groupItemInfo.id = QString::fromStdString(forumInfo.mGroupId);
@@ -549,6 +537,7 @@ void GxsForumsDialog::forumSubscribe(bool subscribe)
 
 	uint32_t token;
 	rsGxsForums->subscribeToGroup(token, mForumId, subscribe);
+	mForumQueue->queueRequest(token, 0, RS_TOKREQ_ANSTYPE_ACK, TOKEN_TYPE_SUBSCRIBE_CHANGE);
 }
 
 void GxsForumsDialog::showForumDetails()
@@ -709,20 +698,12 @@ void GxsForumsDialog::requestGroupSummary()
 {
 //	mStateHelper->setLoading(TOKEN_TYPE_LISTING, true);
 
+#ifdef DEBUG_FORUMS
 	std::cerr << "GxsForumsDialog::requestGroupSummary()";
 	std::cerr << std::endl;
+#endif
 
-	std::list<uint32_t> tokens;
-	mForumQueue->activeRequestTokens(TOKEN_TYPE_LISTING, tokens);
-	if (!tokens.empty()) {
-		std::list<uint32_t>::iterator tokenIt;
-		for (tokenIt = tokens.begin(); tokenIt != tokens.end(); ++tokenIt) {
-			std::cerr << "GxsForumsDialog::requestGroupSummary() Canceling Request: " << *tokenIt;
-			std::cerr << std::endl;
-
-			mForumQueue->cancelRequest(*tokenIt);
-		}
-	}
+	mForumQueue->cancelActiveRequestTokens(TOKEN_TYPE_LISTING);
 
 	RsTokReqOptions opts;
 	opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
@@ -733,8 +714,10 @@ void GxsForumsDialog::requestGroupSummary()
 
 void GxsForumsDialog::loadGroupSummary(const uint32_t &token)
 {
+#ifdef DEBUG_FORUMS
 	std::cerr << "GxsForumsDialog::loadGroupSummary()";
 	std::cerr << std::endl;
+#endif
 
 	std::list<RsGroupMetaData> groupInfo;
 	rsGxsForums->getGroupSummary(token, groupInfo);
@@ -759,6 +742,22 @@ void GxsForumsDialog::loadGroupSummary(const uint32_t &token)
 /*********************** **** **** **** ***********************/
 /*********************** **** **** **** ***********************/
 
+void GxsForumsDialog::acknowledgeSubscribeChange(const uint32_t &token)
+{
+#ifdef DEBUG_FORUMS
+	std::cerr << "GxsForumsDialog::acknowledgeSubscribeChange()";
+	std::cerr << std::endl;
+#endif
+
+	RsGxsGroupId groupId;
+	rsGxsForums->acknowledgeGrp(token, groupId);
+
+	insertForums();
+}
+
+/*********************** **** **** **** ***********************/
+/*********************** **** **** **** ***********************/
+
 //void GxsForumsDialog::requestGroupSummary_CurrentForum(const std::string &forumId)
 //{
 //	RsTokReqOptions opts;
@@ -802,8 +801,10 @@ void GxsForumsDialog::loadGroupSummary(const uint32_t &token)
 
 void GxsForumsDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
 {
+#ifdef DEBUG_FORUMS
 	std::cerr << "GxsForumsDialog::loadRequest() UserType: " << req.mUserType;
 	std::cerr << std::endl;
+#endif
 
 	if (queue == mForumQueue)
 	{
@@ -814,6 +815,10 @@ void GxsForumsDialog::loadRequest(const TokenQueue *queue, const TokenRequest &r
 			loadGroupSummary(req.mToken);
 			break;
 
+		case TOKEN_TYPE_SUBSCRIBE_CHANGE:
+			acknowledgeSubscribeChange(req.mToken);
+			break;
+
 //		case TOKEN_TYPE_CURRENTFORUM:
 //			loadGroupSummary_CurrentForum(req.mToken);
 //			break;
diff --git a/retroshare-gui/src/gui/GxsForumsDialog.h b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h
similarity index 97%
rename from retroshare-gui/src/gui/GxsForumsDialog.h
rename to retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h
index 9def976cd..0520cbc53 100644
--- a/retroshare-gui/src/gui/GxsForumsDialog.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h
@@ -59,7 +59,6 @@ protected:
 
 private slots:
 	void settingsChanged();
-	void forceUpdateDisplay(); // TEMP HACK FN.
 	void todo();
 
 	/** Create the context popup menu and it's submenus */
@@ -108,6 +107,9 @@ private:
 	void requestGroupSummary();
 	void loadGroupSummary(const uint32_t &token);
 
+	// subscribe/unsubscribe ack.
+	void acknowledgeSubscribeChange(const uint32_t &token);
+
 	GxsForumThreadWidget *forumThreadWidget(const std::string &forumId);
 	GxsForumThreadWidget *createThreadWidget(const std::string &forumId);
 
diff --git a/retroshare-gui/src/gui/GxsForumsDialog.ui b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.ui
similarity index 93%
rename from retroshare-gui/src/gui/GxsForumsDialog.ui
rename to retroshare-gui/src/gui/gxsforums/GxsForumsDialog.ui
index 9bf6e7f2c..f5f278c0e 100644
--- a/retroshare-gui/src/gui/GxsForumsDialog.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.ui
@@ -97,13 +97,6 @@
             </property>
            </spacer>
           </item>
-          <item>
-           <widget class="QPushButton" name="refreshButton">
-            <property name="text">
-             <string notr="true">Refresh</string>
-            </property>
-           </widget>
-          </item>
           <item>
            <widget class="QPushButton" name="todoPushButton">
             <property name="text">
@@ -201,18 +194,18 @@
   </action>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RSTabWidget</class>
-   <extends>QTabWidget</extends>
-   <header>gui/common/RSTabWidget.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>GroupTreeWidget</class>
    <extends>QWidget</extends>
    <header>gui/common/GroupTreeWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>RSTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>gui/common/RSTabWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="images.qrc"/>
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 0dcd25eb1..dbbab898c 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -35,7 +35,7 @@
 #endif
 #include "gui/WikiPoos/WikiDialog.h"
 #include "gui/Posted/PostedDialog.h"
-#include "gui/GxsForumsDialog.h"
+#include "gui/gxsforums/GxsForumsDialog.h"
 #include "gui/gxschannels/ChannelDialog.h"
 
 // THESE HAVE TO BE CONVERTED TO VEG FORMAT
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 6d1b6ed9e..52e2d89f8 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1051,18 +1051,18 @@ circles {
 	
 	
 gxsforums {
-	
-	HEADERS += gui/GxsForumsDialog.h \
+
+	HEADERS += gui/gxsforums/GxsForumsDialog.h \
 		gui/gxsforums/GxsForumGroupDialog.h \
 		gui/gxsforums/CreateGxsForumMsg.h \
 		gui/gxsforums/GxsForumThreadWidget.h \
 		gui/gxsforums/GxsForumsFillThread.h
-	
-	FORMS += gui/GxsForumsDialog.ui \
+
+	FORMS += gui/gxsforums/GxsForumsDialog.ui \
 		gui/gxsforums/CreateGxsForumMsg.ui \
 		gui/gxsforums/GxsForumThreadWidget.ui
-	
-	SOURCES += gui/GxsForumsDialog.cpp \
+
+	SOURCES += gui/gxsforums/GxsForumsDialog.cpp \
 		gui/gxsforums/GxsForumGroupDialog.cpp \
 		gui/gxsforums/CreateGxsForumMsg.cpp \
 		gui/gxsforums/GxsForumThreadWidget.cpp \