diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 45ba4e8a1..18a4d4b39 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -241,10 +241,19 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     
     /* Add filter types */
     ui.filterComboBox->addItem(tr("All"));
-    ui.filterComboBox->addItem(tr("Friends"));
-    ui.filterComboBox->addItem(tr("Friends of Friends"));
+    ui.filterComboBox->addItem(tr("Friend Nodes"));
+    ui.filterComboBox->addItem(tr("Anonymous"));
     ui.filterComboBox->setCurrentIndex(0);
 
+    /*ui.comboStyle->addItem("Standard");
+    ui.comboStyle->addItem("Bullet List (Disc)");
+    ui.comboStyle->addItem("Bullet List (Circle)");
+    ui.comboStyle->addItem("Bullet List (Square)");
+    ui.comboStyle->addItem("Ordered List (Decimal)");
+    ui.comboStyle->addItem("Ordered List (Alpha lower)");
+    ui.comboStyle->addItem("Ordered List (Alpha upper)");*/
+    //connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(textStyle(int)));
+
     connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
     connect(ui.comboFont,  SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
 
@@ -283,7 +292,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     ui.recipientWidget->setColumnCount(COLUMN_RECIPIENT_COUNT);
 
     QHeaderView *header = ui.recipientWidget->horizontalHeader();
-    header->resizeSection(COLUMN_RECIPIENT_TYPE, 50);
+    header->resizeSection(COLUMN_RECIPIENT_TYPE, 70);
     header->resizeSection(COLUMN_RECIPIENT_ICON, 22);
     QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_TYPE, QHeaderView::Fixed);
     QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_ICON, QHeaderView::Fixed);
@@ -631,14 +640,21 @@ void MessageComposer::buildCompleter()
     std::list<RsGroupInfo> groupInfoList;
     std::list<RsGroupInfo>::iterator groupIt;
     rsPeers->getGroupInfoList(groupInfoList);
-
+    
     std::list<RsPeerId> peers;
     std::list<RsPeerId>::iterator peerIt;
     rsPeers->getFriendList(peers);
+    
+    std::list<RsGxsId> gxsIds;
+    std::list<RsGxsId>::iterator idIt;    
 
     // create completer list for friends
     QStringList completerList;
     QStringList completerGroupList;
+    
+    /*for (std::list<RsGxsId>::const_iterator idIt = gxsIds.begin(); idIt != gxsIds.end(); ++idIt) {
+    		completerList.append(*idIt);
+    }*/
 
     for (peerIt = peers.begin(); peerIt != peers.end(); ++peerIt) {
         RsPeerDetails detail;
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index ace46ea93..2eac3de68 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -204,6 +204,12 @@
            </property>
            <item row="0" column="0">
             <widget class="QLabel" name="label_3">
+             <property name="minimumSize">
+              <size>
+               <width>70</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
               <string>Subject:</string>
              </property>
@@ -937,7 +943,7 @@ border-image: url(:/images/closepressed.png)
             <widget class="QLabel" name="fromLabel">
              <property name="minimumSize">
               <size>
-               <width>50</width>
+               <width>70</width>
                <height>0</height>
               </size>
              </property>