1 files changed, 11 insertions, 5 deletions
diff --git a/Juick/ViewModels/MessageViewModel.cs b/Juick/ViewModels/MessageViewModel.cs
index 3a324c4..e120c5d 100644
--- a/Juick/ViewModels/MessageViewModel.cs
+++ b/Juick/ViewModels/MessageViewModel.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Net;
 using System.Windows.Media.Imaging;
+using System.Linq;
 using Juick.Api;
 
 namespace Juick.ViewModels
@@ -19,10 +20,15 @@ namespace Juick.ViewModels
             RID = message.Rid;
             Username = message.User.UName;
             MessageText = HttpUtility.HtmlDecode(message.Body);
+
+            if (message.Tags != null)
+            {
+                MessageText = string.Join(", ", message.Tags) + Environment.NewLine + MessageText;
+            }
         }
         private int _mid;
         /// <summary>
-        /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+        /// Sample _viewModelBase property; this property is used in the view to display its value using a Binding.
         /// </summary>
         /// <returns></returns>
         public int MID
@@ -43,7 +49,7 @@ namespace Juick.ViewModels
 
         private int _rid;
         /// <summary>
-        /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+        /// Sample _viewModelBase property; this property is used in the view to display its value using a Binding.
         /// </summary>
         /// <returns></returns>
         public int RID
@@ -63,7 +69,7 @@ namespace Juick.ViewModels
         }
         private string _username;
         /// <summary>
-        /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+        /// Sample _viewModelBase property; this property is used in the view to display its value using a Binding.
         /// </summary>
         /// <returns></returns>
         public string Username
@@ -112,7 +118,7 @@ namespace Juick.ViewModels
 
         private string _messageText;
         /// <summary>
-        /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+        /// Sample _viewModelBase property; this property is used in the view to display its value using a Binding.
         /// </summary>
         /// <returns></returns>
         public string MessageText
@@ -133,7 +139,7 @@ namespace Juick.ViewModels
 
         private string _status;
         /// <summary>
-        /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+        /// Sample _viewModelBase property; this property is used in the view to display its value using a Binding.
         /// </summary>
         /// <returns></returns>
         public string Status