diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index b25737817..46d7f9852 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -615,7 +615,7 @@ void  FriendsDialog::insertSendList()
 
 		/* add all the labels */
 		/* (0) Person */
-		item -> setText(0, QString::fromStdString(details.name));
+		item -> setText(0, QString::fromUtf8(details.name.c_str()));
 
 		item -> setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
 		//item -> setFlags(Qt::ItemIsUserCheckable);
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 44da7d19c..91e8fc9d5 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -676,7 +676,7 @@ QString RetroShareLink::title() const
 		{
 			RsPeerDetails detail;
 			rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
-			return QString("Click to send a private message to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ;
+			return QString("Click to send a private message to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
 		}
 	case TYPE_PRIVATE_CHAT:
 		{
@@ -684,9 +684,9 @@ QString RetroShareLink::title() const
 			rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
 
 			if (_GPGid.toStdString() == rsPeers->getGPGOwnId()) 
-				return QString("Click to open a private chat canal to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ;
+				return QString("Click to open a private chat canal to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
 			else
-				return QString("This is a private chat invite for %1 (%2). You can't use it.").arg(QString::fromStdString(detail.name)).arg(_GPGid) ;
+				return QString("This is a private chat invite for %1 (%2). You can't use it.").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
 		}
 	case TYPE_EXTRAFILE:
 		return QString("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size()));
@@ -879,7 +879,7 @@ QString RetroShareLink::niceName() const
 	if(type() == TYPE_PUBLIC_MSG) {
 			RsPeerDetails detail;
 			rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
-		return QString("Click this link to send a private message to %1 (%2)").arg(QString::fromStdString(detail.name)).arg(_GPGid) ;
+		return QString("Click this link to send a private message to %1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
 	}
 	if(type() == TYPE_CERTIFICATE) {
 		if (_location.isEmpty()) {
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index d4ca280b5..cb78a3f06 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1425,7 +1425,7 @@ void MessageComposer::setRecipientToRow(int row, enumType type, std::string id,
 					  return ;
 				  }
 
-				  name = tr("Distant peer (name: %2, PGP key: %1)").arg(QString::fromStdString(_distant_peers[id])).arg(QString::fromStdString(details.name)) ;
+				  name = tr("Distant peer (name: %2, PGP key: %1)").arg(QString::fromStdString(_distant_peers[id])).arg(QString::fromUtf8(details.name.c_str())) ;
 				  icon = QIcon(StatusDefs::imageUser(RS_STATUS_ONLINE));
 			  }
 			  else if(rsPeers->getPeerDetails(id, details) && (!details.isOnlyGPGdetail))
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index b7c1dbdac..376c54a8a 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -434,7 +434,7 @@ ChatPage::load()
 		else
 		{
 			QListWidgetItem *item = new QListWidgetItem;
-			item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
+			item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromUtf8(detail.name.c_str())+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromUtf8(detail.name.c_str()) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
 			item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
 
 			ui._personal_invites_LW->insertItem(0,item) ;
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index a0f06d4d4..ecaeadcad 100644
Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index ff7564a23..f3e28ec1d 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -1765,11 +1765,11 @@ Doppelklicke auf Lobbys um sie zu betreten und zu chatten.</translation>
     </message>
     <message>
         <source>Private chat invite from </source>
-        <translation>Private Chateinladung von</translation>
+        <translation>Private Chateinladung von </translation>
     </message>
     <message>
         <source>Private chat invite to </source>
-        <translation>Private Chateinladung an</translation>
+        <translation>Private Chateinladung an </translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>