diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index ff037317f..9f680ed16 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -92,13 +92,13 @@ ChannelFeed::ChannelFeed(QWidget *parent)
 //
 	/*************** Setup Right Hand Side (List of Messages) ****************/
 
-	mMsgLayout = new QVBoxLayout;
+	/*mMsgLayout = new QVBoxLayout;
 	mMsgLayout->setSpacing(0);
 	mMsgLayout->setMargin(0);
 	mMsgLayout->setContentsMargins(0,0,0,0);
 
 	QWidget *middleWidget2 = new QWidget();
-	middleWidget2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
+	middleWidget2->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
 	middleWidget2->setLayout(mMsgLayout);
 
 	QScrollArea *scrollArea2 = new QScrollArea;
@@ -111,10 +111,9 @@ ChannelFeed::ChannelFeed(QWidget *parent)
 	layout3->addWidget(scrollArea2);
 	layout3->setSpacing(0);
 	layout3->setMargin(0);
-	layout3->setContentsMargins(0,0,0,0);
+	layout3->setContentsMargins(0,0,0,0); 
 
-
-    msgFrame->setLayout(layout3);
+    msgFrame->setLayout(layout3);*/
 
 //	mChannelId = "OWNID";
 
@@ -684,7 +683,7 @@ void ChannelFeed::updateChannelMsgs()
 		ChanMsgItem *cmi = new ChanMsgItem(this, 0, mChannelId, it->msgId, true);
 
 		mChanMsgItems.push_back(cmi);
-		mMsgLayout->addWidget(cmi);
+		verticalLayout->addWidget(cmi);
 	}
 }
 
diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index da3ed2d53..08f214287 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -422,6 +422,65 @@ p, li { white-space: pre-wrap; }
        <property name="frameShadow">
         <enum>QFrame::Raised</enum>
        </property>
+       <layout class="QGridLayout" name="gridLayout_8">
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QScrollArea" name="scrollArea">
+          <property name="widgetResizable">
+           <bool>true</bool>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+          </property>
+          <widget class="QWidget" name="scrollAreaWidgetContents">
+           <property name="geometry">
+            <rect>
+             <x>0</x>
+             <y>0</y>
+             <width>430</width>
+             <height>331</height>
+            </rect>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QFrame" name="frame_2">
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>391</width>
+                <height>266</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </item>
     </layout>
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
index 8fb3ce171..1268c6d0a 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
@@ -7,13 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>435</width>
-    <height>207</height>
+    <height>205</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>6</number>
+   </property>
    <item row="0" column="0">
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
@@ -236,6 +242,8 @@ p, li { white-space: pre-wrap; }
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>