diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 311530b03..6e4bd7569 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -301,6 +301,7 @@
         <file>icons/png/arrow-left.png</file>
         <file>icons/png/next-unread.png</file>
         <file>icons/mail/compose.png</file>
+        <file>icons/mail/downloadall.png</file>
         <file>icons/mail/delete.png</file>
         <file>icons/mail/tags.png</file>
         <file>icons/mail/quote.png</file>
diff --git a/retroshare-gui/src/gui/icons/mail/downloadall.png b/retroshare-gui/src/gui/icons/mail/downloadall.png
new file mode 100644
index 000000000..b4d31d3d0
Binary files /dev/null and b/retroshare-gui/src/gui/icons/mail/downloadall.png differ
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 6d33e6ca6..92f4de457 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1206,6 +1206,12 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
     // needed to send system flags with reply
     msgComposer->msgFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
 
+	MsgTagInfo tagInfo;
+	rsMail->getMessageTag(msgId, tagInfo);
+
+	msgComposer->m_tagIds = tagInfo.tagIds;
+	msgComposer->showTagLabels();
+
     msgComposer->calculateTitle();
 
     /* window will destroy itself! */
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index 3c085c3c8..bfa94abba 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -36,6 +36,7 @@
 #include "gui/common/TagDefs.h"
 #include "gui/common/PeerDefs.h"
 #include "gui/common/Emoticons.h"
+#include "gui/common/FilesDefs.h"
 #include "gui/settings/rsharesettings.h"
 #include "MessageComposer.h"
 #include "MessageWidget.h"
@@ -51,8 +52,8 @@
 #include <retroshare/rsmsgs.h>
 
 /* Images for context menu icons */
-#define IMAGE_DOWNLOAD         ":/images/start.png"
-#define IMAGE_DOWNLOADALL      ":/images/startall.png"
+#define IMAGE_DOWNLOAD         ":/icons/png/download.png"
+#define IMAGE_DOWNLOADALL      ":/icons/mail/downloadall.png"
 
 #define COLUMN_FILE_NAME   0
 #define COLUMN_FILE_SIZE   1
@@ -555,6 +556,7 @@ void MessageWidget::fill(const std::string &msgId)
 	for (it = recList.begin(); it != recList.end(); ++it) {
 		QTreeWidgetItem *item = new QTreeWidgetItem;
 		item->setText(COLUMN_FILE_NAME, QString::fromUtf8(it->fname.c_str()));
+		item->setIcon(COLUMN_FILE_NAME, FilesDefs::getIconFromFileType(it->fname.c_str()));
 		item->setText(COLUMN_FILE_SIZE, misc::friendlyUnit(it->size));
 		item->setData(COLUMN_FILE_SIZE, Qt::UserRole, QVariant(qulonglong(it->size)) );
 		item->setText(COLUMN_FILE_HASH, QString::fromStdString(it->hash.toStdString()));
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 37a6ee319..5d6bc87c5 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -53,6 +53,7 @@
 #include <algorithm>
 
 /* Images for context menu icons */
+#define IMAGE_MAIL             ":/icons/png/message.png"
 #define IMAGE_MESSAGE          ":/icons/mail/compose.png"
 #define IMAGE_MESSAGEREMOVE    ":/icons/mail/delete.png"
 #define IMAGE_STAR_ON          ":/images/star-on-16.png"
@@ -766,7 +767,7 @@ void MessagesDialog::openAsTab()
         return;
     }
 
-    ui.tabWidget->addTab(msgWidget, msgWidget->subject(true));
+    ui.tabWidget->addTab(msgWidget,QIcon(IMAGE_MAIL), msgWidget->subject(true));
     ui.tabWidget->setCurrentWidget(msgWidget);
 	connect(msgWidget, SIGNAL(messageRemoved()), this, SLOT(messageRemoved()));