diff --git a/BeWo/View/ChatEmojisView.xaml b/BeWo/View/ChatEmojisView.xaml
index 4ea1f499b..d18a5c182 100644
--- a/BeWo/View/ChatEmojisView.xaml
+++ b/BeWo/View/ChatEmojisView.xaml
@@ -13,9 +13,9 @@
         <TabItem Header="1" x:Name="TabItem1" >
           <ListBox x:Name="EmojisListBox1" HorizontalAlignment="Left" Height="114" VerticalAlignment="Top" Width="285" ScrollViewer.HorizontalScrollBarVisibility="Disabled" SelectionChanged="OnEmojiClick" >
             <ListBox.ItemTemplate>
-              <DataTemplate  DataType="{x:Type view:DirectoryListing}">
+              <DataTemplate  DataType="{x:Type view:DirectoryListing}" >
                 <StackPanel Orientation="Vertical">
-                  <TextBlock Text="{Binding EmojiCode}" Height="22" Width="22" FontSize="18" Foreground="OrangeRed" />
+                  <TextBlock Text="{Binding EmojiCode}" Height="22" MinWidth="22" FontSize="18" Foreground="OrangeRed" Margin="1" />
                 </StackPanel>
               </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/BeWo/View/ChatEmojisView.xaml.cs b/BeWo/View/ChatEmojisView.xaml.cs
index 4001469f7..dfb2f96b7 100644
--- a/BeWo/View/ChatEmojisView.xaml.cs
+++ b/BeWo/View/ChatEmojisView.xaml.cs
@@ -55,12 +55,8 @@ namespace BeWo.View
 
         private void LoadEmojipicsInView()
         {
-
-            //Ordnungsgemäßes auslesen von Smileys.
-
-    //################## Normale Emojis #########################################################################
-#region Normale Spackos  check
-
+      
+#region Normale
 
             List<String> normal = new List<string>
             {
@@ -82,12 +78,9 @@ namespace BeWo.View
 
             TabItem1.Header = tabheader1;
 
-
 #endregion
 
-
-    //############################## Variable Emojis  #################################################################################################
-#region Variable Spackos
+#region Variable 
 
             List<String> variable = new List<string> { "D83DDE08", "D83DDC7F", "D83DDC79", "D83DDC7A", "D83DDC80","2620","D83DDC7B","D83DDC7D","D83DDC7E","D83DDCA9"};
 
@@ -100,10 +93,8 @@ namespace BeWo.View
       
 #endregion
 
-            //######################### Tier emojis   ####################################################
-
-#region Tier Spackos check
 
+#region Tier 
 
             List<String> tier = new List<string>
             {
@@ -121,26 +112,24 @@ namespace BeWo.View
                 EmojisListBox2.Items.Add(new DirectoryListing("", string.Join("", (from Match m in Regex.Matches(x, @"\S{4}")
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
-
-
-            
+ 
 #endregion
 
-    //#################################Menschen und ihre tücken##########################################################
-#region Mensch Spackos  
+    
+#region Mensch  
           
             List<String> mensch = new List<string>
             {
                 "D83DDC66","D83DDC67","D83DDC68","D83DDC69","D83DDC74","D83DDC75","D83DDC76","D83DDC7C","D83DDC6E","D83DDD75","D83DDC82","D83DDC77","D83DDC73",
                 "D83DDC71","D83CDF85","D83DDC78","D83DDC70","D83DDC72","D83DDE4D","D83DDE4E","D83DDE45","D83DDE46","D83DDC81","D83DDE4B","D83DDE47","D83DDC86",
                 "D83DDC87","D83DDEB6","D83CDFC3","D83DDC83","D83DDC6F","D83DDD74","D83DDDE3","D83DDC64","D83DDC65","D83DDC6B","D83DDC6C","D83DDC6D","D83DDC8F",
-                "D83DDC69 200D2764FE0F200DD83DDC8B200DD83DDC680009","D83DDC68200D2764FE0F200DD83DDC8B200DD83DDC68","D83DDC69200D2764FE0F200DD83DDC8B200DD83DDC690009",
-                "D83DDC91","D83DDC69200D2764FE0F200DD83DDC68","D83DDC68200D2764FE0F200DD83DDC680009","D83DDC69200D2764FE0F200DD83DDC690009",
-                "D83DDC6A0009","D83DDC68200DD83DDC69200DD83DDC660009","D83DDC68200DD83DDC69200DD83DDC670009","D83DDC68200DD83DDC69200DD83DDC67200DD83DDC6600090009",
-                "D83DDC68200DD83DDC69200DD83DDC66200DD83DDC6600090009","D83DDC68200DD83DDC69200DD83DDC67200DD83DDC6700090009","D83DDC68200DD83DDC68200DD83DDC660009",
-                "D83DDC68200DD83DDC68200DD83DDC6700090009","D83DDC68200DD83DDC68200DD83DDC67200DD83DDC6600090009","D83DDC68200DD83DDC68200DD83DDC66200DD83DDC6600090009",
-                "D83DDC68200DD83DDC68200DD83DDC67200DD83DDC670009","D83DDC69200DD83DDC69200DD83DDC660009","D83DDC69200DD83DDC69200DD83DDC6700090009",
-                "D83DDC69200DD83DDC69200DD83DDC67200DD83DDC66000900090009","D83DDC69200DD83DDC69200DD83DDC66200DD83DDC6600090009","D83DDC69200DD83DDC69200DD83DDC67200DD83DDC670009"           
+                "D83DDC69 200D2764FE0F200DD83DDC8B200DD83DDC68","D83DDC68200D2764FE0F200DD83DDC8B200DD83DDC68","D83DDC69200D2764FE0F200DD83DDC8B200DD83DDC69",
+                "D83DDC91","D83DDC69200D2764FE0F200DD83DDC68","D83DDC68200D2764FE0F200DD83DDC68","D83DDC69200D2764FE0F200DD83DDC69",
+                "D83DDC6A","D83DDC68200DD83DDC69200DD83DDC66","D83DDC68200DD83DDC69200DD83DDC67","D83DDC68200DD83DDC69200DD83DDC67200DD83DDC66",
+                "D83DDC68200DD83DDC69200DD83DDC66200DD83DDC66","D83DDC68200DD83DDC69200DD83DDC67200DD83DDC67","D83DDC68200DD83DDC68200DD83DDC66",
+                "D83DDC68200DD83DDC68200DD83DDC67","D83DDC68200DD83DDC68200DD83DDC67200DD83DDC66","D83DDC68200DD83DDC68200DD83DDC66200DD83DDC66",
+                "D83DDC68200DD83DDC68200DD83DDC67200DD83DDC67","D83DDC69200DD83DDC69200DD83DDC66","D83DDC69200DD83DDC69200DD83DDC67",
+                "D83DDC69200DD83DDC69200DD83DDC67200DD83DDC66","D83DDC69200DD83DDC69200DD83DDC66200DD83DDC66","D83DDC69200DD83DDC69200DD83DDC67200DD83DDC67"           
             };
 
             foreach (var x in mensch)
@@ -151,9 +140,7 @@ namespace BeWo.View
 
 #endregion
 
-
-            //########################## Zeichen Emojis ###################################################################################
-#region Zeichen Spackos
+#region Zeichen
 
             List<String> zeichen = new List<string>
             {
@@ -174,8 +161,6 @@ namespace BeWo.View
 
 #endregion
 
-
-            //################################# Nur die liebe zählt ###################################### 
 #region Nur die Liebe Zählt
 
             List<String> liebe = new List<string>
@@ -190,11 +175,9 @@ namespace BeWo.View
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
 
-#endregion
+#endregion          
 
-            //############################ Sonstige Scheiße ################################################
-
-#region Sonstiges Spacko
+#region Sonstiges 
 
             List<String> sonstiges = new List<string>
             {
@@ -208,12 +191,9 @@ namespace BeWo.View
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
 
+#endregion     
 
-#endregion
-
-            //########################### kleidung Scheiß ####################################################
-
-#region Kleidung Spakos
+#region Kleidung 
 
             List<String> kleidung = new List<string>
             {
@@ -227,14 +207,9 @@ namespace BeWo.View
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
 
-
 #endregion
 
-
-
-            //############################## Pflanzen Scheiße #################################################
-
-#region Pflanzen Spakos check
+#region Pflanzen 
 
             List<String> pflanzen = new List<string>
             {
@@ -256,9 +231,7 @@ namespace BeWo.View
 
 #endregion
 
-
-            //############################### narungs gedöns ######################################################
-#region Nahrung spakos check
+#region Nahrung 
 
             List<String> nahrung = new List<string>
             {
@@ -283,9 +256,7 @@ namespace BeWo.View
 
 #endregion
 
-            //################################### planet gedöns ######################################################
-
-#region planet spackos check
+#region planet
 
             List<String> planet = new List<string>
             {
@@ -300,19 +271,10 @@ namespace BeWo.View
 
                 
             }
-
-           // string tabheader8 = string.Join("", (from Match m in Regex.Matches("D83CDF0D", @"\S{4}")select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray());
-
-
-          //  TabItem8.Header = tabheader8;
 #endregion
 
 
-            //######################### Bauten Gedöns #############################################################################
-
-
-
-#region Tuck Tuck check
+#region Tuck Tuck 
 
             List<String> tucktuck = new List<string>
             {
@@ -337,7 +299,7 @@ namespace BeWo.View
 #endregion
 
 
-#region gebauten bauten kunst Spackos check
+#region Bauten kunst 
 
             List<String> bauten = new List<string>
             {
@@ -357,10 +319,7 @@ namespace BeWo.View
 #endregion
 
 
-          
-
-
-#region Klingel Bett UhrZeit wetter gedönse
+#region Klingel Bett UhrZeit wetter
 
 
             List<String> klingbett = new List<string>
@@ -379,11 +338,9 @@ namespace BeWo.View
                 EmojisListBox2.Items.Add(new DirectoryListing("", string.Join("", (from Match m in Regex.Matches(x, @"\S{4}")
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
-
-
 #endregion
 
-#region Party gedönse
+#region Party
 
             List<String> party = new List<string>
             {
@@ -398,13 +355,10 @@ namespace BeWo.View
                                                                                   select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray())));
             }
 
-
-
-
 #endregion
 
 
-#region Sport check
+#region Sport
 
             List<String> sport = new List<string>
             {
@@ -428,7 +382,7 @@ namespace BeWo.View
 #endregion
 
 
-#region Gaming Sound technik gedöns
+#region Gaming Sound technik
 
 
             List<String> gaming = new List<string>
@@ -523,29 +477,12 @@ namespace BeWo.View
 
 #endregion
 
-            //##############################################################################################################
-            // ausgewählte emojiss aus dem unicode implementieren 
-            // in eine Datenbank speichern und auslesen
-            // aber vorher ausgewählte emojis erstma in dem Ressource ordener. 
         }
 
 
         private void OnEmojiClick(object sender, RoutedEventArgs e)
         {
 
-            /*foreach (Object selecteditem in EmojisListBox.SelectedItems)
-            {
-                DirectoryListing Item = selecteditem as DirectoryListing;
-
-                if (Item.EmojiCode != "")
-                {
-                  //  string emoji = string.Join("", (from Match m in Regex.Matches(str, @"\S{4}")
-                  //                                 select (char)int.Parse(m.Value, NumberStyles.HexNumber)).ToArray());
-                  
-                    BeWoApp.MainControl.HomeView.ÜbergebeEmojiAnChatView(Item.EmojiCode,Item.Pfad);
-                }
-            }*/
-
             foreach (Object selecteditem in EmojisListBox1.SelectedItems)
             {
                 DirectoryListing Item = selecteditem as DirectoryListing;
@@ -617,17 +554,6 @@ namespace BeWo.View
                 }
             }
 
-          /*  foreach (Object selecteditem in EmojisListBox8.SelectedItems)
-            {
-                DirectoryListing Item = selecteditem as DirectoryListing;
-
-                if (Item.EmojiCode != "")
-                {
-                    BeWoApp.MainControl.HomeView.ÜbergebeEmojiAnChatView(Item.EmojiCode, Item.Pfad);
-                }
-            }*/
-
-
             EmojisListBox1.SelectedIndex = -1;
             EmojisListBox2.SelectedIndex = -1;
             EmojisListBox3.SelectedIndex = -1;
@@ -637,75 +563,9 @@ namespace BeWo.View
             EmojisListBox7.SelectedIndex = -1;
 
             ChatEmojiView.Activate();
-            /* EmojisListBox8.SelectedIndex = -1;
-            EmojisListBox.SelectedIndex = -1;*/
         }
-
-        //################################ Versuchsobjekte ############################################ 
-
-
-     /*   public string Encode(string str)
-        {
-            byte[] encbuff = System.Text.Encoding.UTF8.GetBytes(str);
-            return Convert.ToBase64String(encbuff);
-        }
-
-        public string Decode(string str)
-        {
-            byte[] decbuff = Convert.FromBase64String(str);
-            return System.Text.Encoding.UTF8.GetString(decbuff);
-        }*/
-
-
-
-
-       /* public static string ToBinary(string data, bool formatBits = true)
-        {
-            char[] buffer = new char[(((data.Length * 8) + (formatBits ? (data.Length - 1) : 0)))];
-            int index = 0;
-            for (int i = 0; i < data.Length; i++)
-            {
-                string binary = Convert.ToString(data[i], 2).PadLeft(8, '0');
-                for (int j = 0; j < 8; j++)
-                {
-                    buffer[index] = binary[j];
-                    index++;
-                }
-                if (formatBits && i < (data.Length - 1))
-                {
-                    buffer[index] = ' ';
-                    index++;
-                }
-            }
-            return new string(buffer);
-        }
-
-        public string ParseUnicodeHex(string hex)
-        {
-            var sb = new StringBuilder();
-            for (int i = 0; i < hex.Length; i += 4)
-            {
-                string temp = hex.Substring(i, 4);
-                char character = (char)Convert.ToInt16(temp, 16);
-                sb.Append(character);
-            }
-            return sb.ToString();
-        }
-
-
-        private string StringToHex(string hexstring)
-        {
-            var sb = new StringBuilder();
-            foreach (char t in hexstring)
-                sb.Append(Convert.ToInt32(t).ToString("x") + " ");
-            return sb.ToString();
-        }*/
-
     }
 
-
-    //<----- Versuchsobjekte ###################################
-
     public class DirectoryListing
     {
         public DirectoryListing(String pfad,String emojiCode)
diff --git a/BeWo/View/ChatView.xaml b/BeWo/View/ChatView.xaml
index 28f5dd2bd..79e271950 100644
--- a/BeWo/View/ChatView.xaml
+++ b/BeWo/View/ChatView.xaml
@@ -24,7 +24,7 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto"  />
                     </Grid.RowDefinitions>
 
                     <TextBox x:Name="Chatbox" HorizontalAlignment="Left" Margin="205,720,0,10" TextWrapping="Wrap" Text="Nachricht schreiben" 
@@ -41,7 +41,7 @@
                     </Button>
 
                 </Grid>
-                <!-- -->
+                
 
                 <ListBox x:Name="Chat" HorizontalAlignment="Left" Height="630" Margin="204,64,0,0" VerticalAlignment="Top" Width="581" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" SelectionMode="Extended" MouseRightButtonDown="OnRightClickEvent" >
                     <ListBox.ItemContainerStyle>
@@ -62,52 +62,75 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}">
-                                <DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >
-                                    <WrapPanel DockPanel.Dock="Top" >
-                                        <TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150"  TextAlignment="Left"/>
-                                        <TextBlock Text="{Binding SendTime}" Margin="2,0,0,5" MaxWidth="350"  HorizontalAlignment="Right" TextAlignment="Right"/>
-                                    </WrapPanel>
-                                    <TextBlock  VerticalAlignment="Center"  Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap"/>
-                                </DockPanel>
+                                <DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >                         
+    
+                                        <StackPanel DockPanel.Dock="Bottom" >
+                                          <TextBlock  VerticalAlignment="Center"  Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap" />                                                                          
+                                        </StackPanel>
+                                        
+                                        <StackPanel DockPanel.Dock="Left"  Margin="0,0,0,5">
+                                             <TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150" HorizontalAlignment="Left"  TextAlignment="Left" VerticalAlignment="Center"/>    
+                                        </StackPanel>
+                  
+                                        <StackPanel DockPanel.Dock="Right" Margin="5,0,0,5">
+                                          <TextBlock Text="{Binding SendTime}"  MaxWidth="350"   HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Center"/>                                    
+                                        </StackPanel>                                   
+                                  
+                            </DockPanel>
                             </Border>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
-                    <!--   <ListBox.ItemsPanel> falls der Text von unten kommen soll         500  Width="500" 300     username = Width 150
-                        <ItemsPanelTemplate>                                                                          sendtime = width 350
-                                                                                                                      MArgin 2
-                            <StackPanel VerticalAlignment="Bottom"/> 
+                    <!--  <ListBox.ItemsPanel>  falls der Text von unten kommen soll   
+                        <ItemsPanelTemplate>                                                     
+                                                                                                           
+                          <StackPanel VerticalAlignment="Bottom"/>     
                         </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>     MouseRightButtonDown="OnRightClickEvent" MouseLeftButtonDown="OnLeftClickEvent" aus Textblock wird richtextbox-->
+                    </ListBox.ItemsPanel>-->        
                 </ListBox>
 
-                <!--###################################### Liste aller User mit Chat Berechtigung ||  Background="Re" Opacity="1" || ######################################################-->
+                <!--###################################### Liste aller User mit Chat Berechtigung  ######################################################-->
 
                 <ListView x:Name="Clientlist" HorizontalAlignment="Left" Height="680" Margin="10,64,0,0" VerticalAlignment="Top" Width="190" SelectionChanged="ListBoxSelectedIndexChanged" Style="{DynamicResource ResourceKey=styleListBox}" ItemTemplate="{DynamicResource DataTemplate1}">
-                    <ListView.Resources>
-                        <DataTemplate x:Key="DataTemplate1">
-                            <Grid Background="{Binding Path=Color}">
+                    <ListView.Resources>                 
+                        <DataTemplate x:Key="DataTemplate1">                       
+                            <Grid>                                                                          
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="50"/>
+                                    <ColumnDefinition Width="15"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="22"/>
-                                </Grid.ColumnDefinitions>
-
+                                </Grid.ColumnDefinitions>  
+                              
+                                <Border BorderThickness="1" CornerRadius="3" Grid.RowSpan="2" Grid.ColumnSpan="4" Background="White"  >
+                                  <Border.BorderBrush>
+                                    <SolidColorBrush  Color="Black" />                           
+                                  </Border.BorderBrush>
+                                </Border> 
+                              
                                 <Ellipse Width='30' Height='30'>
                                     <Ellipse.Fill>
                                         <ImageBrush ImageSource='{Binding Image}'  Stretch='Fill' />
                                     </Ellipse.Fill>
                                 </Ellipse>
 
-                                <StackPanel Grid.Column="1" Margin="5" >
+                              
+                              <!--################################ Zu Test Zwecken ########################### -->  
+                                  <StackPanel Grid.Column="1" Height="30" >
+                                   <Ellipse Width='15' Height='15' Fill="{Binding Path=Color}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                </StackPanel>
+                                
+                              <!--############################################################################ -->
+                              
+                                <StackPanel Grid.Column="2" Margin="5" >
                                     <StackPanel Orientation="Horizontal" TextBlock.FontWeight="Bold" >
                                         <TextBlock Text="{Binding Path=Name, FallbackValue=FirstName}" />
                                     </StackPanel>
                                     <TextBlock Text="{Binding Path=StatusTyp, FallbackValue=Message}" />
                                 </StackPanel>
 
-                                <!--Für die anzeige der anzahl ungelesener Nachrichten -->
-                                <StackPanel Grid.Column="2" Margin="5">
-                                    <TextBlock Text="{Binding Path=Receivems}" FontWeight="Bold" Foreground="DarkRed"/>
+                                <!--Für die anzeige der anzahl ungelesener Nachrichten Height="30"-->
+                                <StackPanel Grid.Column="3" Margin="5">
+                                    <TextBlock Text="{Binding Path=Receivems}" FontWeight="Bold"  Foreground="DarkRed"  />
                                 </StackPanel>
 
                             </Grid>
@@ -127,7 +150,7 @@
                                                     <Expander.Header>
                                                         <StackPanel Orientation="Horizontal">
                                                             <TextBlock Text="{Binding Name}" FontWeight="Bold" Foreground="Black" FontSize="18" VerticalAlignment="Bottom" />
-                                                            <TextBlock Text="{Binding ItemCount}" FontSize="12" Foreground="DeepPink" FontWeight="Bold" FontStyle="Italic" Margin="10,0,0,0" VerticalAlignment="Bottom" />
+                                                            <TextBlock Text="{Binding ItemCount}" FontSize="12" Foreground="OrangeRed" FontWeight="Bold" FontStyle="Italic" Margin="10,0,0,0" VerticalAlignment="Bottom" />
 
                                                         </StackPanel>
                                                     </Expander.Header>
diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs
index 6bc8de0df..eaaf02205 100644
--- a/BeWo/View/ChatView.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -16,6 +16,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -32,8 +33,11 @@ using DevExpress.Xpf.Docking;
 using DevExpress.XtraPrinting.Native;
 using DevExpress.XtraPrinting.XamlExport;
 using Microsoft.Office.Interop.Word;
+using Brush = System.Windows.Media.Brush;
 using Color = System.Drawing.Color;
+using Image = System.Windows.Controls.Image;
 using Point = System.Windows.Point;
+using Size = System.Windows.Size;
 
 namespace BeWo.View
 {
@@ -500,6 +504,11 @@ namespace BeWo.View
                     ServiceFacade.DoEmployeeServiceSync(s => s.GetAllChatActiveEmployeesCompact());
                 var offklienten = ServiceFacade.DoCustomerServiceSync(s => s.GetAllChatActiveCustomersCompact());
 
+            /*   var employee = ServiceFacade.DoEmployeeServiceSync(
+                    s => s.GetEmployeeWithPersonOid(BeWoApp.LoggedOnUser.Employee.EmployeeOid));
+           
+                employee.Employee2CustomerList.Select(s => s.CustomerOid.Value);*/
+
                 StatusType Goff = StatusType.Offline;//"Offline";
 
                 foreach (var team in employeeteamoids)
@@ -517,6 +526,7 @@ namespace BeWo.View
                 }
                 foreach (var list in offklienten)
                 {
+
                     Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName + " " + list.LastName, Goff,
                         BuildImg(ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerImage(list.CustomerOid))),
                         list.PersonOid, ChatType.Klienten,list));
@@ -1030,7 +1040,7 @@ namespace BeWo.View
                 }
                 else
                 {
-                    SaveChatMessageinDB(BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, msg, 0, type);
+                    SaveChatMessageinDB(BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, msg, false, type);
                 }
             }
             catch (Exception xe)
@@ -1049,7 +1059,7 @@ namespace BeWo.View
             }
         }
 
-        public void SaveChatMessageinDB(long senderoid, long empfangid, string message, int istZugestellt, ChatType type)
+        public void SaveChatMessageinDB(long senderoid, long empfangid, string message, bool istZugestellt, ChatType type)
         {
             try
             {
@@ -1275,7 +1285,7 @@ namespace BeWo.View
             }
             else if (statustyp == StatusType.Offline)
             {
-                this.Color = new SolidColorBrush(Colors.Red);
+                this.Color = new SolidColorBrush(Colors.Red);      
             }
             else
             {