diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index e578cd2ca..3443b90cb 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -2386,12 +2386,14 @@
   <ItemGroup>
     <Resource Include="BeWoPlaner.ico" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Resource Include="Ressources\Icons\delete.png" />
     <Resource Include="Ressources\Icons\edit.png" />
     <Resource Include="Ressources\Icons\new.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\trauriges-smiley.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs
index 7ea221032..590d61053 100644
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -82,11 +82,11 @@ namespace BeWo
 
             try
             {
-                if (BeWoApp.MainControl.HomeView.clientSocket.Connected)
-                {
+               // if (BeWoApp.MainControl.HomeView.clientSocket.Connected)
+               // {
                     BeWoApp.MainControl.HomeView.CloseServerConnection();
                    
-                }
+               // }
             }
             catch (Exception edf)
             {
diff --git a/BeWo/View/ChatDokumentationsView.xaml.cs b/BeWo/View/ChatDokumentationsView.xaml.cs
index f208654cc..5d82ae403 100644
--- a/BeWo/View/ChatDokumentationsView.xaml.cs
+++ b/BeWo/View/ChatDokumentationsView.xaml.cs
@@ -21,7 +21,9 @@ using System.Text;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Media.Imaging;
+using BeWo.Core.Service;
 using BeWo.View.Detail;
+using BeWo.ViewModel.ListViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
@@ -40,14 +42,14 @@ namespace BeWo.View
 
         private ServiceRecordVM serviceRecord;
 
-        public ChatDokumentationsView(List<KontakMessageBuilder> _listarray, long? _loggedOnMitarbeiter,long _customerPersonOid)
+        public ChatDokumentationsView(List<KontakMessageBuilder> _listarray, long? _loggedOnMitarbeiter,long _customerPersonOid,CompactCustomerDC _compactCustomer)
         {
             InitializeComponent();
 
             listarray = _listarray;
             loggedOnMitarbeiter = _loggedOnMitarbeiter;
 
-            ServiceRecordEditView newView = new ServiceRecordEditView();
+            
 
             long? customerOid = _customerPersonOid;
             string message = "";
@@ -71,91 +73,89 @@ namespace BeWo.View
                 dt = new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0);
                 return dt;
             }); 
+            CompactCustomerDC customerCompact = _compactCustomer;
+
+            Cache.GetInstance().GetActiveSupportConceptCostbearer(scList => 
+                VMFactory.CreateServiceRecordVMAsync(
+                        BeWoApp.LoggedOnUser.Employee.EmployeeOid,
+                        vm => this.Dispatch(
+                            delegate
+                            {
+                                ServiceRecordEditView newView = new ServiceRecordEditView();
+
+                                vm.DispatcherObject = this;
+
+                                var dc = new ServiceRecordDC();
+                                dc.Start = firstTime;                          
+                                dc.End = lastTime;
+                                dc.Employee = BeWoApp.LoggedOnUser.Employee;
+                                dc.Customer = customerCompact;
+                                dc.SupportConcept = HoleHilfeplanAusListe(scList, customerCompact, firstTime, lastTime);
+
+                                if (vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
+                                {
+                                    var cat1 = vm.PrototypeVM.SortedCategories[0];
+
+                                    dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
+                                }
+                                serviceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals);
+                                serviceRecord.Notice = message;
+                           
+                                newView.InitView(vm, serviceRecord,false);
+                                if (customerCompact != null)
+                                {
+                                    newView.SetSearchText(customerCompact.LastName);
+                                }
+                                else
+                                {
+                                    newView.SetSearchText("");
+                                }
+
+                                if (newView.CommandBindings.Count == 0)
+                                {
+                                    newView.CommandBindings.Add(
+                                        new CommandBinding(
+                                            ApplicationCommands.Close,
+                                            (s, e) =>
+                                            {
+                                                if (!newView.DoSaveCheck())
+                                                {
+                                                    return;
+                                                }
+
+                                                Close();
+                                            }));
+                                    newView.CommandBindings.Add(
+                                        new CommandBinding(
+                                            ApplicationCommands.Save,
+                                            (s, e) =>
+                                            {
+                                                bool save = newView.IsValid();
+
+                                                if (!save)
+                                                {
+                                                    return;
+                                                }
+
+                                                newView.SaveData();
+                                                Close();
+
+                                            }));
+                                }
+
+
+                                popup_contentChat.Child = newView;
+
+                                popup_contentChat.Visibility = Visibility.Visible;
+                            
+                                
+
+                                //newView.SetStartTimeEndTime(first, last);
+                                //newView.SetLoggedOnEmployee();
+
+                            })));
 
             
-            CustomerDC customer;
-            CompactCustomerDC customerCompact = null;
-
-            if (customerOid.HasValue)
-            {
-                customer = ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerWithPersonOid(customerOid.Value));
-
-                customerCompact =
-                    ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer.CustomerOid.Value));
-            }
-
-            VMFactory.CreateServiceRecordVMAsync(
-                    BeWoApp.LoggedOnUser.Employee.EmployeeOid,
-                    vm => this.Dispatch(
-                        delegate
-                        {
-                            vm.DispatcherObject = this;
-
-                            var dc = new ServiceRecordDC();
-                            dc.Start = firstTime;                          
-                            dc.End = lastTime;
-                            dc.Employee = BeWoApp.LoggedOnUser.Employee;
-                            dc.Customer = customerCompact;
-
-                            if (vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0)
-                            {
-                                var cat1 = vm.PrototypeVM.SortedCategories[0];
-
-                                dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0];
-                            }
-                            serviceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals);
-                            serviceRecord.Notice = message;
-                           
-                            newView.InitView(vm, serviceRecord,false);
-                            if (customerCompact != null)
-                            {
-                                newView.SetSearchText(customerCompact.LastName);
-                            }
-                            else
-                            {
-                                newView.SetSearchText("");
-                            }
-
-                            //newView.SetStartTimeEndTime(first, last);
-                            newView.SetLoggedOnEmployee();
-                        }));
-
-            if (newView.CommandBindings.Count == 0)
-            {
-                newView.CommandBindings.Add(
-                    new CommandBinding(
-                        ApplicationCommands.Close,
-                        (s, e) =>
-                        {
-                            if (!newView.DoSaveCheck())
-                            {
-                                return;
-                            }
-
-                            Close();
-                        }));
-                newView.CommandBindings.Add(
-                    new CommandBinding(
-                        ApplicationCommands.Save,
-                        (s, e) =>
-                        {
-                            bool save = newView.IsValid();
-                            
-                            if (!save)
-                            {
-                                return;
-                            }
-
-                            newView.SaveData();
-                            Close();
-
-                        }));
-            }
-
-
-            popup_contentChat.Child = newView;
-
-            popup_contentChat.Visibility = Visibility.Visible;
 
 
 
@@ -170,7 +170,24 @@ namespace BeWo.View
             SetChatSetting();*/
         }
 
+        private CompactSupportConceptDC HoleHilfeplanAusListe(List<CompactSupportConceptDC> scList, CompactCustomerDC customerCompact, DateTime firstTime, DateTime lastTime)
+        {
+            foreach (var sc in scList)
+            {
+                if (sc.Customer.Oid == customerCompact.Oid)
+                {
+                    if (sc.StartDate.HasValue && sc.EndDate.HasValue && sc.StartDate <= lastTime &&
+                        sc.EndDate >= firstTime)
+                    {
+                        return sc;
+                    }
+                }
+            }
 
+            return null;
+        }
+
+        
 
         private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
diff --git a/BeWo/View/ChatView.xaml b/BeWo/View/ChatView.xaml
index 81f5a9b90..99f7ba591 100644
--- a/BeWo/View/ChatView.xaml
+++ b/BeWo/View/ChatView.xaml
@@ -18,8 +18,8 @@
                     </TextBox.Resources>
                 </TextBox>
 
-                <TextBox x:Name="Chatbox" HorizontalAlignment="Left" Margin="204,720,0,10" TextWrapping="Wrap"
-                         VerticalContentAlignment="Center" Width="432" Height="25" ToolTip="Schreiben Sie hier eine Nachricht hinein" KeyDown="OnKeyDownHandler" GotFocus="OnFocus"   Text="Nachricht schreiben" Foreground="DarkGray" >
+                <TextBox x:Name="Chatbox" HorizontalAlignment="Left" Margin="248,720,0,10" TextWrapping="Wrap"
+                         VerticalContentAlignment="Center" Width="388" Height="25" ToolTip="Schreiben Sie hier eine Nachricht hinein" KeyDown="OnKeyDownHandler" GotFocus="OnFocus"   Text="Nachricht schreiben" Foreground="DarkGray" >
                     <TextBox.Resources>
                         <Style TargetType="{x:Type Border}">
                             <Setter Property="CornerRadius" Value="3"/>
@@ -28,7 +28,7 @@
                     </TextBox.Resources>
                 </TextBox>
 
-                <ListBox x:Name="Chat" HorizontalAlignment="Left" Height="630" Margin="204,64,0,0" VerticalAlignment="Top" Width="581" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" SelectionMode="Multiple" >
+                <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>
                         <Style TargetType="ListBoxItem">
                             <!--<Setter Property="IsEnabled" Value="False" />
@@ -166,11 +166,13 @@
         </ListBox>
 
 
-        <Button Style="{DynamicResource IconButtonStyle}" x:Name="ButtonAlarmLabel" Background="Transparent" BorderBrush="Transparent" Click="ReConnect"  HorizontalAlignment="Left" Height="20" Margin="725,10,0,0" VerticalAlignment="Top" Width="20" Visibility="Collapsed" >
+        <Button Style="{DynamicResource IconButtonStyle}" x:Name="ButtonAlarmLabel" Background="Transparent" BorderBrush="Transparent"  HorizontalAlignment="Left" Height="20" Margin="725,10,0,0" VerticalAlignment="Top" Width="20" Visibility="Collapsed" >
             <Image x:Name="AlarmLabel" ToolTip="Zurzeit nicht Verbunden" Source=""   />
         </Button>
-      <Border x:Name="popup_contentChat" />
-    </Grid>  
+      <!-- <Button HorizontalAlignment="Left"  Margin="210,756,0,10" VerticalAlignment="Top" Width="25" Height="25">
+          <Image x:Name="Smiley" ToolTip="Zurzeit nicht zurechnungsfähig" Source="/BeWoPlaner;component/Ressources/Icons/trauriges-smiley.png"  />
+        </Button> -->       
+    </Grid>
 </Window>
 
 
diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs
index 0b1615eaa..620563979 100644
--- a/BeWo/View/ChatView.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -57,8 +57,8 @@ namespace BeWo.View
 
             this.tcpClient = tcpClient;
 
-            closeWindow();
-            LoadallChatKontakts();
+            CloseWindow();
+            LoadallChatKontakts(); //--> erst laden wenn link gedrückt 
             ErstelleContextMenue();
             SetChatSetting();
         }
@@ -81,7 +81,7 @@ namespace BeWo.View
             }
         }
 
-        public void updateTCp(TcpClient tcpClient)
+        public void UpdateTcp(TcpClient tcpClient)
         {
             this.tcpClient = tcpClient;
         }
@@ -96,7 +96,7 @@ namespace BeWo.View
             catch (Exception) { }
         }
 
-        public void closeWindow()
+        public void CloseWindow()
         {
             CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) =>
             {
@@ -129,7 +129,6 @@ namespace BeWo.View
                         curItem.Receivems = "";
 
                         Chat.Items.Add(new KontakMessageBuilder(nameclient, text, DateTime.Now.ToString(), personoid));
-                        //SaveChatMessageinDB(personoid,BeWoApp.LoggedOnUser.Employee.PersonOid, text);
 
                         Chat.Items.MoveCurrentToLast();
                         Chat.ScrollIntoView(Chat.Items.CurrentItem);
@@ -151,8 +150,7 @@ namespace BeWo.View
                         }
                     }
 
-                    view.Refresh();
-                    //SaveChatMessageinDB(personoid, BeWoApp.LoggedOnUser.Employee.PersonOid, text);           
+                    view.Refresh();           
                 }
             }
             catch (Exception edf)
@@ -168,17 +166,16 @@ namespace BeWo.View
                 foreach (var abc in ita)
                 {
 
-                    if (abc.EmpfaengerOid == personoid && abc.TypeChat == type /*  type == ChatType.Team*/)
+                    if (abc.EmpfaengerOid == personoid && abc.TypeChat == type)
                     {
                         int x;
                         bool wasdrin = int.TryParse(abc.Receivems, out x);
 
                         if (wasdrin)
                         {
-                            //x = int.TryParse(abc.Receivems,);
                             x++;
                             abc.Receivems = x.ToString();
-                            //abc.Receivems = abc.Receivems++;x++.ToString();
+                         
                         }
                         else
                             abc.Receivems = 1.ToString();
@@ -213,7 +210,7 @@ namespace BeWo.View
                 {
                     var mitarbeiter = ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeWithPersonOid(personoid));
 
-                    KontaktlistBuilder konbuild = new KontaktlistBuilder(clientname, "Online", BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(mitarbeiter.EmployeeOid.Value))), personoid, ChatType.Mitarbeiter);
+                    KontaktlistBuilder konbuild = new KontaktlistBuilder(clientname, "Online", BuildImg(mitarbeiter.EmployeeImage), personoid, ChatType.Mitarbeiter);
 
                     var zugehorigkeit = ServiceFacade.DoEmployeeServiceSync(s => s.GetTeamOidsByEmployee(personoid));
 
@@ -240,7 +237,15 @@ namespace BeWo.View
 
                     var klienten = ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerWithPersonOid(personoid));
 
-                    KontaktlistBuilder konbuild = new KontaktlistBuilder(clientname, "Online", BuildImg(ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerImage(klienten.CustomerOid.Value))), personoid, ChatType.Klienten);
+                    CompactCustomerDC customerCompact = new CompactCustomerDC();
+                    customerCompact = new CompactCustomerDC();
+                    customerCompact.CustomerOid = klienten.CustomerOid.Value;
+                    customerCompact.PersonOid = klienten.PersonOid.Value;
+                    customerCompact.FirstName = klienten.FirstName;
+                    customerCompact.LastName = klienten.LastName;
+                    customerCompact.DateOfBirth = klienten.DateOfBirth;
+
+                    KontaktlistBuilder konbuild = new KontaktlistBuilder(clientname, "Online", BuildImg(klienten.CustomerImage), personoid, ChatType.Klienten, customerCompact);
 
                     foreach (var variable in ita)
                     {
@@ -397,9 +402,7 @@ namespace BeWo.View
                     KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
 
                     SendMessage(curItem.EmpfaengerOid, curItem.TypeChat);
-
-                    // SaveChatMessageinDB(BeWoApp.LoggedOnEmployee.PersonOid.Value,curItem.EmpfaengerOid, Chatbox.Text);
-
+               
                     Chat.Items.MoveCurrentToLast();
                     Chat.ScrollIntoView(Chat.Items.CurrentItem);
 
@@ -451,8 +454,6 @@ namespace BeWo.View
 
                         SendMessage(curItem.EmpfaengerOid, curItem.TypeChat);
 
-                        //  SaveChatMessageinDB(BeWoApp.LoggedOnEmployee.PersonOid.Value, curItem.EmpfaengerOid, Chatbox.Text);
-
                         Chat.Items.MoveCurrentToLast();
                         Chat.ScrollIntoView(Chat.Items.CurrentItem);
 
@@ -504,7 +505,7 @@ namespace BeWo.View
                 {
                     Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName + " " + list.LastName, Goff,
                         BuildImg(ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerImage(list.CustomerOid))),
-                        list.PersonOid, ChatType.Klienten));
+                        list.PersonOid, ChatType.Klienten,list));
                 }
 
 
@@ -588,7 +589,7 @@ namespace BeWo.View
                     {
                         ita.Add(new KontaktlistBuilder(var.FirstName + " " + var.LastName, "Offline",
                         BuildImg(ServiceFacade.DoCustomerServiceSync(s => s.GetCustomerImage(var.CustomerOid))),
-                        var.PersonOid, ChatType.Klienten));
+                        var.PersonOid, ChatType.Klienten,var));
                         view.Refresh();
                     }
 
@@ -653,7 +654,7 @@ namespace BeWo.View
                     else if (type == DataIdentifier.StatusNotificationOnline)
                         list.Lastms = "Online";
                     else if (type == DataIdentifier.StatusNotificationOffline)
-                        list.Lastms = "Offline";  //<---  Muss noch überdacht werden villeicht bei offlien ein Dellet LoggedOffUser oder so 
+                        list.Lastms = "Offline";  //<--- testen
                 }
 
             }
@@ -682,15 +683,11 @@ namespace BeWo.View
                 icon.SetSize(new Size(16, 16));
                 item1.Icon = icon;
 
-               // context.StaysOpen = false;
-                //context.StaysOpen
 
                 Chat.ContextMenu = context;
-
             }
             catch (Exception edf)
             {
-
                 MessageBox.Show("Beim Setzen einer Neuen Chat Einstellung ist ein Fehler aufgetreten. " + edf.Message + "\n" + edf.StackTrace, "Fehler: 2380 ", MessageBoxButton.OK);
             }
 
@@ -700,8 +697,7 @@ namespace BeWo.View
         {
             List<KontakMessageBuilder> itemListe = new List<KontakMessageBuilder>();
 
-           // bool ungelesenachricht = false;
-
+         
             KontakMessageBuilder Item;
             foreach (Object selecteditem in Chat.SelectedItems)
             {
@@ -709,21 +705,21 @@ namespace BeWo.View
               
                 if (Item.MessagePersonOid != 0)
                 {
-                    //ungelesenachricht = true;
                     itemListe.Add(Item);
                 }
                      
             }
 
-            if(itemListe.Count !=0 /*&& ungelesenachricht == false*/){
+            if(itemListe.Count !=0){
                 KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
 
                 if (curItem.TypeChat != ChatType.Team && curItem.TypeChat != ChatType.Mitarbeiter)
                 {
-                    ChatDokumentationsView newView = new ChatDokumentationsView(itemListe, BeWoApp.LoggedOnUser.Employee.PersonOid, curItem.EmpfaengerOid);
+                    ChatDokumentationsView newView = new ChatDokumentationsView(itemListe, BeWoApp.LoggedOnUser.Employee.PersonOid, curItem.EmpfaengerOid,curItem.Customer);
 
-                    newView.Visibility = Visibility.Visible;
-                    newView.Activate();
+                 
+                    //newView.Activate();
+                    newView.ShowDialog();
 
                     Chat.SelectedIndex = -1;
                 }
@@ -734,10 +730,6 @@ namespace BeWo.View
             }
             else
             {
-                /*if(ungelesenachricht)
-                {
-                    MessageBox.Show("Die Info - Ungelesene Nachrichten - kann nicht mit in die Dokumentation eingebunden werden. Bitte wählen sie diese ab.", "Info", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-                }else*/
                     MessageBox.Show("Sie müssen für diese art von Dokumentation Chat-Nachrichten auswählen.", "Info", MessageBoxButton.OK, MessageBoxImage.Exclamation);
             }
             itemListe.Clear();
@@ -841,15 +833,22 @@ namespace BeWo.View
                         Chat.Items.Clear();
                         blub.Receivems = "";
 
-                        AktChatUser.Items.Add(new KontaktlistBuilder(blub.Name, blub.Lastms, blub.Image, blub.EmpfaengerOid, blub.TypeChat));
+                        if (blub.TypeChat == ChatType.Klienten)
+                        {
+                            AktChatUser.Items.Add(new KontaktlistBuilder(blub.Name, blub.Lastms, blub.Image, blub.EmpfaengerOid, blub.TypeChat,blub.Customer));
+                        }
+                        else
+                        {
+                            AktChatUser.Items.Add(new KontaktlistBuilder(blub.Name, blub.Lastms, blub.Image, blub.EmpfaengerOid, blub.TypeChat));
+                        }
+                        
                         LoadChatMessagefromDB(BeWoApp.LoggedOnEmployee.PersonOid.Value, blub.EmpfaengerOid, blub);
 
-                      
-                        
+                     
                         if (blub.TypeChat == ChatType.Klienten)
                         {
                             context.Visibility = Visibility.Visible;
-                            Chat.SelectionMode = SelectionMode.Multiple;
+                            Chat.SelectionMode = SelectionMode.Extended;
                             Chat.Focusable = true;
                         }
                         else
@@ -892,10 +891,15 @@ namespace BeWo.View
                         curItem.Receivems = "";
                     }
 
-                    ChatType a = curItem.TypeChat;
-
-                    AktChatUser.Items.Add(new KontaktlistBuilder(curItem.Name, curItem.Lastms, curItem.Image, curItem.EmpfaengerOid, curItem.TypeChat));
-
+                    if (curItem.TypeChat == ChatType.Klienten)
+                    {
+                        AktChatUser.Items.Add(new KontaktlistBuilder(curItem.Name, curItem.Lastms, curItem.Image, curItem.EmpfaengerOid, curItem.TypeChat,curItem.Customer));
+                    }
+                    else
+                    {
+                        AktChatUser.Items.Add(new KontaktlistBuilder(curItem.Name, curItem.Lastms, curItem.Image, curItem.EmpfaengerOid, curItem.TypeChat));
+                    }
+                    
 
                     LoadChatMessagefromDB(BeWoApp.LoggedOnEmployee.PersonOid.Value, curItem.EmpfaengerOid, curItem);
                     Chat.Items.MoveCurrentToLast();
@@ -906,7 +910,7 @@ namespace BeWo.View
                     if (curItem.TypeChat == ChatType.Klienten)
                     {
                         context.Visibility = Visibility.Visible;
-                        Chat.SelectionMode = SelectionMode.Multiple;
+                        Chat.SelectionMode = SelectionMode.Extended;
                         Chat.Focusable = true;
                     }
                     else
@@ -976,29 +980,6 @@ namespace BeWo.View
             ButtonAlarmLabel.Visibility = Visibility.Visible;
         }
 
-
-        public void ReConnect(object sender, EventArgs e)
-        {
-            try
-            {
-                /*if (MessageBox.Show("Versuchen eine Verbindung aufzubauen?", "Verbinden ?",     // Aktivieren wenn gewünscht. 
-                    MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
-                {
-                    //Es werden mehrer Threads Erstellt die dann nach und nach versuchen eine Verbindung aufzubauen, zu lasten der cpu, 
-                    //entweder nur anzeigen das man nicht verbunden ist oder eine zwischen lösung finden. 
-
-
-
-                    BeWoApp.MainControl.HomeView.ReconnectServer();    
-                }*/
-            }
-            catch (Exception edf)
-            {
-                MessageBox.Show("Erneute Verbindung Fehlgeschlagen", "Fehler 2360", MessageBoxButton.OK);
-            }
-        }
-
-
         public void SendMessage(long empfängeroid, ChatType type)
         {
             try
@@ -1036,7 +1017,6 @@ namespace BeWo.View
                 else
                 {
                     SaveChatMessageinDB(BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, msg, 0, type);
-                    MessageBox.Show("Die Daten werden in der Datenbank Gespeichert, da der Server nicht zur Verfügung steht.", "Info ", MessageBoxButton.OK);
                 }
             }
             catch (Exception xe)
@@ -1186,86 +1166,15 @@ namespace BeWo.View
             }
         }
 
-        /*   private void OnDefocus(object sender, EventArgs e)
-           {
-               try
-               {
-                   if (Chatbox.Text.Equals(""))
-                   {
-                      /* Chatbox.Text = "Nachricht schreiben";
-                       Chatbox.Foreground = new SolidColorBrush(Colors.DarkGray);
-                   }
-               }
-               catch (Exception edf)
-               {
-                   MessageBox.Show("Fehler beim De-Fokusieren der Nachrichten Leiste.", "Fehler: 2340 ", MessageBoxButton.OK);
-               }
-           }*/
-
-
-        //Rechte Maus Taste an dem Chat 
-      /*  public void OnRightClickEvent(object sender, RoutedEventArgs e)
-        {
-
-            if (AktChatUser.Items.Count != 0)
-            {
-                KontaktlistBuilder vv = (KontaktlistBuilder)AktChatUser.Items[0];
-
-                if (vv.TypeChat == ChatType.Mitarbeiter)
-                {
-                    context.Visibility = Visibility.Collapsed;
-                    Chat.SelectionMode = SelectionMode.Single;
-                    Chat.Focusable = false;
-                }
-                else if (vv.TypeChat == ChatType.Team)
-                {                 
-                    context.Visibility = Visibility.Collapsed;
-                    Chat.SelectionMode = SelectionMode.Single;
-                    Chat.Focusable = false;
-                }else
-                {              
-                    context.Visibility = Visibility.Visible;
-                    Chat.SelectionMode = SelectionMode.Multiple;
-                    Chat.Focusable = true;    
-                }    
-            }
-            else
-            {
-                context.Visibility = Visibility.Collapsed;
-            }
-        }
-
-        //Linke Maustaste an dem Chat
-        public void OnLeftClickEvent(object sender, RoutedEventArgs e)
-        {
-            if (AktChatUser.Items.Count != 0)
-            {
-                KontaktlistBuilder vv = (KontaktlistBuilder)AktChatUser.Items[0];
-
-                if (vv.TypeChat == ChatType.Mitarbeiter)
-                {
-                    context.Visibility = Visibility.Collapsed;        
-                    Chat.SelectionMode = SelectionMode.Single;             
-                    Chat.Focusable = false;
-                }
-                else if (vv.TypeChat == ChatType.Team)
-                {
-                    context.Visibility = Visibility.Collapsed;        
-                    Chat.SelectionMode = SelectionMode.Single;                
-                    Chat.Focusable = false;             
-                }
-                else
-                {
-                    context.Visibility = Visibility.Visible;        
-                    Chat.SelectionMode = SelectionMode.Multiple;
-                    Chat.Focusable = true;       
-                }
-            }        
-        }*/
 
+       //Rechte Maus Taste an dem Chat 
+       public void OnRightClickEvent(object sender, RoutedEventArgs e)
+       {
+           e.Handled = true;
+       }
+       
     }
 
-    //KontaklisteFormat und KontaktMessageBuilder Klasse
     public class KontaktlistBuilder : INotifyPropertyChanged
     {
         public KontaktlistBuilder(string name, string lastms, ImageSource image, long empfaengerid, ChatType typeChat)
@@ -1279,6 +1188,18 @@ namespace BeWo.View
             TypeChat = typeChat;
         }
 
+        public KontaktlistBuilder(string name, string lastms, ImageSource image, long empfaengerid, ChatType typeChat, CompactCustomerDC customer)
+        {
+            this.Customer = customer;
+            this.Name = name;
+            this.Lastms = lastms;
+            this.Image = image;
+            this.EmpfaengerOid = empfaengerid;
+
+            Receivems = "";
+            TypeChat = typeChat;
+        }
+
         public string Name { get; private set; }
 
         private string _lastms;
@@ -1292,6 +1213,9 @@ namespace BeWo.View
         public string Receivems { get { return _receivems; } set { _receivems = value; OnPropertyChanged("Receivems"); } }
 
         public ChatType TypeChat { get; set; }
+
+        public CompactCustomerDC Customer { get; set; }
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         protected virtual void OnPropertyChanged(string propertyName)
@@ -1315,6 +1239,5 @@ namespace BeWo.View
         public string UserMessage { get; private set; }
         public string SendTime { get; private set; }
         public long MessagePersonOid { get; private set; }
-
     }
 }
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
index 796f9069c..52a82c3ed 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs
@@ -82,6 +82,23 @@ namespace BeWo.View.Detail
         public void InitView(ServiceRecordListVM pListViewModel, ServiceRecordVM pSCViewModel, bool hideCustomerCombo)
         {
             InitializeComponent();
+            if (!hideCustomerCombo)
+            {
+                supportConceptSelectionControl.Loaded += (s, e) => SetSelectedCustomerNode();
+
+                combobox_services.SelectionChanged += (s, e) =>
+                {
+                    if (combobox_services.SelectedIndex == -1)
+                        combobox_services.SelectedIndex = 0;
+                };
+            }
+            else
+            {
+                supportConceptSelectionControl.Visibility = Visibility.Collapsed;
+                customerComboColumn.Width = new GridLength(0);
+            }
+
+
             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreationForOtherTeamMember))
             {
                 lblEmployee.Visibility = Visibility.Collapsed;
@@ -139,21 +156,7 @@ namespace BeWo.View.Detail
             //pListViewModel.SelectedVMForEditing = clone;
             ViewModel = pListViewModel;
 
-            if (!hideCustomerCombo)
-            {
-                supportConceptSelectionControl.Loaded += (s, e) => SetSelectedCustomerNode();
-
-                combobox_services.SelectionChanged += (s, e) =>
-                    {
-                        if (combobox_services.SelectedIndex == -1)
-                            combobox_services.SelectedIndex = 0;
-                    };
-            }
-            else
-            {
-                supportConceptSelectionControl.Visibility = Visibility.Collapsed;
-                customerComboColumn.Width = new GridLength(0);
-            }
+            
 
             Focus();
             TextboxNotice.Focus();
@@ -315,8 +318,15 @@ namespace BeWo.View.Detail
 
                 var list = new List<ServiceRecordDC> {lDC};
 
-                ServiceFacade.DoOperationsServiceSync(s => s.UpdateServiceRecords(list));
-	            
+                if (lDC.ServiceRecordOid.HasValue)
+                {
+                    ServiceFacade.DoOperationsServiceSync(s => s.UpdateServiceRecords(list));
+                }
+                else
+                {
+                    ServiceFacade.DoOperationsServiceSync(s => s.InsertNewServiceRecords(list));
+                }
+
             }
         }
 
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index d71b1ad5f..7e65bf126 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -125,6 +125,9 @@ namespace BeWo.View
                 asx = new Thread(ConnectWithServer);                    //<----- Original
                 asx.Start();
 
+
+                //von hier Chatview entfernen und erst aufrufen wenn link ist gecklickt.  
+
                 chatpav = new ChatView("BeWo Chat", chat.Text, clientSocket);
 
                 chatpav.Visibility = Visibility.Collapsed;              //<----- Original
@@ -1306,7 +1309,7 @@ namespace BeWo.View
                 //var ipAdresse = BeWoApp.IpAddress; //3    |9  || 192.168.1.103"app4.bewoplaner.de"
                 var port = 5000;
                 var uri = BeWoApp.SiteOfOrigin;
-
+                
                 clientSocket.Connect(uri.Host, port);
 
                 Dispatcher.Invoke(
@@ -1338,19 +1341,21 @@ namespace BeWo.View
                 if (!isReconnect)
                     MessageBox.Show("Verbindung zum Chat-Server konnte nicht aufgebaut werden.", "Fehler: 2010 ",
                         MessageBoxButton.OK);
+                
+                if(!threadstop){
+                    Dispatcher.Invoke(
+                        DispatcherPriority.Normal,
+                        (ThreadStart) delegate
+                        {
 
-                Dispatcher.Invoke(
-                    DispatcherPriority.Normal,
-                    (ThreadStart) delegate
-                    {
+                            chatpav.StatusSetting.SelectedIndex = 1;
+                            chatpav.setConnectionLostIcon();
+                        });
 
-                        chatpav.StatusSetting.SelectedIndex = 1;
-                        chatpav.setConnectionLostIcon();
-                    });
-
-                Thread.Sleep(5000);
-
-                ReConnectAfterLoseConnection();
+                    Thread.Sleep(5000);
+                    
+                    ReConnectAfterLoseConnection();
+                }
             }
         }
 
@@ -1403,9 +1408,13 @@ namespace BeWo.View
 
                     ErhalteDatenFromString(data);
 
-                    long persoid = messagePaket.SenderPersonOid;
+                    //hier das ganze prozedere ausführen erst wenn chtaview gestzt worden ist. sonst in einem Dictonary saven und dann erst ausführen wenn chatview am start ist.
+                    //dann ganzen Kramm auslagern weil soll ja nicht bei homedreck laufen der Server
 
 
+
+                    long persoid = messagePaket.SenderPersonOid;
+
                     if (persoid != 0)
                     {
 
@@ -1686,8 +1695,8 @@ namespace BeWo.View
                         this.Dispatcher.BeginInvoke(
                             DispatcherPriority.Normal,
                             (Action) delegate
-                            { 
-                                chatpav.updateTCp(clientSocket);
+                            {
+                                chatpav.UpdateTcp(clientSocket);
                                 chatpav.ButtonAlarmLabel.Visibility = Visibility.Visible;      
                                 chatpav.SetAllUserOfflineIfNoInet();
 
@@ -1714,23 +1723,24 @@ namespace BeWo.View
 	    {
 	        try
 	        {
-	            if (clientSocket.Connected == false)
-	            {	               
-	                    if (clientSocket.Connected)
-	                    { 
-                            isReconnect = false;                    	                       
-	                    }
-	                    else
-	                    {
-                            asx = new Thread(ConnectWithServer);
-                            asx.Start();
-                            isReconnect = true; 
-	                    }
-	            }
+	                if (clientSocket.Client != null)
+	                {	               
+	                        if (clientSocket.Client.Connected)
+	                        { 
+                                isReconnect = false;                    	                       
+	                        }
+	                        else 
+	                        {
+                                asx = new Thread(ConnectWithServer);
+                                asx.Start();
+                                isReconnect = true; 
+	                        }
+	                }
+                
 	        }
 	        catch (Exception e)
 	        {
-                MessageBox.Show("Fehler, Siehe fehlercode", "Fehler: 2120 ", MessageBoxButton.OK);
+                MessageBox.Show("Fehler, Siehe fehlercode."+ e.Message + "\n" + e.StackTrace , "Fehler: 2120 ", MessageBoxButton.OK);
 	        }
 	    }
 
@@ -1789,11 +1799,13 @@ namespace BeWo.View
 	                if (asx.IsAlive)
 	                {
 	                    asx.Join();
+                       // asx.Abort();
 	                    asx = null;
 
                         threadstop = true;
                     }
 	            }
+
 	            
 	        }
 	        catch (Exception edf)