diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs
index 1a64989..4663b24 100644
--- a/ChatController/ChatMainControl.xaml.cs
+++ b/ChatController/ChatMainControl.xaml.cs
@@ -199,11 +199,10 @@ namespace ChatController
         {
             if(Clientlist.SelectedItem != null)
             {
-
-                StartWaiting();
+               // StartWaiting();
 
                 Cursor = Cursors.Wait;
-                scrollPrueferAktivieren = false;
+                scrollPrueferAktivieren = false;             
                 Chat.ItemsSource = null;
 
                 AktChatUser.Items.Clear();
@@ -221,24 +220,23 @@ namespace ChatController
                 AktChatUser.Items.Add(aktuellerKontakt);
                 _aktuellerKontakt = aktuellerKontakt;
 
-                var x =  _chat.LadeChatNachrichtenVomKontakt(aktuellerKontakt);
+                var x = _chat.LadeChatNachrichtenVomKontakt(aktuellerKontakt);
 
                 Chat.ItemsSource = x;
 
                 Chat.Items.MoveCurrentToLast();
                 Chat.ScrollIntoView(Chat.Items.CurrentItem);
-            
+
                 Chat.ContextMenu = _chat.ErstelleKontextMenue();
                 SetContextHandler();
                 scrollPrueferAktivieren = true;
-            
+
                 HorcheAktivNachNachrichten();
                 Cursor = Cursors.Arrow;
 
-                EndWaiting();
+               // EndWaiting();
             }
         }
-        
         #endregion
 
         #region Context Menue
diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index cafcfb6..639dce1 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -983,8 +983,8 @@ namespace ChatController.HauptKlassen
                 {
                     gr.Clear(Color.Transparent);
 
-                    // This is said to give best quality when resizing images
-                    gr.InterpolationMode = InterpolationMode.Default; // InterpolationMode.HighQualityBicubic;
+                    // falls jemand mekert, muss die intergedönse erhöht werden  
+                    gr.InterpolationMode = InterpolationMode.NearestNeighbor; // InterpolationMode.HighQualityBicubic;
 
                     gr.DrawImage(bmpScaled, 0, 0, width, height);
                 }
@@ -1329,7 +1329,10 @@ namespace ChatController.HauptKlassen
                     form.StartPosition = FormStartPosition.CenterScreen;
                     form.Size = imgbit.Size;
                     form.MinimumSize = new Size(150,150);
-                    form.MaximumSize = new Size(500,500);
+
+                    var width = (int)Math.Round(System.Windows.SystemParameters.PrimaryScreenWidth / 1.25);
+                    var height = (int)Math.Round(System.Windows.SystemParameters.PrimaryScreenWidth / 2);
+                    form.MaximumSize = new Size(width,height);
                     form.FormBorderStyle = FormBorderStyle.Sizable;
 
                     form.MaximizeBox = false; 
@@ -1399,7 +1402,10 @@ namespace ChatController.HauptKlassen
                     form.StartPosition = FormStartPosition.CenterScreen;
                     form.Size = imgbit.Size;
                     form.MinimumSize = new Size(150,150);
-                    form.MaximumSize = new Size(500,500);
+
+                    var width = (int)Math.Round(System.Windows.SystemParameters.PrimaryScreenWidth / 1.25);
+                    var height = (int)Math.Round(System.Windows.SystemParameters.PrimaryScreenWidth / 2);
+                    form.MaximumSize = new Size(width, height);
                     form.FormBorderStyle = FormBorderStyle.Sizable;
 
                     form.MaximizeBox = false;
@@ -1412,8 +1418,7 @@ namespace ChatController.HauptKlassen
                     pb.Image = imgbit;
 
                     pb.SizeMode = PictureBoxSizeMode.StretchImage;
-                    //pb.MaximumSize = new Size(500,500);
-
+                    
                     form.Controls.Add(pb);
                     form.ShowDialog();
                 }