diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 1bb65cd3b..c875815a0 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -247,7 +247,18 @@ void MessagesDialog::replytomessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Re:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
+	
 	nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -282,7 +293,17 @@ void MessagesDialog::replyallmessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Re:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
 	nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -327,7 +348,18 @@ void MessagesDialog::forwardmessage()
 	/* fill it in */
 	//std::cerr << "MessagesDialog::newmessage()" << std::endl;
 	nMsgDialog->newMsg();
+	
+	QString text = QString::fromStdWString(msgInfo.title);
+			
+	if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+	{
+	nMsgDialog->insertTitleText( QString::fromStdWString(msgInfo.title).toStdString()) ;
+	}
+	else
+	{
 	nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ;
+	}
+	
 	nMsgDialog->setWindowTitle(tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ;
 
 
@@ -585,6 +617,46 @@ void MessagesDialog::insertMessages()
 
 		// Subject
 		item -> setText(2, QString::fromStdWString(it->title));
+		
+		// Change Message icon when Subject is Re: or Fwd:
+		QString text = QString::fromStdWString(it->title);
+			
+    if (text.startsWith("Re:", Qt::CaseInsensitive))
+    {
+		item -> setIcon(2, (QIcon(":/images/message-mail-replied-read.png")));
+    }
+    else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+    {
+		item -> setIcon(2, (QIcon(":/images/message-mail-forwarded-read.png")));
+    }
+    else
+		{
+    item -> setIcon(2, (QIcon(":/images/message-mail-read.png")));
+		}
+		
+		if (it -> msgflags & RS_MSG_NEW)
+		{
+			for(int i = 0; i < 10; i++)
+			{
+				QFont qf = item->font(i);
+				qf.setBold(true);
+				item->setFont(i, qf);
+			}
+			QString text = QString::fromStdWString(it->title);
+			
+      if (text.startsWith("Re:", Qt::CaseInsensitive))
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail-replied.png")));
+      }
+      else if (text.startsWith("Fwd:", Qt::CaseInsensitive))
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail-forwarded.png")));
+      }
+      else
+      {
+      item -> setIcon(2, (QIcon(":/images/message-mail.png")));
+      }
+		}
 
 		// No of Files.
 		{
@@ -601,22 +673,6 @@ void MessagesDialog::insertMessages()
 			newSelected = item;
 		}
 
-		if (it -> msgflags & RS_MSG_NEW)
-		{
-			for(int i = 0; i < 10; i++)
-			{
-				QFont qf = item->font(i);
-				qf.setBold(true);
-				item->setFont(i, qf);
-				item -> setIcon(2, (QIcon(":/images/message-mail.png")));
-
-			}
-		}
-		else
-		{
-        item -> setIcon(2, (QIcon(":/images/message-mail-read.png")));
-		}
-
 		/* add to the list */
 		items.append(item);
 	}
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 82e44daf6..54d42f2be 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -13,6 +13,7 @@
         <file>images/btn_27.png</file>
         <file>images/btn_27_hover.png</file>
         <file>images/connect_established.png</file>
+        <file>images/connect_creating.png</file>
         <file>images/feedback_arrow.png</file>
         <file>images/feedback_arrow_hover.png</file>
         <file>images/feedback-bar-background.png</file>
@@ -261,6 +262,9 @@
         <file>images/message-mail-read.png</file>
         <file>images/message-mail-imapdelete.png</file>
         <file>images/message-mail-replied-read.png</file>
+        <file>images/message-mail-forwarded-read.png</file>
+        <file>images/message-mail-replied.png</file>
+        <file>images/message-mail-forwarded.png</file>
         <file>images/message-news.png</file>
         <file>images/message.png</file>
         <file>images/messenger.png</file>
diff --git a/retroshare-gui/src/gui/images/message-mail-forwarded.png b/retroshare-gui/src/gui/images/message-mail-forwarded.png
new file mode 100644
index 000000000..e7d9881a5
Binary files /dev/null and b/retroshare-gui/src/gui/images/message-mail-forwarded.png differ
diff --git a/retroshare-gui/src/gui/images/message-mail-replied-forw-read.png b/retroshare-gui/src/gui/images/message-mail-replied-forw-read.png
new file mode 100644
index 000000000..54340d00d
Binary files /dev/null and b/retroshare-gui/src/gui/images/message-mail-replied-forw-read.png differ
diff --git a/retroshare-gui/src/gui/images/message-mail-replied-forw.png b/retroshare-gui/src/gui/images/message-mail-replied-forw.png
new file mode 100644
index 000000000..b465758f5
Binary files /dev/null and b/retroshare-gui/src/gui/images/message-mail-replied-forw.png differ