diff --git a/TODO.txt b/TODO.txt
index 6ad2c02be..a57a765a7 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -33,7 +33,7 @@ M        [ ] sound is not working for some users on linux. We also need a "test
 E        [ ] some widgets in the GUI do not follow the system style => GUI looks bad on these systems
          [X] display version ID in windows version
 E        [X] recommended friends messages have embedded buttons of wrong size.  Use RSLinks instead!
-E        [ ] "Friends details" should show both PGP key and RS certs in different tabs with appropriate names.
+E        [X] "Friends details" should show both PGP key and RS certs in different tabs with appropriate names.
              It should specify clearly which one should be used to make friends.
 E        [X] addFriend does not work when the cert contains signatures.
 E        [X] PGP signatures are not transmited by discovery2. 
@@ -45,8 +45,8 @@ M        [X] sent messages to direct peers in the Sent box have inconsistent To
              Raises an error if you click on it.
 H        [ ] Merge the new messaging format? (or keep this for > 0.6)
 M        [X] icons for GxsTreeWidgetItem are too small in distant messages list widget
-E        [ ] "from" should be disabled until we actually use a GXS id in the destination list.
-E        [ ] "show all" and "show everyone" in destination list are duplicate names for different things. 
+E        [X] "from" should be disabled until we actually use a GXS id in the destination list.
+E        [X] "show all" and "show everyone" in destination list are duplicate names for different things. 
              Either remove one of them, or use appropriate names.
       
        Channels
@@ -66,7 +66,7 @@ H        [ ] Distant chat should work with shared identities
          [X] Distant chat fails (tunnel bullet never gets green) when re-openning a distant chat window after closing a tunnel
          [X] Distant chat fails (chat window never appears) when re-openning a distant chat window after closing a tunnel
          [X] You should not be enabled to distant-chat yourself!
-			[ ] Nickname completion is broken. It only works with @
+         [ ] Nickname completion is broken. It only works with @
       
        Identities:
          [X] "Owned by you" => "Owned by node [nodename]" 
@@ -80,6 +80,9 @@ M        [ ] allow to share identities between locations.
 E        [ ] Friends => Friend nodes
 E        [ ] remove TCP, TOR, UDP from the status column, and move it in front of IP
       
+       File transfer
+H        [ ] There's a bug sometimes causing re-hash of shared files at start. Find it and kill it.
+
        News feed
          [X] remove the Ghost news feed items
          [X] remove the double feed publication
@@ -95,7 +98,6 @@ E        [ ] remove mktemp => use mkstemp
 H        [ ] RsGxsDataAccess::processRequests locks mDataMutex until all requests are processed.
              Adding a new request or poll for the request status are freezing until the mutex is available.
 
-      
        Packaging
          [X] check compilation on debian
          [X] check compilation on ARM
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index d5fcd95f8..33497c865 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -245,7 +245,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     /* Add filter types */
     ui.filterComboBox->addItem(tr("All"));
     ui.filterComboBox->addItem(tr("Friend Nodes"));
-    ui.filterComboBox->addItem(tr("Everyone"));
+    ui.filterComboBox->addItem(tr("Distant peer identities"));
     ui.filterComboBox->setCurrentIndex(0);
 
     /*ui.comboStyle->addItem("Standard");