diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index d8156fc6b..e028d0276 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -417,7 +417,11 @@ void MessageComposer::recommendFriend(std::list <std::string> &peerids)
     sMsgText += BuildRecommendHtml(peerids);
     pMsgDialog->insertMsgText(sMsgText);
 
-//    pMsgDialog->insertFileList(files_info);
+    std::list <std::string>::iterator peerIt;
+    for (peerIt = peerids.begin(); peerIt != peerids.end(); peerIt++) {
+        pMsgDialog->addRecipient(CC, *peerIt, false);
+    }
+
     pMsgDialog->show();
 
     /* window will destroy itself! */
@@ -651,7 +655,7 @@ void MessageComposer::insertSendList()
                 }
             }
 
-            if (state != RS_STATUS_OFFLINE) {
+            if (state != (int) RS_STATUS_OFFLINE) {
                 item->setTextColor(COLUMN_CONTACT_NAME, COLOR_CONNECT);
             }
 
@@ -2435,6 +2439,11 @@ void MessageComposer::addRecommend()
         return;
     }
 
+    std::list <std::string>::iterator it;
+    for (it = gpgIds.begin(); it != gpgIds.end(); it++) {
+        addRecipient(CC, *it, false);
+    }
+
     QString text = BuildRecommendHtml(gpgIds);
     ui.msgText->textCursor().insertHtml(text);
     ui.msgText->setFocus(Qt::OtherFocusReason);