diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 13ad9d844..2b074adc6 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -57,7 +57,7 @@
 
 MessengerWindow* MessengerWindow::_instance = NULL;
 
-std::set<std::string> MessengerWindow::expandedPeers ;
+std::set<RsPgpId> MessengerWindow::expandedPeers ;
 std::set<RsNodeGroupId> MessengerWindow::expandedGroups ;
 
 /*static*/ void MessengerWindow::showYourself ()
@@ -99,7 +99,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WindowFlags flags)
     connect(NotifyQt::getInstance(), SIGNAL(ownStatusMessageChanged()), this, SLOT(loadmystatusmessage()));
     connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(QString,int)), this, SLOT(updateOwnStatus(QString,int)));
 
-        for (std::set<std::string>::iterator peerIt = expandedPeers.begin(); peerIt != expandedPeers.end(); ++peerIt) {
+        for (std::set<RsPgpId>::iterator peerIt = expandedPeers.begin(); peerIt != expandedPeers.end(); ++peerIt) {
             ui.friendList->addPeerToExpand(*peerIt);
         }
         expandedPeers.clear();
diff --git a/retroshare-gui/src/gui/MessengerWindow.h b/retroshare-gui/src/gui/MessengerWindow.h
index cd8f23742..34a483667 100644
--- a/retroshare-gui/src/gui/MessengerWindow.h
+++ b/retroshare-gui/src/gui/MessengerWindow.h
@@ -67,7 +67,7 @@ private:
     /** Qt Designer generated object */
     Ui::MessengerWindow ui;
 
-    static std::set<std::string> expandedPeers ;
+    static std::set<RsPgpId> expandedPeers ;
     static std::set<RsNodeGroupId> expandedGroups ;
 };
 
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 643e9d482..ad9df8e44 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -1196,7 +1196,7 @@ void FriendList::insertPeers()
                 gpgItem->setFont(i, gpgFont);
             }
 
-            if (openPeers.find(gpgId.toStdString()) != openPeers.end()) {
+            if (openPeers.find(gpgId) != openPeers.end()) {
                 gpgItem->setExpanded(true);
             }
         }
@@ -1253,14 +1253,14 @@ bool FriendList::getExpandedGroups(std::set<RsNodeGroupId> &groups) const
 /**
  * Returns a list with all gpg ids that are expanded
  */
-bool FriendList::getExpandedPeers(std::set<std::string> &peers) const
+bool FriendList::getExpandedPeers(std::set<RsPgpId> &peers) const
 {
     peers.clear();
     QTreeWidgetItemIterator it(ui->peerTreeWidget);
     while (*it) {
         QTreeWidgetItem *item = *it;
         if (item->type() == TYPE_GPG && item->isExpanded()) {
-            peers.insert(peers.end(), getRsId(item));
+            peers.insert(peers.end(), RsPgpId(getRsId(item)));
         }
         ++it;
     }
@@ -2282,7 +2282,7 @@ void FriendList::addGroupToExpand(const RsNodeGroupId &groupId)
  * Add a gpgId to the openPeers list. These peers
  * will be expanded, when they're added to the QTreeWidget
  */
-void FriendList::addPeerToExpand(const std::string &gpgId)
+void FriendList::addPeerToExpand(const RsPgpId& gpgId)
 {
     openPeers.insert(gpgId);
 }
diff --git a/retroshare-gui/src/gui/common/FriendList.h b/retroshare-gui/src/gui/common/FriendList.h
index 6b92530d8..38639ca9c 100644
--- a/retroshare-gui/src/gui/common/FriendList.h
+++ b/retroshare-gui/src/gui/common/FriendList.h
@@ -65,8 +65,8 @@ public:
     void processSettings(bool load);
     void addGroupToExpand(const RsNodeGroupId &groupId);
     bool getExpandedGroups(std::set<RsNodeGroupId> &groups) const;
-    void addPeerToExpand(const std::string &gpgId);
-    bool getExpandedPeers(std::set<std::string> &peers) const;
+    void addPeerToExpand(const RsPgpId &gpgId);
+    bool getExpandedPeers(std::set<RsPgpId> &peers) const;
 
     std::string getSelectedGroupId() const;
 
@@ -120,8 +120,7 @@ private:
 
     bool groupsHasChanged;
     std::set<RsNodeGroupId> openGroups;
-#warning this would needs an ID, not a std::string.
-    std::set<std::string>   openPeers;
+    std::set<RsPgpId>   openPeers;
 
     /* Color definitions (for standard see qss.default) */
     QColor mTextColorGroup;