diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 3443b90cb..8f6217bac 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -405,6 +405,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\ChatEmojisView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="View\MiniChatView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -766,6 +770,9 @@
     <Compile Include="View\ChatDokumentationsView.xaml.cs">
       <DependentUpon>ChatDokumentationsView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\ChatEmojisView.xaml.cs">
+      <DependentUpon>ChatEmojisView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\MiniChatView.xaml.cs">
       <DependentUpon>MiniChatView.xaml</DependentUpon>
     </Compile>
diff --git a/BeWo/View/ChatView.xaml b/BeWo/View/ChatView.xaml
index 99f7ba591..daf559b6a 100644
--- a/BeWo/View/ChatView.xaml
+++ b/BeWo/View/ChatView.xaml
@@ -18,8 +18,17 @@
                     </TextBox.Resources>
                 </TextBox>
 
-                <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" >
+
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>        
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                
+                 <TextBox x:Name="Chatbox" HorizontalAlignment="Left" Margin="239,720,0,10" TextWrapping="Wrap" Text="Nachricht schreiben" 
+                         VerticalContentAlignment="Center" Width="415" MinHeight="25" ToolTip="Schreiben Sie hier eine Nachricht hinein" KeyDown="OnKeyDownHandler" GotFocus="OnFocus" Foreground="DarkGray" >
                     <TextBox.Resources>
                         <Style TargetType="{x:Type Border}">
                             <Setter Property="CornerRadius" Value="3"/>
@@ -27,7 +36,10 @@
                         </Style>
                     </TextBox.Resources>
                 </TextBox>
-
+                
+              </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>
                         <Style TargetType="ListBoxItem">
@@ -50,7 +62,7 @@
                                         <TextBlock Text="{Binding Username}" FontWeight="Bold" Width="150" TextAlignment="Left"/>
                                         <TextBlock Text="{Binding SendTime}" Margin="2" Width="350"  HorizontalAlignment="Right" TextAlignment="Right"/>
                                     </WrapPanel>
-                                    <TextBlock Text="{Binding UserMessage}" Width="500" TextWrapping="Wrap" VerticalAlignment="Center" />
+                                    <TextBlock  VerticalAlignment="Center"  Text="{Binding UserMessage}" Width="500" TextWrapping="Wrap" />
                                 </DockPanel>
                             </Border>
                         </DataTemplate>
@@ -59,11 +71,9 @@
                         <ItemsPanelTemplate>
                             <StackPanel VerticalAlignment="Bottom"/> 
                         </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>     MouseRightButtonDown="OnRightClickEvent" MouseLeftButtonDown="OnLeftClickEvent" -->
+                    </ListBox.ItemsPanel>     MouseRightButtonDown="OnRightClickEvent" MouseLeftButtonDown="OnLeftClickEvent" aus Textblock wird richtextbox-->
                 </ListBox>
 
-
-
                 <!--###################################### 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}">
@@ -169,9 +179,10 @@
         <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>
-      <!-- <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> -->       
+        <Button HorizontalAlignment="Left" x:Name="EmojiButton" Margin="212,756,0,0" VerticalAlignment="Top" Width="25" Height="25" Click="SmileyButton_OnClick">
+            <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 620563979..d088e0587 100644
--- a/BeWo/View/ChatView.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -16,8 +16,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Media.Imaging;
@@ -30,6 +32,7 @@ using DevExpress.XtraPrinting.Native;
 using DevExpress.XtraPrinting.XamlExport;
 using Microsoft.Office.Interop.Word;
 using Color = System.Drawing.Color;
+using Point = System.Windows.Point;
 
 namespace BeWo.View
 {
@@ -42,6 +45,8 @@ namespace BeWo.View
 
         protected CollectionView view;
 
+        protected ChatEmojisView emojiView = null;
+
         protected List<KontaktlistBuilder> ita = new List<KontaktlistBuilder>();
         protected List<long> oidspeicher = new List<long>();
         protected List<string> teamdc = new List<string>();
@@ -61,6 +66,14 @@ namespace BeWo.View
             LoadallChatKontakts(); //--> erst laden wenn link gedrückt 
             ErstelleContextMenue();
             SetChatSetting();
+
+
+
+            //Thread prufeChat = new Thread(AddSmileys);
+            //prufeChat.Start();
+           
+           // AddSmileys();
+
         }
 
         private void SetChatSetting()
@@ -104,6 +117,11 @@ namespace BeWo.View
 
                 //Close();
 
+                if (emojiView != null && emojiView.Visibility == Visibility.Visible)
+                {
+                    emojiView.Visibility = Visibility.Collapsed;
+                }
+
                 Visibility = Visibility.Collapsed;
             }));
         }
@@ -497,9 +515,11 @@ namespace BeWo.View
 
                 foreach (var list in offmitarbeiter)
                 {
-                    Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName + " " + list.LastName, Goff,
-                        BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(list.EmployeeOid))),
-                        list.PersonOid, ChatType.Mitarbeiter));
+                    if(list.PersonOid != BeWoApp.LoggedOnUser.Employee.PersonOid){
+                        Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName + " " + list.LastName, Goff,
+                            BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(list.EmployeeOid))),
+                            list.PersonOid, ChatType.Mitarbeiter));
+                    }
                 }
                 foreach (var list in offklienten)
                 {
@@ -571,7 +591,7 @@ namespace BeWo.View
 
                 foreach (var var in offmitarbeiter)
                 {
-                    if (!idMitarbeitspeicher.Contains(var.PersonOid) && idMitarbeitspeicher.Count <= offmitarbeiter.Count)
+                    if (!idMitarbeitspeicher.Contains(var.PersonOid) && idMitarbeitspeicher.Count <= offmitarbeiter.Count && var.PersonOid != BeWoApp.LoggedOnUser.Employee.PersonOid)
                     {
                         ita.Add(new KontaktlistBuilder(var.FirstName + " " + var.LastName, "Offline",
                          BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(var.EmployeeOid))),
@@ -1157,8 +1177,22 @@ namespace BeWo.View
         {
             try
             {
-                Chatbox.Text = "";
-                Chatbox.Foreground = new SolidColorBrush(Colors.Black);
+
+                if (Chatbox.Text.Equals("Nachricht schreiben")) // ----> Vorerst
+                {
+                    Chatbox.Text = "";
+                    Chatbox.Foreground = new SolidColorBrush(Colors.Black); 
+                }
+                
+
+
+                if (emojiView != null)
+                {
+                    if (emojiView.Visibility == Visibility.Visible)
+                    {
+                        emojiView.Visibility = Visibility.Collapsed;
+                    }
+                }
             }
             catch (Exception edf)
             {
@@ -1172,7 +1206,34 @@ namespace BeWo.View
        {
            e.Handled = true;
        }
-       
+
+
+        public void SmileyButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (emojiView == null)
+            {
+                emojiView = new ChatEmojisView();
+
+                var x = EmojiButton.PointToScreen(new Point(0, 0));
+
+                emojiView.Left = x.X;
+                emojiView.Top = x.Y - emojiView.Height - 5;
+
+                emojiView.Show();
+            }
+            else
+            {
+                if (emojiView.Visibility == Visibility.Visible)
+                {
+                    emojiView.Visibility = Visibility.Collapsed;
+                }
+                else
+                {
+                    emojiView.Visibility = Visibility.Visible;
+                }
+            }
+        }
+
     }
 
     public class KontaktlistBuilder : INotifyPropertyChanged
diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml
index 6d39e7454..9588f19f5 100644
--- a/BeWo/View/Detail/ServiceRecordEditView.xaml
+++ b/BeWo/View/Detail/ServiceRecordEditView.xaml
@@ -54,7 +54,7 @@
 								<RowDefinition Height="*" />
 							</Grid.RowDefinitions>
 							<!--<ComboBox x:Name="customerComboBox" IsSynchronizedWithCurrentItem="True" AlternationCount="-1" ItemTemplate="{DynamicResource CustomerComboBoxItemTemplate}" SelectionChanged="customerComboBox_SelectionChanged" Height="62" ItemsPanel="{DynamicResource CustomerComboBoxItemsPanelTemplate}" Background="{DynamicResource SupportConceptListBrush}" HorizontalContentAlignment="Stretch" Style="{DynamicResource ObjectComboBoxStyle}" />-->
-                            <localViewControls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl" 
+                            <localViewControls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl"
                                         ItemSelected="supportConceptSelectionControl_ItemSelected"  Height="62" VerticalAlignment="Top"
                                         HorizontalContentAlignment="Stretch" />
                             <!--Grid Grid.Row="1" Margin="0,0,0,0" >
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index 226fa6922..e985481bf 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -32,11 +32,22 @@ using DevExpress.Xpf.Core;
 using DevExpress.Xpf.Editors.Helpers;
 using System.Net.Sockets;
 using System.Collections;
+using System.Drawing;
+using System.IO;
 using System.Net;
 using System.Text;
-
+using System.Windows.Forms;
 using BS.Shared.Core;
 using Newtonsoft.Json;
+using Brushes = System.Windows.Media.Brushes;
+using Button = System.Windows.Controls.Button;
+using Color = System.Windows.Media.Color;
+using Control = System.Windows.Controls.Control;
+using Image = System.Windows.Controls.Image;
+using ListBox = System.Windows.Controls.ListBox;
+using MessageBox = System.Windows.MessageBox;
+using ScrollBar = System.Windows.Controls.Primitives.ScrollBar;
+using TextBox = System.Windows.Controls.TextBox;
 
 namespace BeWo.View
 {
@@ -113,7 +124,6 @@ namespace BeWo.View
                 });*/
 
 
-            //########## Berechtigungsabfrage ####################################
             var berechtigung = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllChatActiveEmployeesCompact());
             foreach (var list in berechtigung)
             {
@@ -126,22 +136,13 @@ namespace BeWo.View
 
             if (berechtigt)
             {                           
-                asx = new Thread(ConnectWithServer);                    //<----- Original
+                asx = new Thread(ConnectWithServer);                   
                 asx.Start();
-
-
-                //von hier Chatview entfernen und erst aufrufen wenn link ist gecklickt.  
-              
-
-               // chatView = new ChatView("BeWo Chat", chat.Text, clientSocket);  // <---- muss auf link bereich geschoben werden  und dann testen testen testen. 
-
-               // chatView.Visibility = Visibility.Collapsed;              //<----- Original
             }
             else
             {
                 BewoChat.Visibility = Visibility.Hidden;
             }
-            //########################################################################
         }
 
         private void PreparePanels()
@@ -1345,15 +1346,7 @@ namespace BeWo.View
         {
             try
             {            
-             /*   Dispatcher.Invoke(
-                    DispatcherPriority.Normal,
-                    (ThreadStart) delegate
-                    {
-                        chatView.SetServerStats("Zurzeit nicht Verbunden");
-                        chatView.StatusSetting.SelectedIndex = 1;
-                    });*/
-
-               // var ipAdresse = "192.168.1.103"; //3    |9  || 192.168.1.103"app4.bewoplaner.de"
+                var ipAdresse = "192.168.1.109"; //3    |9  || 192.168.1.103"app4.bewoplaner.de"
                 var port = 5000;
                 var uri = BeWoApp.SiteOfOrigin;
 
@@ -1428,15 +1421,6 @@ namespace BeWo.View
 
                 serverStream.Write(outStream, 0, outStream.Length);
                 serverStream.Flush();
-
-              /*  Dispatcher.Invoke(
-                    DispatcherPriority.Normal,
-                    (ThreadStart)delegate
-                    {
-
-                        chatView.StatusSetting.SelectedIndex = 0;
-                        
-                    }); */
             }
             catch (Exception e)
             {
@@ -1485,8 +1469,7 @@ namespace BeWo.View
                             zaehler = 1;
                             WaitForMsFromServer();
                         }
-                            //hier war das original bitte wieder hinzufügen falls nicht funkt.
-                            //WaitForMsFromServer();
+                           //original
                     }          
                     WaitForMsFromServer();
                 }
@@ -1734,7 +1717,6 @@ namespace BeWo.View
 	    }
 
 
-
 	    public void DeleteLoggedOffUsers(String personname,long personoid)
 	    {
 	        try
@@ -1757,6 +1739,27 @@ namespace BeWo.View
 	        }
 	    }
 
+        public void ÜbergebeEmojiAnChatView(String Emojicode, String EmojiPfad)
+        {
+            try
+            {
+                Dispatcher.Invoke(
+                          DispatcherPriority.Normal,
+                          (ThreadStart)delegate
+                          {
+                              chatView.Chatbox.Focus();
+                              chatView.Chatbox.Text += " " + Emojicode ;
+                              //chatView.Chatbox.Controls.Add(pic);
+                              chatView.Chatbox.SelectionStart = chatView.Chatbox.Text.Length;
+                          });
+            }
+            catch (Exception edf)
+            {
+                MessageBox.Show("Es ist ein Fehler aufgetreten, bei dem versucht wurde User aus der Onlineanzeige zu entfernen", "Fehler:  ", MessageBoxButton.OK);
+                
+            }
+           
+        }
 
 	    public void PruefeServerDisconection()
 	    {
@@ -1801,8 +1804,7 @@ namespace BeWo.View
                 MessageBox.Show("Es ist ein Fehler mit der Verbindung aufgetreten", "Fehler: 2080 ", MessageBoxButton.OK);
 	        }
 	    }
-
-	   
+   
 
 	    private void ReConnectAfterLoseConnection()
 	    {
@@ -1855,7 +1857,8 @@ namespace BeWo.View
 
                        miniChatView.Visibility = Visibility.Collapsed;
 
-                       miniChatViewList.Add(personOid, miniChatView);
+                       if(!miniChatViewList.ContainsKey(personOid))
+                            miniChatViewList.Add(personOid, miniChatView);
                    });
 	        }
 	        catch (Exception e)
@@ -1898,35 +1901,7 @@ namespace BeWo.View
                 MessageBox.Show("Beim Versuch ,die verbindung mit dem Server zu trennen, ist ein Fehler unterlaufen. " + edf.Message +"\n"+edf.StackTrace, "Fehler: 2100 ", MessageBoxButton.OK);
 	        }
 	    }
-
-
-	    /*public void ReconnectServer()
-	    {
-	        try
-	        {
-	            if (!clientSocket.Connected)
-	            {
-                    asx = new Thread(ConnectWithServer);
-                    asx.Start();
-                    isReconnect = true; 
-	            }            
-
-	            if (clientSocket.Connected)
-	            {
-	                this.Dispatcher.BeginInvoke(
-	                    DispatcherPriority.Normal,
-	                    (Action) delegate
-	                    {
-                            chatView.ButtonAlarmLabel.Visibility = Visibility.Collapsed;
-	                    });
-	            }
-	        }
-	        catch (Exception e)
-	        {
-                MessageBox.Show("Beim Versuch ,die verbindung erneut aufzubauen, ist ein Fehler unterlaufen ", "Fehler: 2110 ", MessageBoxButton.OK);
-	        }
-	    }*/
-	    //---------------------------------------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------------------------------------
 	}
 
 	public class TaskDateDescriptionConverter : IValueConverter
diff --git a/BeWoChatServer/Server.cs b/BeWoChatServer/Server.cs
index 52248e77e..6837b06a2 100644
--- a/BeWoChatServer/Server.cs
+++ b/BeWoChatServer/Server.cs
@@ -212,7 +212,7 @@ namespace BeWoChatServer
                                 var chatMessage = new ChatMessage
                                 {
                                     SenderPersonOid = dataPacket.SenderPersonOid,
-                                    ChatText = dataPacket.ChatMessage,
+                                    ChatText = System.Text.Encoding.Default.GetBytes(dataPacket.ChatMessage),
                                     EmpfängerPersonOid = dataPacket.RecipientPersonOid,
                                     Uhrzeit = dataPacket.MessageTimeStamp,
                                     InsUser = dataPacket.ClientName
@@ -285,7 +285,7 @@ namespace BeWoChatServer
                             var chatMessage = new ChatMessage
                             {
                                 SenderPersonOid = dataPacket.SenderPersonOid,
-                                ChatText = dataPacket.ChatMessage,
+                                ChatText = System.Text.Encoding.Default.GetBytes(dataPacket.ChatMessage),
                                 EmpfängerPersonOid = dataPacket.RecipientPersonOid,
                                 Uhrzeit = dataPacket.MessageTimeStamp,
                                 InsUser = dataPacket.ClientName,
diff --git a/Data/Entities/ChatMessage.cs b/Data/Entities/ChatMessage.cs
index 53f6bfca5..938f03b59 100644
--- a/Data/Entities/ChatMessage.cs
+++ b/Data/Entities/ChatMessage.cs
@@ -20,7 +20,7 @@ namespace BeWo.Data.Entities
 
         public static string PropertyName_IstGelesen = "IstGelesen";
 
-        private string _ChatText;
+        private byte[] _ChatText;
 
         private DateTime _Uhrzeit;
 
@@ -39,7 +39,7 @@ namespace BeWo.Data.Entities
             _Tid = TableID.ChatMessage;
         }
 
-        public virtual string ChatText
+        public virtual byte[] ChatText
         {
             get
             {
diff --git a/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs b/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
index db6bfcbbf..04908b432 100644
--- a/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
+++ b/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
@@ -12,7 +12,7 @@ namespace BeWo.Service.DCEntityMapper
 
             pDataContract.SenderPersonOid = pEntity.SenderPersonOid;
             pDataContract.EmpfängerPersonOid = pEntity.EmpfängerPersonOid;
-            pDataContract.ChatText = pEntity.ChatText;
+            pDataContract.ChatText = System.Text.Encoding.UTF8.GetString(pEntity.ChatText);
             pDataContract.Uhrzeit = pEntity.Uhrzeit;
             pDataContract.IstZugestellt = pEntity.istZugestellt;
             pDataContract.IstGelesen = pEntity.IstGelesen;
@@ -26,7 +26,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.SenderPersonOid = pDataContract.SenderPersonOid;
             pEntity.EmpfängerPersonOid = pDataContract.EmpfängerPersonOid;
             pEntity.Uhrzeit = pDataContract.Uhrzeit;
-            pEntity.ChatText = pDataContract.ChatText;
+            pEntity.ChatText = System.Text.Encoding.Default.GetBytes(pDataContract.ChatText);
             pEntity.istZugestellt = pDataContract.IstZugestellt;
             pEntity.IstGelesen = pDataContract.IstGelesen;
             pEntity.TeamOid = pDataContract.TeamOid;
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index e861ced10..7d2751ce8 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -3136,7 +3136,7 @@ namespace BeWo.Service.ServiceImplementations
                 newCode.EmpfängerPersonOid = empfängerOid;
                 newCode.SenderPersonOid = senderOid;
                 newCode.Uhrzeit = DateTime.Now;
-                newCode.ChatText = message;
+                newCode.ChatText = System.Text.Encoding.UTF8.GetBytes(message);
                 newCode.istZugestellt = istZugestellt;
                 newCode.IstGelesen = 0;