diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index a90adcd3c..bd4002ed6 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -266,11 +266,11 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ;
     
     /* Add filter types */
-    ui.filterComboBox->addItem(tr("All"));
+    ui.filterComboBox->addItem(tr("All addresses (mixed)"));
     ui.filterComboBox->addItem(tr("Friend Nodes"));
-    ui.filterComboBox->addItem(tr("Persons"));
-	 ui.filterComboBox->addItem(tr("Contacts"));
-    ui.filterComboBox->setCurrentIndex(0);
+    ui.filterComboBox->addItem(tr("All people"));
+    ui.filterComboBox->addItem(tr("My contacts"));
+    ui.filterComboBox->setCurrentIndex(3);
 
     connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
     connect(ui.comboFont,  SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index 71227edbf..f3a16ac33 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>925</width>
-    <height>747</height>
+    <width>1679</width>
+    <height>951</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -56,14 +56,14 @@
         <set>QDockWidget::DockWidgetClosable</set>
        </property>
        <property name="windowTitle">
-        <string>Contacts</string>
+        <string>Address list:</string>
        </property>
        <widget class="QWidget" name="dockWidgetContents">
-        <layout class="QGridLayout" name="gridLayout_4">
-         <property name="margin">
-          <number>1</number>
-         </property>
-         <item row="1" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <widget class="QComboBox" name="filterComboBox"/>
+         </item>
+         <item>
           <widget class="FriendSelectionWidget" name="friendSelectionWidget" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@@ -100,25 +100,8 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="0">
+         <item>
           <layout class="QVBoxLayout" name="verticalLayout_4">
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <item>
-              <widget class="QPushButton" name="addToButton">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>&gt;&gt; To</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
            <item>
             <layout class="QHBoxLayout" name="horizontalLayout_2">
              <item>
@@ -130,7 +113,20 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>&gt;&gt; Cc</string>
+                <string>Cc</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="addToButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>To</string>
                </property>
               </widget>
              </item>
@@ -143,7 +139,7 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>&gt;&gt; Bcc</string>
+                <string>Bcc</string>
                </property>
               </widget>
              </item>
@@ -160,7 +156,7 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>&gt;&gt; Recommend</string>
+                <string>Recommend this friend</string>
                </property>
               </widget>
              </item>
@@ -168,23 +164,6 @@
            </item>
           </layout>
          </item>
-         <item row="0" column="0">
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string>Show:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QComboBox" name="filterComboBox"/>
-           </item>
-          </layout>
-         </item>
         </layout>
        </widget>
       </widget>
@@ -1105,8 +1084,8 @@ border-image: url(:/images/closepressed.png)
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>925</width>
-     <height>21</height>
+     <width>1679</width>
+     <height>37</height>
     </rect>
    </property>
   </widget>
@@ -1238,8 +1217,6 @@ border-image: url(:/images/closepressed.png)
   <tabstop>titleEdit</tabstop>
   <tabstop>msgText</tabstop>
   <tabstop>msgFileList</tabstop>
-  <tabstop>addToButton</tabstop>
-  <tabstop>addCcButton</tabstop>
   <tabstop>addBccButton</tabstop>
   <tabstop>addRecommendButton</tabstop>
   <tabstop>comboSize</tabstop>