diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 80f49ba7d..e95ddf116 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -272,7 +272,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\ChatService.xaml">
+    <Page Include="View\ChatView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -730,8 +730,8 @@
     <Compile Include="View\ChatEmojiView.xaml.cs">
       <DependentUpon>ChatEmojiView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\ChatService.xaml.cs">
-      <DependentUpon>ChatService.xaml</DependentUpon>
+    <Compile Include="View\ChatView.xaml.cs">
+      <DependentUpon>ChatView.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
       <DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index 844cd3e73..47b63ad76 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -869,7 +869,30 @@ namespace BeWo
 				trans.BeginAnimation(TranslateTransform.XProperty, animation);
 				ClearDetailFrame();
 			}
-		}
+
+            //Hier das mit Chat Refreshen 
+            if (BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null)
+            {
+
+                if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null &&
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
+                {
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.threadBool = false;
+                }
+
+                if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null)
+                {
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView.Close();
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView = null;
+                }
+
+                BeWoApp.MainControl.HomeView.ServiceChatView.Close();
+                BeWoApp.MainControl.HomeView.ServiceChatView = null;
+            }
+            //Ende
+
+        }
 
 		private void button_Organisation_Click(object sender, RoutedEventArgs e)
 		{
diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs
index 2475e2dd0..51cf893cf 100644
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -81,7 +81,24 @@ namespace BeWo
 	            }
             }
 
-           
+            if(BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null) {
+
+                if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null && 
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
+                {
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.threadBool = false;
+                }
+
+                if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null) { 
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView.Close();
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView = null;
+                }
+     
+                BeWoApp.MainControl.HomeView.ServiceChatView.Close();
+                BeWoApp.MainControl.HomeView.ServiceChatView = null;
+            }
+
             BeWoApp.CurrentBeWo.DocumentWatcher.LoescheTempDateien();
 
             Application.Current.Shutdown();
diff --git a/BeWo/View/ChatService.xaml b/BeWo/View/ChatView.xaml
similarity index 95%
rename from BeWo/View/ChatService.xaml
rename to BeWo/View/ChatView.xaml
index 1892e5dde..a66f3cd9e 100644
--- a/BeWo/View/ChatService.xaml
+++ b/BeWo/View/ChatView.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="BeWo.View.ChatService"
+<Window x:Class="BeWo.View.ChatView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/BeWo/View/ChatService.xaml.cs b/BeWo/View/ChatView.xaml.cs
similarity index 85%
rename from BeWo/View/ChatService.xaml.cs
rename to BeWo/View/ChatView.xaml.cs
index c0c7b34f4..4e035f5bb 100644
--- a/BeWo/View/ChatService.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -21,12 +21,12 @@ namespace BeWo.View
     /// <summary>
     /// Interaktionslogik für ChatService.xaml
     /// </summary>
-    public partial class ChatService : Window
+    public partial class ChatView : Window
     {
 
-        private ChatEmojiView _emojiView;
+        public ChatEmojiView _emojiView;
 
-        public ChatService(ChatDatenUebergabe chatDaten)
+        public ChatView(ChatDatenUebergabe chatDaten)
         {
             InitializeComponent();
             CloseWindow();
@@ -53,7 +53,7 @@ namespace BeWo.View
 
                 if (_emojiView != null)
                 {
-                    _emojiView.Visibility = Visibility.Collapsed;
+                    _emojiView.Close(); // hidden
                 }
 
             }));
@@ -76,20 +76,25 @@ namespace BeWo.View
             }
             else
             {
-                if (_emojiView.Visibility == Visibility.Visible)
-                {
-                    _emojiView.Visibility = Visibility.Collapsed;
-                }
-                else
-                {
-                    _emojiView.Visibility = Visibility.Visible;
 
+                //if (_emojiView.Visibility == Visibility.Visible)
+                //{
+                //    _emojiView.Visibility = Visibility.Hidden; // hidden
+                //}
+                //else
+                //{
+                    _emojiView.Close();
+                    _emojiView = null;
+
+                    _emojiView = new ChatEmojiView(ChatMainControl);
                     var x = emojiButton.PointToScreen(new Point(0, 0));
                     PresentationSource source = PresentationSource.FromVisual(emojiButton);
 
                     _emojiView.Top = (x.Y / source.CompositionTarget.TransformToDevice.M22) - _emojiView.Height - 5;
                     _emojiView.Left = x.X / source.CompositionTarget.TransformToDevice.M11;
-                }
+
+                    _emojiView.Show();
+                //}
             }
         }
 
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index 2e46e5d2a..22304c069 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1300,11 +1300,11 @@ namespace BeWo.View
         //####### Connection with Server ########### 
     
 //---------------------------------------------------------------------------------------------------------------------------
-        private ChatService ServiceChat;
+        public ChatView ServiceChatView;
         
         private void HyperlinkChat_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {          
-            if (ServiceChat == null)
+            if (ServiceChatView == null)
             {
                 //Tu hier anmeldung starten 
                 //Cursor = Cursors.Wait;
@@ -1314,20 +1314,20 @@ namespace BeWo.View
 
                 var x = _login.AnmeldevorgangDurchFuehren();
 
-                if (x != null) { 
-                    ServiceChat = new ChatService(x);
-                    ServiceChat.Show();
+                if (x != null) {
+                    ServiceChatView = new ChatView(x);
+                    ServiceChatView.Show();
                 }
                 //Cursor = Cursors.Arrow;
                 
             }
-            else if (ServiceChat.Visibility == Visibility.Visible)
+            else if (ServiceChatView.Visibility == Visibility.Visible)
             {
-                ServiceChat.Visibility = Visibility.Hidden;
+                ServiceChatView.Visibility = Visibility.Hidden;
             }
-            else if (ServiceChat.Visibility == Visibility.Hidden)
+            else if (ServiceChatView.Visibility == Visibility.Hidden)
             {
-                ServiceChat.Visibility = Visibility.Visible;
+                ServiceChatView.Visibility = Visibility.Visible;
             }
         }
     }