diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
index aca174f1c..d8128b199 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
@@ -13,8 +13,17 @@
   <property name="windowTitle">
    <string>Submit Post</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <property name="margin">
+  <layout class="QGridLayout" name="PostedCreatePostDialogGLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -31,14 +40,14 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <widget class="QFrame" name="frame">
+    <widget class="QFrame" name="mainFrame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout" name="mainFrameGLayout">
       <item row="0" column="0" colspan="3">
        <widget class="StyledLabel" name="info_label">
         <property name="palette">
@@ -120,7 +129,7 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="3">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout" name="titleGLayout">
         <item row="0" column="1">
          <widget class="QLineEdit" name="titleEdit"/>
         </item>
@@ -144,9 +153,9 @@
        </layout>
       </item>
       <item row="2" column="0" colspan="3">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <layout class="QHBoxLayout" name="signedHLayout">
         <item>
-         <spacer name="spacer_2">
+         <spacer name="signedHSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
@@ -162,7 +171,7 @@
          </spacer>
         </item>
         <item>
-         <widget class="QLabel" name="label_4">
+         <widget class="QLabel" name="signedLabel">
           <property name="text">
            <string>Signed by: </string>
           </property>
@@ -183,12 +192,12 @@
          </widget>
         </item>
         <item>
-         <widget class="QTextEdit" name="notesTextEdit"/>
+         <widget class="MimeTextEdit" name="notesTextEdit"/>
         </item>
        </layout>
       </item>
       <item row="4" column="0">
-       <spacer name="horizontalSpacer">
+       <spacer name="buttonHSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -235,6 +244,11 @@
    <header>gui/common/HeaderFrame.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>MimeTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header location="global">gui/common/MimeTextEdit.h</header>
+  </customwidget>
   <customwidget>
    <class>GxsIdChooser</class>
    <extends>QComboBox</extends>
@@ -246,9 +260,7 @@
    <header>gui/common/StyledLabel.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../images.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui
index 374949716..f989ccb6e 100644
--- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.ui
@@ -13,9 +13,9 @@
   <property name="windowTitle">
    <string>Make Comment</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="GxsCreateCommentDialogVLayout">
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="titleLabel">
      <property name="text">
       <string>&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;
@@ -26,11 +26,11 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
+    <layout class="QVBoxLayout" name="mainVLayout">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="signedHLayout">
        <item>
-        <spacer name="horizontalSpacer">
+        <spacer name="signedHSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -43,7 +43,7 @@ p, li { white-space: pre-wrap; }
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="subjectLabel">
+        <widget class="QLabel" name="signedLabel">
          <property name="text">
           <string>Signed by</string>
          </property>
@@ -55,7 +55,7 @@ p, li { white-space: pre-wrap; }
       </layout>
      </item>
      <item>
-      <widget class="QTextEdit" name="commentTextEdit"/>
+      <widget class="MimeTextEdit" name="commentTextEdit"/>
      </item>
     </layout>
    </item>
@@ -72,6 +72,11 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>MimeTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header location="global">gui/common/MimeTextEdit.h</header>
+  </customwidget>
   <customwidget>
    <class>GxsIdChooser</class>
    <extends>QComboBox</extends>
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
index 5c603cb93..c9e4c3346 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
@@ -20,8 +20,17 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_8">
-   <property name="margin">
+  <layout class="QGridLayout" name="CreateGxsChannelMsgGLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -31,14 +40,14 @@
     <widget class="HeaderFrame" name="headerFrame"/>
    </item>
    <item row="1" column="0">
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="mainFrame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
+     <layout class="QGridLayout" name="mainFrameGLayout">
       <item row="0" column="0">
        <widget class="QTabWidget" name="tabWidget">
         <property name="mouseTracking">
@@ -53,15 +62,15 @@
         <property name="currentIndex">
          <number>0</number>
         </property>
-        <widget class="QWidget" name="tab">
+        <widget class="QWidget" name="channelPostTab">
          <attribute name="title">
           <string>Channel Post</string>
          </attribute>
-         <layout class="QGridLayout" name="gridLayout_7">
+         <layout class="QGridLayout" name="channelPostTabGLayout">
           <item row="0" column="0" colspan="3">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="channelNameHLayout">
             <item>
-             <widget class="QLabel" name="label_8">
+             <widget class="QLabel" name="channelNameLabel">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -86,9 +95,9 @@
            </layout>
           </item>
           <item row="1" column="0">
-           <layout class="QGridLayout" name="gridLayout_5">
+           <layout class="QGridLayout" name="channelAttachGLayout">
             <item row="0" column="0" colspan="2">
-             <widget class="QLabel" name="label_2">
+             <widget class="QLabel" name="channelAttachLabel">
               <property name="text">
                <string>&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;
@@ -157,15 +166,15 @@ p, li { white-space: pre-wrap; }
            </spacer>
           </item>
           <item row="2" column="0" colspan="3">
-           <widget class="QGroupBox" name="groupBox">
+           <widget class="QGroupBox" name="messageGBox">
             <property name="title">
              <string>Message</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
+            <layout class="QVBoxLayout" name="messageGBoxVLayout">
              <item>
-              <layout class="QHBoxLayout">
+              <layout class="QHBoxLayout" name="subjectHLayout">
                <item>
-                <widget class="QLabel" name="label_5">
+                <widget class="QLabel" name="subjectLabel">
                  <property name="font">
                   <font>
                    <weight>75</weight>
@@ -183,14 +192,14 @@ p, li { white-space: pre-wrap; }
               </layout>
              </item>
              <item>
-              <widget class="QTextEdit" name="msgEdit"/>
+              <widget class="MimeTextEdit" name="msgEdit"/>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="tab_2">
+        <widget class="QWidget" name="attachmentsTab">
          <attribute name="icon">
           <iconset resource="../images.qrc">
            <normaloff>:/images/attachment.png</normaloff>:/images/attachment.png</iconset>
@@ -198,9 +207,9 @@ p, li { white-space: pre-wrap; }
          <attribute name="title">
           <string>Attachments</string>
          </attribute>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <layout class="QGridLayout" name="attachmentsTabGLayout">
           <item row="0" column="0">
-           <widget class="QLabel" name="label_3">
+           <widget class="QLabel" name="attachmentsPixLabel">
             <property name="text">
              <string/>
             </property>
@@ -210,7 +219,7 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QLabel" name="label_4">
+           <widget class="QLabel" name="attachmentsLabel">
             <property name="maximumSize">
              <size>
               <width>16777215</width>
@@ -229,7 +238,7 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item row="0" column="2">
-           <spacer>
+           <spacer name="attachmentsHSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -281,7 +290,7 @@ p, li { white-space: pre-wrap; }
            </widget>
           </item>
           <item row="1" column="0" colspan="5">
-           <widget class="QScrollArea" name="scrollArea">
+           <widget class="QScrollArea" name="attachmentsScrollArea">
             <property name="verticalScrollBarPolicy">
              <enum>Qt::ScrollBarAlwaysOn</enum>
             </property>
@@ -293,7 +302,7 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>98</width>
+               <width>523</width>
                <height>24</height>
               </rect>
              </property>
@@ -303,11 +312,20 @@ p, li { white-space: pre-wrap; }
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout">
+             <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
               <property name="spacing">
                <number>3</number>
               </property>
-              <property name="margin">
+              <property name="leftMargin">
+               <number>3</number>
+              </property>
+              <property name="topMargin">
+               <number>3</number>
+              </property>
+              <property name="rightMargin">
+               <number>3</number>
+              </property>
+              <property name="bottomMargin">
                <number>3</number>
               </property>
               <item>
@@ -324,7 +342,7 @@ p, li { white-space: pre-wrap; }
                 <property name="toolTip">
                  <string>Drag and Drop Files from Search Results</string>
                 </property>
-                <layout class="QGridLayout" name="gridLayout_3"/>
+                <layout class="QGridLayout" name="fileFrameGLayout"/>
                </widget>
               </item>
              </layout>
@@ -336,7 +354,7 @@ p, li { white-space: pre-wrap; }
        </widget>
       </item>
       <item row="1" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout">
+       <layout class="QHBoxLayout" name="buttonHLayout">
         <item>
          <widget class="QCheckBox" name="generateCheckBox">
           <property name="text">
@@ -378,10 +396,14 @@ p, li { white-space: pre-wrap; }
    <header>gui/common/HeaderFrame.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>MimeTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header location="global">gui/common/MimeTextEdit.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>