diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index c99712c..5ca4149 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -116,9 +116,8 @@ namespace ChatController.HauptKlassen
 
                     if (!string.IsNullOrEmpty(serverResponse))
                     {
-                        Debug.WriteLine(serverResponse);
                         _UserMessages = JsonConvert.DeserializeObject<UserMessages>(serverResponse);
-                        
+
                         if (_UserMessages.Response.HasMorePages)
                         {
                             _NextPage = _UserMessages.Response.NextPage;
@@ -200,7 +199,7 @@ namespace ChatController.HauptKlassen
 
             if (_UserMessages != null && _UserMessages.Response.Messages.Length > 0)
             {
-                timespan = _UserMessages.Response.Messages.First().CreatedAt;
+                timespan = _UserMessages.Response.Messages.First().Created_At;
             }
 
             if (pCurrentContact != null)
@@ -484,7 +483,7 @@ namespace ChatController.HauptKlassen
                 }
                 else
                 {
-                    Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFile), sendTime, message.SmallerImage, true, pFile, pGroupId));
+                    Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFile), sendTime, message.Smaller_Image, true, pFile, pGroupId));
                 }
 
             }
@@ -521,7 +520,7 @@ namespace ChatController.HauptKlassen
             }
             else 
             {
-                Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, message.SmallerImage, true, pFileName, pGroupId));
+                Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, message.Smaller_Image, true, pFileName, pGroupId));
             }
         }
 
@@ -1290,13 +1289,13 @@ namespace ChatController.HauptKlassen
                 var clientZone = TimeZoneInfo.Local;
                 var formattedTime = TimeZoneInfo.ConvertTimeFromUtc(time, clientZone);
                 var isLoggedInUsersMessage = ChatDaten.Userid != null && message.UserId == ChatDaten.Userid.Value;
-                var messageText = message.Text ?? (string.IsNullOrEmpty(message.File) ? string.Empty : message.OriginalFilename);
+                var messageText = message.Text ?? (string.IsNullOrEmpty(message.File) ? string.Empty : message.Original_Filename);
 
                 if (!string.IsNullOrEmpty(message.File))
                 {
-                    Messages.Add(Constants.ImageFileExtensions.Contains(Path.GetExtension(message.File).ToUpperInvariant()) ?
-                        new ChatMessage(message.User_Name, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.SmallerImage), message.File, message.OriginalFilename, message.GroupId) :
-                        new ChatMessage(message.User_Name, messageText, formattedTime, message.SmallerImage, isLoggedInUsersMessage, message.File, message.GroupId));
+                    Messages.Add(Constants.ImageFileExtensions.Contains(Path.GetExtension(message.File).ToUpperInvariant()) ? //SmallerImage ist null
+                        new ChatMessage(message.User_Name, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.Smaller_Image), message.File, message.Original_Filename, message.GroupId) :
+                        new ChatMessage(message.User_Name, messageText, formattedTime, message.Smaller_Image, isLoggedInUsersMessage, message.File, message.GroupId));
                 }
                 else
                 {
diff --git a/ChatController/LoginKlassen/UserMessages.cs b/ChatController/LoginKlassen/UserMessages.cs
index 24dd7e8..8f4ac83 100644
--- a/ChatController/LoginKlassen/UserMessages.cs
+++ b/ChatController/LoginKlassen/UserMessages.cs
@@ -23,10 +23,10 @@
         public long Id { get; set; }
         public string Text { get; set; }
         public string File { get; set; }
-        public string OriginalFilename { get; set; }
-        public string SmallerImage { get; set; }
+        public string Original_Filename { get; set; }
+        public string Smaller_Image { get; set; }
         public LastMessageTimeStamp Timestamp { get; set; }
-        public long CreatedAt { get; set; }
+        public long Created_At { get; set; }
         public long UserId { get; set; }
         public string User_Name { get; set; }
         public string User_Picture { get; set; }