diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp
index 2110ca1bd..ee34ebd86 100644
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@@ -1474,7 +1474,6 @@ void ForumsDialog::createthread()
     }
 
     CreateForumMsg *cfm = new CreateForumMsg(mCurrForumId, "");
-    cfm->setWindowTitle(tr("Start New Thread"));
     cfm->show();
 
     /* window will destroy itself! */
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
index 4112f1a29..04d759a2a 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
@@ -41,13 +41,19 @@
 
 
 /** Constructor */
-CreateForumMsg::CreateForumMsg(std::string fId, std::string pId)
-: QMainWindow(NULL), mForumId(fId), mParentId(pId)
+CreateForumMsg::CreateForumMsg(const std::string &fId, const std::string &pId)
+: QDialog(NULL), mForumId(fId), mParentId(pId)
 {
     /* Invoke the Qt Designer generated object setup routine */
     ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose, true);
 
+    QString text = pId.empty() ? tr("Start New Thread") : tr("Post Forum Message");
+    setWindowTitle(text);
+
+    ui.headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png"));
+    ui.headerFrame->setHeaderText(text);
+
     Settings->loadWidgetInformation(this);
 
     connect( ui.forumMessage, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( forumMessageCostumPopupMenu( QPoint ) ) );
@@ -55,8 +61,8 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId)
     connect(ui.hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
 
     // connect up the buttons.
-    connect( ui.postmessage_action, SIGNAL( triggered (bool) ), this, SLOT( createMsg( ) ) );
-    connect( ui.close_action, SIGNAL( triggered (bool) ), this, SLOT( cancelMsg( ) ) );
+    connect( ui.buttonBox, SIGNAL(accepted()), this, SLOT(createMsg()));
+    connect( ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
     connect( ui.emoticonButton, SIGNAL(clicked()), this, SLOT(smileyWidgetForums()));
     connect( ui.attachFileButton, SIGNAL(clicked() ), this , SLOT(addFile()));
     connect( ui.pastersButton, SIGNAL(clicked() ), this , SLOT(pasteLink()));
@@ -189,11 +195,6 @@ void CreateForumMsg::closeEvent (QCloseEvent * /*event*/)
     Settings->saveWidgetInformation(this);
 }
 
-void CreateForumMsg::cancelMsg()
-{
-    close();
-}
-
 void CreateForumMsg::smileyWidgetForums()
 {
     Emoticons::showSmileyWidget(this, ui.emoticonButton, SLOT(addSmileys()), false);
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.h b/retroshare-gui/src/gui/forums/CreateForumMsg.h
index 630b397cb..1ff855b5a 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.h
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.h
@@ -25,12 +25,12 @@
 
 #include "ui_CreateForumMsg.h"
 
-class CreateForumMsg : public QMainWindow
+class CreateForumMsg : public QDialog
 {
   Q_OBJECT
 
 public:
-    CreateForumMsg(std::string fId, std::string pId);
+    CreateForumMsg(const std::string &fId, const std::string &pId);
 
     void newMsg(); /* cleanup */
 
@@ -41,7 +41,6 @@ private slots:
     void fileHashingFinished(QList<HashedFile> hashedFiles);
     /* actions to take.... */
     void createMsg();
-    void cancelMsg();
     void pasteLink();
     void pasteLinkFull();
     void pasteOwnCertificateLink();
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui
index 14be8b9ea..80206caad 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>CreateForumMsg</class>
- <widget class="QMainWindow" name="CreateForumMsg">
+ <widget class="QDialog" name="CreateForumMsg">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -17,21 +17,27 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
-  <property name="toolButtonStyle">
-   <enum>Qt::ToolButtonTextUnderIcon</enum>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout_5">
-    <property name="margin">
-     <number>0</number>
-    </property>
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <item row="0" column="0">
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
-       <widget class="QFrame" name="frame_4">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="HeaderFrame" name="headerFrame"/>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QFrame" name="subjectFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
@@ -39,48 +45,37 @@
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
-         <property name="topMargin">
-          <number>6</number>
-         </property>
-         <property name="bottomMargin">
-          <number>6</number>
+         <property name="margin">
+          <number>0</number>
          </property>
          <item row="0" column="0">
-          <layout class="QHBoxLayout">
-           <item>
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>Forum</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="forumName">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
+          <widget class="QLabel" name="forumLabel">
+           <property name="text">
+            <string>Forum</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="forumName">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
          </item>
          <item row="1" column="0">
-          <layout class="QHBoxLayout">
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Subject</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="forumSubject"/>
-           </item>
-          </layout>
+          <widget class="QLabel" name="subjectLabel">
+           <property name="text">
+            <string>Subject</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="forumSubject"/>
          </item>
         </layout>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item>
        <widget class="QFrame" name="toolBarFrame">
         <property name="maximumSize">
          <size>
@@ -206,112 +201,73 @@
         </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QFrame" name="frame_3">
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
+      <item>
+       <widget class="QGroupBox" name="messageGroupBox">
+        <property name="title">
+         <string>Forum Post</string>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="topMargin">
-          <number>6</number>
-         </property>
-         <property name="bottomMargin">
-          <number>6</number>
-         </property>
+        <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="0">
-          <widget class="QGroupBox" name="groupBox">
-           <property name="title">
-            <string>Forum Post</string>
+          <widget class="QTextEdit" name="forumMessage">
+           <property name="contextMenuPolicy">
+            <enum>Qt::CustomContextMenu</enum>
            </property>
-           <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="0">
-             <widget class="QTextEdit" name="forumMessage">
-              <property name="contextMenuPolicy">
-               <enum>Qt::CustomContextMenu</enum>
-              </property>
-              <property name="html">
-               <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+           <property name="html">
+            <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QGroupBox" name="groupBox_2">
-           <property name="title">
-            <string>Attach files via drag and drop</string>
            </property>
-           <layout class="QGridLayout" name="gridLayout_7">
-            <item row="0" column="0">
-             <widget class="HashBox" name="hashBox">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="toolTip">
-               <string>You can attach files via drag and drop here in this window</string>
-              </property>
-              <property name="widgetResizable">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QGroupBox" name="hashGroupBox">
+        <property name="title">
+         <string>Attach files via drag and drop</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_7">
+         <item row="0" column="0">
+          <widget class="HashBox" name="hashBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>You can attach files via drag and drop here in this window</string>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        </property>
+       </widget>
+      </item>
      </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QToolBar" name="toolBar">
-   <property name="windowTitle">
-    <string notr="true">toolBar</string>
-   </property>
-   <property name="movable">
-    <bool>false</bool>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="postmessage_action"/>
-   <addaction name="close_action"/>
-  </widget>
-  <action name="postmessage_action">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/mail_send24.png</normaloff>:/images/mail_send24.png</iconset>
-   </property>
-   <property name="text">
-    <string>Post Forum Msg</string>
-   </property>
-  </action>
-  <action name="close_action">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/button_cancel.png</normaloff>:/images/button_cancel.png</iconset>
-   </property>
-   <property name="text">
-    <string>Close</string>
-   </property>
-  </action>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>HeaderFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/common/HeaderFrame.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>HashBox</class>
    <extends>QScrollArea</extends>