diff --git a/PrototypChat/MainWindow.xaml.cs b/PrototypChat/MainWindow.xaml.cs
index 7fedb5a..de80f87 100644
--- a/PrototypChat/MainWindow.xaml.cs
+++ b/PrototypChat/MainWindow.xaml.cs
@@ -112,16 +112,18 @@ namespace ownChat
 
         private void MainWindow_OnClosed(object sender, EventArgs e)
         {
-            _emojiView = null;
-            ChatMainControl.SpeichereMessageInfoInDatei();
-            // Environment.Exit(0);
-            LoginMaske newLogin = new LoginMaske();
-            newLogin.Show();
+            //_emojiView = null;
+            //ChatMainControl.SpeichereMessageInfoInDatei();
+            //// Environment.Exit(0);
+            //LoginMaske newLogin = new LoginMaske();
+            //newLogin.Show();
         }
 
         private void ChatMainControl_OnOnClose()
-        {         
-            this.Close();
+        {
+            //this.Close();
+            ChatMainControl.SpeichereMessageInfoInDatei();
+            Environment.Exit(0);
         }
     }