diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index cc6fd9c43..d4c5e74b6 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -413,17 +413,28 @@ QVariant RsFriendListModel::textColorRole(const EntryIndex& fmpe,int column) con
 {
 	switch(fmpe.type)
 	{
-		case ENTRY_TYPE_GROUP: return QVariant(QBrush(mTextColorGroup));
-		case ENTRY_TYPE_PROFILE:
-		case ENTRY_TYPE_NODE:  return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
+        case ENTRY_TYPE_GROUP: 		return QVariant(QBrush(mTextColorGroup));
+        case ENTRY_TYPE_PROFILE:	return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
+        case ENTRY_TYPE_NODE:  		return QVariant(QBrush(mTextColorStatus[statusRole(fmpe,column).toInt()]));
 		default:
 		return QVariant();
 	}
 }
 
-QVariant RsFriendListModel::statusRole(const EntryIndex& /*fmpe*/,int /*column*/) const
+// statusRole returns the status (e.g. RS_STATUS_BUSY). It is used only to change the font color
+
+QVariant RsFriendListModel::statusRole(const EntryIndex& fmpe,int /*column*/) const
 {
-    return QVariant();//fmpe.mMsgStatus);
+    const HierarchicalNodeInformation *node = getNodeInfo(fmpe);
+
+    if(node)
+    {
+        StatusInfo status;
+        rsStatus->getStatus(node->node_info.id, status);
+
+        return QVariant(status.status);
+    }
+    return QVariant();
 }
 
 bool RsFriendListModel::passesFilter(const EntryIndex& e,int /*column*/) const
@@ -548,6 +559,9 @@ QVariant RsFriendListModel::sortRole(const EntryIndex& entry,int column) const
     }
 }
 
+// Only returns two values: RS_STATUS_ONLINE, or RS_STATUS_OFFLINE. This is used to decide on text font (bold)
+// and whether profiles have children or not when offline nodes are shown.
+
 QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 {
 	switch(e.type)
@@ -585,13 +599,10 @@ QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 		{
 			const HierarchicalNodeInformation *node = getNodeInfo(e);
 
-			if(node)
-			{
-				StatusInfo status;
-				rsStatus->getStatus(node->node_info.id, status);
-
-				return QVariant(status.status);
-			}
+            if(node && bool(node->node_info.state & RS_PEER_STATE_CONNECTED))
+                return QVariant(RS_STATUS_ONLINE);
+            else
+                return QVariant(RS_STATUS_OFFLINE);
 		}
 	}
 	return QVariant(RS_STATUS_OFFLINE);
@@ -626,12 +637,6 @@ QVariant RsFriendListModel::fontRole(const EntryIndex& e, int col) const
 	}
 }
 
-class AutoEndel
-{
-public:
-    ~AutoEndel() { std::cerr << std::endl;}
-};
-
 QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 {
 #ifdef DEBUG_MODEL_INDEX
@@ -750,7 +755,7 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 						else
 						{
 							return QVariant(QString::fromUtf8(node->node_info.location.c_str())+"\n"
-						                + "(" + StatusDefs::name(onlineRole(e,col).toInt()) + ")");
+                                        + "(" + StatusDefs::name(statusRole(e,col).toInt()) + ")");
 						}
 					else
 						return QVariant(QString::fromUtf8(node->node_info.location.c_str()));