diff --git a/ChatController/ChatKlassen/ChatMessage.cs b/ChatController/ChatKlassen/ChatMessage.cs
index 42e39b0..0f46bc3 100644
--- a/ChatController/ChatKlassen/ChatMessage.cs
+++ b/ChatController/ChatKlassen/ChatMessage.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index 2c56153..68f630d 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -216,7 +216,7 @@ namespace ChatController.HauptKlassen
                 {
                     if (ChatMessage.UserId == ChatDaten.Userid.Value)
                     {
-                        //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
+                        //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
 
                         var time = DateTime.Parse(ChatMessage.Timestamp.Date);
                         var clientZone = TimeZoneInfo.Local;
@@ -237,11 +237,11 @@ namespace ChatController.HauptKlassen
                             {
                                 //string textn = "";
 
-                                //if (ChatMessage.Text != null)
-                                //    textn = ChatMessage.Text;
+                                //if (ChatMessage2.Text != null)
+                                //    textn = ChatMessage2.Text;
 
                                 //if (textn.Equals(""))
-                                //    textn = ChatMessage.Original_Filename;
+                                //    textn = ChatMessage2.Original_Filename;
 
                                 Messages.Add(new ChatMessage(ChatMessage.User_Name, textn,
                                 timeformated, true, LadeBildNach(ChatMessage.Smaller_Image),
@@ -268,7 +268,7 @@ namespace ChatController.HauptKlassen
                     }
                     else
                     {
-                        //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
+                        //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
 
                         var time = DateTime.Parse(ChatMessage.Timestamp.Date);
                         var clientZone = TimeZoneInfo.Local;
@@ -440,7 +440,7 @@ namespace ChatController.HauptKlassen
                 {
                     if (ChatMessage.UserId == ChatDaten.Userid.Value)
                     {
-                        //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
+                        //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
 
                         var time = DateTime.Parse(ChatMessage.Timestamp.Date);
                         var clientZone = TimeZoneInfo.Local;
@@ -485,7 +485,7 @@ namespace ChatController.HauptKlassen
                     }
                     else
                     {
-                        //var timeformated = DateTime.Parse(ChatMessage.Timestamp.Date);
+                        //var timeformated = DateTime.Parse(ChatMessage2.Timestamp.Date);
 
                         var time = DateTime.Parse(ChatMessage.Timestamp.Date);
                         var clientZone = TimeZoneInfo.Local;