diff --git a/ChatController/ChatKlassen/ChatMessage.cs b/ChatController/ChatKlassen/ChatMessage.cs
index 73edc01..3113f7c 100644
--- a/ChatController/ChatKlassen/ChatMessage.cs
+++ b/ChatController/ChatKlassen/ChatMessage.cs
@@ -137,11 +137,6 @@ namespace ChatController.ChatKlassen
             {
                 if (word.IndexOfAny(@":.\/".ToCharArray()) != -1)
                 {
-                    if (Uri.IsWellFormedUriString(word, UriKind.Absolute))
-                    {
-                        return word.StartsWith("http://");
-                    }
-                    
                     if (UrlRegex.IsMatch(word))
                     {
                         var uri = new Uri(word, UriKind.RelativeOrAbsolute);
diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index ee0dfe9..1bdb4cd 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -198,7 +198,7 @@ namespace ChatController.HauptKlassen
 
             if (_UserMessages != null && _UserMessages.Response.Messages.Length > 0)
             {
-                timespan = _UserMessages.Response.Messages.First().Created_At;
+                timespan = _UserMessages.Response.Messages.First().CreatedAt;
             }
 
             if (pCurrentContact != null)
@@ -473,7 +473,7 @@ namespace ChatController.HauptKlassen
                             
                             filename = filename.Replace(".bmp", ".jpg");
 
-                            Messages.Add(new ChatMessage(message.User_Name, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId));
+                            Messages.Add(new ChatMessage(message.UserName, filename, sendTime, true, bitmapImage, pFile, filename, pGroupId));
                         }
                     }
                   
@@ -482,7 +482,7 @@ namespace ChatController.HauptKlassen
                 }
                 else
                 {
-                    Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFile), sendTime, message.Smaller_Image, true, pFile, pGroupId));
+                    Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFile), sendTime, message.SmallerImage, true, pFile, pGroupId));
                 }
 
             }
@@ -515,11 +515,11 @@ namespace ChatController.HauptKlassen
                 memoryStream.Close();
                 ImageSource logo = bitmapImage;
 
-                Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId));
+                Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, true, logo, pFileName, Path.GetFileName(pFileName), pGroupId));
             }
             else 
             {
-                Messages.Add(new ChatMessage(message.User_Name, Path.GetFileName(pFileName), sendtime, message.Smaller_Image, true, pFileName, pGroupId));
+                Messages.Add(new ChatMessage(message.UserName, Path.GetFileName(pFileName), sendtime, message.SmallerImage, true, pFileName, pGroupId));
             }
         }
 
@@ -1288,17 +1288,17 @@ 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.Original_Filename);
+                var messageText = message.Text ?? (string.IsNullOrEmpty(message.File) ? string.Empty : message.OriginalFilename);
 
                 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.Smaller_Image), message.File, message.Original_Filename, message.GroupId) :
-                        new ChatMessage(message.User_Name, messageText, formattedTime, message.Smaller_Image, isLoggedInUsersMessage, message.File, message.GroupId));
+                        new ChatMessage(message.UserName, messageText, formattedTime, isLoggedInUsersMessage, DownloadImage(message.SmallerImage), message.File, message.OriginalFilename, message.GroupId) :
+                        new ChatMessage(message.UserName, messageText, formattedTime, message.SmallerImage, isLoggedInUsersMessage, message.File, message.GroupId));
                 }
                 else
                 {
-                    Messages.Add(new ChatMessage(message.User_Name, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId));
+                    Messages.Add(new ChatMessage(message.UserName, message.Text, formattedTime, isLoggedInUsersMessage, message.GroupId));
                 }
             }
         }
diff --git a/ChatController/LoginKlassen/UserMessages.cs b/ChatController/LoginKlassen/UserMessages.cs
index a8848ee..0666154 100644
--- a/ChatController/LoginKlassen/UserMessages.cs
+++ b/ChatController/LoginKlassen/UserMessages.cs
@@ -23,12 +23,12 @@
         public long Id { get; set; }
         public string Text { get; set; }
         public string File { get; set; }
-        public string Original_Filename { get; set; }
-        public string Smaller_Image { get; set; }
+        public string OriginalFilename { get; set; }
+        public string SmallerImage { get; set; }
         public LastMessageTimeStamp Timestamp { get; set; }
-        public long Created_At { get; set; }
+        public long CreatedAt { get; set; }
         public long UserId { get; set; }
-        public string User_Name { get; set; }
+        public string UserName { get; set; }
         public string UserPicture { get; set; }
         public long GroupId { get; set; }
     }