diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp
index a25e97873..87a01bcd9 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@@ -117,19 +117,28 @@ void MsgItem::updateItemStatic()
if (!mIsHome)
{
- if (mi.msgflags & RS_MSG_USER_REQUEST)
- {
- title = QString::fromUtf8(mi.title.c_str()) + " " + tr("from") + " " + srcName;
- replyButton->setText(tr("Reply to invite"));
- subjectLabel->hide();
- inviteFrame->show();
- }
- else
- {
- title = tr("Message From") + ": " + srcName;
- sendinviteButton->hide();
- inviteFrame->hide();
- }
+ if ((mi.msgflags & RS_MSG_USER_REQUEST) && (!mi.rsgxsid_srcId.isNull()))
+ {
+ title = QString::fromUtf8(mi.title.c_str()) + " " + tr("from") + " " + srcName;
+ replyButton->setText(tr("Reply to invite"));
+ subjectLabel->hide();
+ inviteFrame->show();
+ }
+ else if ((mi.msgflags & RS_MSG_USER_REQUEST) && mi.rsgxsid_srcId.isNull())
+ {
+ title = QString::fromUtf8(mi.title.c_str()) + " " + " " + srcName;
+ subjectLabel->hide();
+ inviteFrame->show();
+ infoLabel->setText(tr("This message invites you to make friend! You may accept this request."));
+ sendinviteButton->hide();
+ replyButton->hide();
+ }
+ else
+ {
+ title = tr("Message From") + ": " + srcName;
+ sendinviteButton->hide();
+ inviteFrame->hide();
+ }
}
else
{
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui
index 592376182..ea629873f 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/MsgItem.ui
@@ -161,10 +161,6 @@
Reply Message
-
-
- :/images/mail_reply.png:/images/mail_reply.png
-
-
diff --git a/retroshare-gui/src/release/Data/LOC06_43542d01e908b37636990038a8633cab/file_sharing/dirlist_7fe5ae5f67034e189936e5af4c778b47.bin b/retroshare-gui/src/release/Data/LOC06_43542d01e908b37636990038a8633cab/file_sharing/dirlist_7fe5ae5f67034e189936e5af4c778b47.bin
new file mode 100644
index 000000000..d1156ea2a
Binary files /dev/null and b/retroshare-gui/src/release/Data/LOC06_43542d01e908b37636990038a8633cab/file_sharing/dirlist_7fe5ae5f67034e189936e5af4c778b47.bin differ