diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs
index 590d61053..5ada5e2a2 100644
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.IO;
 using System.Net;
 using System.Windows;
 using System.Windows.Controls;
@@ -82,11 +83,18 @@ namespace BeWo
 
             try
             {
-               // if (BeWoApp.MainControl.HomeView.clientSocket.Connected)
-               // {
-                    BeWoApp.MainControl.HomeView.CloseServerConnection();
-                   
-               // }
+                BeWoApp.MainControl.HomeView.CloseServerConnection();
+
+                foreach (var xyz in BeWoApp.MainControl.HomeView.chatView.Speicherpfad)
+                {
+                    try
+                    {
+                        File.Delete(xyz.Value);
+                    }
+                    catch (Exception esx)
+                    {
+                    }
+                }
             }
             catch (Exception edf)
             {
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 4c6cc3d5b..d86579ac6 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -493,6 +493,12 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnail", ReplyAction="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetEmployeeThumbnailBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         byte[] GetEmployeeThumbnail(long employeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeResp" +
+            "onse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/DeleteEmployeeCustomerRelationForEmployeeBeWo" +
+            "FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -918,6 +924,11 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.GetEmployeeThumbnail(employeeOid);
         }
+        
+        public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
+        {
+            base.Channel.DeleteEmployeeCustomerRelationForEmployee(employeeOid);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -2704,6 +2715,13 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request);
+        
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt.
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request);
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2818,6 +2836,74 @@ namespace BeWo.ServiceProxy
         }
     }
     
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="UploadChatPackage", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+    public partial class UploadChatPackage
+    {
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public long empfängerOid;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public bool isDeliverd;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public int mediatype;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public string message;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public string messageid;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public long senderOid;
+        
+        [System.ServiceModel.MessageHeaderAttribute(Namespace="http://tempuri.org/")]
+        public long teamid;
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+        public System.IO.Stream Stream;
+        
+        public UploadChatPackage()
+        {
+        }
+        
+        public UploadChatPackage(long empfängerOid, bool isDeliverd, int mediatype, string message, string messageid, long senderOid, long teamid, System.IO.Stream Stream)
+        {
+            this.empfängerOid = empfängerOid;
+            this.isDeliverd = isDeliverd;
+            this.mediatype = mediatype;
+            this.message = message;
+            this.messageid = messageid;
+            this.senderOid = senderOid;
+            this.teamid = teamid;
+            this.Stream = Stream;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(WrapperName="UploadChatResult", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+    public partial class UploadChatResult
+    {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+        public BS.Shared.DataContracts.ChatMessageDC ChatMessage;
+        
+        public UploadChatResult()
+        {
+        }
+        
+        public UploadChatResult(BS.Shared.DataContracts.ChatMessageDC ChatMessage)
+        {
+            this.ChatMessage = ChatMessage;
+        }
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     public interface IStreamingServiceChannel : BeWo.ServiceProxy.IStreamingService, System.ServiceModel.IClientChannel
     {
@@ -2912,6 +2998,27 @@ namespace BeWo.ServiceProxy
             BeWo.ServiceProxy.UploadResult retVal = ((BeWo.ServiceProxy.IStreamingService)(this)).UpdateDocument(inValue);
             return retVal.Attachment;
         }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        BeWo.ServiceProxy.UploadChatResult BeWo.ServiceProxy.IStreamingService.CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request)
+        {
+            return base.Channel.CreateNewSpeziallStreamChatMessagesDC(request);
+        }
+        
+        public BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallStreamChatMessagesDC(long empfängerOid, bool isDeliverd, int mediatype, string message, string messageid, long senderOid, long teamid, System.IO.Stream Stream)
+        {
+            BeWo.ServiceProxy.UploadChatPackage inValue = new BeWo.ServiceProxy.UploadChatPackage();
+            inValue.empfängerOid = empfängerOid;
+            inValue.isDeliverd = isDeliverd;
+            inValue.mediatype = mediatype;
+            inValue.message = message;
+            inValue.messageid = messageid;
+            inValue.senderOid = senderOid;
+            inValue.teamid = teamid;
+            inValue.Stream = Stream;
+            BeWo.ServiceProxy.UploadChatResult retVal = ((BeWo.ServiceProxy.IStreamingService)(this)).CreateNewSpeziallStreamChatMessagesDC(inValue);
+            return retVal.ChatMessage;
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -3811,12 +3918,7 @@ namespace BeWo.ServiceProxy
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewChatMessagesDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDCResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewSpeziallChatMessagesDCBeWoFaultFau" +
-            "lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku, byte[] bild);
+        BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" +
             "")]
@@ -4483,14 +4585,9 @@ namespace BeWo.ServiceProxy
             return base.Channel.CreateNewCustomerAPPCodeDC(customerOid);
         }
         
-        public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid)
+        public BS.Shared.DataContracts.ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid)
         {
-            return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid);
-        }
-        
-        public BS.Shared.DataContracts.ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku, byte[] bild)
-        {
-            return base.Channel.CreateNewSpeziallChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, sound, doku, bild);
+            return base.Channel.CreateNewChatMessagesDC(senderOid, empfängerOid, message, isDeliverd, teamid, messageid);
         }
         
         public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType)
diff --git a/BeWo/View/ChatProgressBarView.xaml b/BeWo/View/ChatProgressBarView.xaml
new file mode 100644
index 000000000..e93d8cb9e
--- /dev/null
+++ b/BeWo/View/ChatProgressBarView.xaml
@@ -0,0 +1,14 @@
+<Window x:Class="BeWo.View.ChatProgressBarView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:view="clr-namespace:BeWo.View"
+        Height="100" Width="300" WindowStartupLocation="CenterScreen" 
+        ResizeMode="NoResize" 
+        >
+    <Grid Margin="20">
+      <ProgressBar x:Name="progressBar" Minimum="0" Maximum="100" />
+      <TextBlock Text="{Binding ElementName=progressBar, Path=Value, StringFormat={}Bitte warten... {0:0}%}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+    </Grid>
+</Window>
+
+
diff --git a/BeWo/View/ChatProgressBarView.xaml.cs b/BeWo/View/ChatProgressBarView.xaml.cs
new file mode 100644
index 000000000..e3d5a0570
--- /dev/null
+++ b/BeWo/View/ChatProgressBarView.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel;
+
+
+namespace BeWo.View
+{
+    public partial class ChatProgressBarView
+    {
+
+        ChatView chatView;
+        BackgroundWorker worker = null;
+        int ubergabe = 0;
+
+        public ChatProgressBarView(String name)
+        {
+            InitializeComponent();
+
+            Title = name;
+        }
+    }
+}
diff --git a/BeWo/View/ChatView.xaml b/BeWo/View/ChatView.xaml
index 1a846f5fb..a66158473 100644
--- a/BeWo/View/ChatView.xaml
+++ b/BeWo/View/ChatView.xaml
@@ -53,7 +53,7 @@
             </Button>
           </StackPanel>
 
-          <TextBox x:Name="Suche" Grid.Column="0" Margin="3,1,3,3" MinHeight="25" VerticalContentAlignment="Center" KeyDown="Suche_OnKeyDown" Grid.Row="1" TextChanged="Suche_OnTextChanged" LostFocus="Suche_OnLostFocus" VerticalAlignment="Bottom">
+          <TextBox x:Name="Suche" Grid.Column="0" Margin="3,1,3,3" MinHeight="25" VerticalContentAlignment="Center" KeyDown="Suche_OnKeyDown" Grid.Row="1" TextChanged="Suche_OnTextChanged" LostFocus="Suche_OnLostFocus" VerticalAlignment="Bottom" ToolTip="Suchen Sie hier nach einem User in der Liste">
             <TextBox.Resources>
               <Style TargetType="{x:Type Border}">
                 <Setter Property="CornerRadius" Value="3"/>
@@ -213,18 +213,18 @@
         </Button>
 
         <!--####################### Test Zwecke ###############################################################-->
-        <!-- <Grid Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3">
+         <Grid Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3">
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="35"/>
-            <ColumnDefinition Width="55"/>
             <ColumnDefinition Width="125"/>
+            <ColumnDefinition Width="55"/>
           </Grid.ColumnDefinitions>
-          <Button Grid.Column="0" PreviewMouseDown="Sound_OnPreviewMouseDown" PreviewMouseUp="Sound_OnPreviewMouseUp" HorizontalAlignment="Center" Margin="1" Width="30">
+          <Button Grid.Column="0" PreviewMouseDown="Sound_OnPreviewMouseDown" PreviewMouseUp="Sound_OnPreviewMouseUp" HorizontalAlignment="Center" Margin="1" Width="30" Visibility="Collapsed">
             <Image x:Name="SmileySound" ToolTip="Sound Aufnehmen und verschicken" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
           </Button>
-          <Button Content="Media" Grid.Column="1" Click="MediaBase_OnClick" HorizontalAlignment="Center" Width="50"  Margin="1" />
-          <Button Content="Video Chatten" Grid.Column="2" Click="ButtonBase_OnClick" HorizontalAlignment="Center" Width="120" Margin="1"/>
-        </Grid>-->
+          <Button Content="Media" Grid.Column="2" Click="MediaBase_OnClick" HorizontalAlignment="Center" Width="50"  Margin="1" />
+          <Button Content="Video Chatten" Grid.Column="1" Click="ButtonVideoChat_OnClick" HorizontalAlignment="Center" Width="120" Margin="1" Visibility="Collapsed"/>
+        </Grid>
 
         <!--####################################################################################################-->
 
@@ -243,6 +243,7 @@
           <ListBox.ItemTemplate>
             <DataTemplate>
               <Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}">
+
                 <DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >
 
                   <StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}" >
@@ -251,24 +252,58 @@
 
                   <!--############################### Neu versuch ein Button in den Chat hinein zu packen  ###############################################-->
 
-                  <!--Sound bereich-->
-                  <Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">
-                    <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
+                  <!--Sound bereich
+                  <Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">-->
+                  <!-- <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
             
-                      <Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25">
+                      <Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25" Margin="0,0,5,0" Tag="{Binding SoundArray}">
                         <Image Name="image" ToolTip="Smiley einfügen" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
-                        <!--<Button.Triggers>
-                          <EventTrigger RoutedEvent="Button.Click">
-                            <SoundPlayerAction Source="{Binding UserMessage}"  />
-                          </EventTrigger>
-                        </Button.Triggers>-->
-                      </Button>
-                   
-                      <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}" />
-                    </DockPanel>
-                  </Border>
+                                 
+                      </Button>-->
 
 
+                      <!--Hier slider einbauen 
+                      <Slider HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Center" Width="100"  ValueChanged="AudioSlider_OnValueChanged"/>-->
+                <!--   <Grid Width="200">
+                        <Grid.ColumnDefinitions>
+                          <ColumnDefinition Width="110"/>
+                          <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                          <RowDefinition Height="25" />
+                          <RowDefinition Height="15" />
+                        </Grid.RowDefinitions>
+                        <Border BorderThickness="1" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="Black"  Visibility="{Binding SoundVisibility}">
+                            <Slider Grid.Row="0" Grid.ColumnSpan="2" Value="{Binding  Path=position, FallbackValue=0}" Maximum="{Binding Path=sliderMaximum, FallbackValue=0, Mode=TwoWay}" Minimum="0" Margin="5,0" VerticalAlignment="Center" />  
+                        </Border>
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=time, StringFormat={}{0:hh}:{0:mm}:{0:ss}, FallbackValue=00:00:00, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5,0" />
+
+                        <TextBlock Grid.Row="1" Grid.Column="0" Name="text" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding UserMessage}" />
+                      </Grid>
+                      
+                    </DockPanel>-->
+                  
+                  
+                  <!--Herunterlade bereich für Bild und Dokumente Mach ne binding auf die Visibility und zeige diese zuerst an die visibility wird dan geändert -->
+                  <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding Herunterladen}" >
+                   <Grid >
+                        <Grid.ColumnDefinitions>
+                          <ColumnDefinition Width="*"/>                      
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                          <RowDefinition Height="25" />
+                          <RowDefinition Height="25" />
+                        </Grid.RowDefinitions>
+                    
+                    
+                    <!-- Name Der Datei -->
+                    <TextBlock  Text="{Binding UserMessage}" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <!-- Herunterlade Button Hole die Datei aus der Neuen Database        | binding herunterladbares erstellen und beim auslesen  aus der Datenbank dise dan binden     -->
+                    <Button Content="Herunterladen" Grid.Row="1" ToolTip="Datei Herunterladen" HorizontalAlignment="Center" VerticalAlignment="Center" Width="125" Height="25" Tag="{Binding Herunterladbares}" Click="DatenRunterladen_OnClick" />
+                     </Grid>
+                  </DockPanel>
+                  <!-- #++++++++++++++++++++++++++++++++++++++++++++++# -->
+
                   <!-- Picture bereich-->
                   <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
                     <Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
@@ -277,14 +312,14 @@
 
                   <!--Documentation bereich -->
                   <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
-                    <Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" >
+                    <Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" Tag="{Binding Dokpfad}" >
                       <Image ToolTip="Dokument öffnen" Source="/BeWoPlaner;component/Ressources/Icons/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
                     </Button>
                     <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
                   </DockPanel>
 
 
-                  <!--###################################################################################################################################-->
+                  <!--#################################################################################################################################################################-->
 
                   <StackPanel DockPanel.Dock="Left"  Margin="0,0,0,5">
                     <TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150" HorizontalAlignment="Left"  TextAlignment="Left" VerticalAlignment="Center"/>
@@ -312,7 +347,7 @@
           </Grid.RowDefinitions>
 
 
-          <TextBox x:Name="Chatbox" HorizontalAlignment="Stretch" Grid.Column="0" TextWrapping="Wrap" Text="Nachricht schreiben" TextChanged="Chatbox_OnTextChanged" VerticalScrollBarVisibility="Auto" MaxLines="5" MaxHeight="70"
+          <TextBox x:Name="Chatbox" HorizontalAlignment="Stretch" Grid.Column="0" TextWrapping="Wrap" Text="Nachricht schreiben"  VerticalScrollBarVisibility="Auto" MaxLines="5" MaxHeight="70"
                 VerticalContentAlignment="Center" MinHeight="25" ToolTip="Schreiben Sie hier eine Nachricht hinein" KeyDown="OnKeyDownHandler" GotFocus="OnFocus" Foreground="DarkGray" VerticalAlignment="Bottom" >
             <TextBox.Resources>
               <Style TargetType="{x:Type Border}">
diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs
index dd9dfd4ff..be26a13e7 100644
--- a/BeWo/View/ChatView.xaml.cs
+++ b/BeWo/View/ChatView.xaml.cs
@@ -21,6 +21,7 @@ using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
+using System.Linq.Expressions;
 using System.Media;
 using System.Security.Permissions;
 using System.Text;
@@ -32,6 +33,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using BeWo.View.Detail;
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using DevExpress.Xpf.Core;
@@ -40,7 +42,7 @@ using DevExpress.XtraEditors.Senders;
 using DevExpress.XtraPrinting.Native;
 using DevExpress.XtraPrinting.XamlExport;
 using Microsoft.Office.Interop.Word;
-//using NAudio.Wave;
+using NAudio.Wave;
 using Brush = System.Windows.Media.Brush;
 using Button = System.Windows.Forms.Button;
 using Color = System.Drawing.Color;
@@ -58,7 +60,7 @@ using Size = System.Windows.Size;
 
 namespace BeWo.View
 {
-    public partial class ChatView
+    public partial class ChatView 
     {
         public UserVM ViewModel { get; set; }
         public int abr = 0;
@@ -76,17 +78,19 @@ namespace BeWo.View
         protected bool isOnFocus = false;
 
         //Neu Sound und Datei Versende gedöns usw...
-        //protected WaveIn waveSource = null;
-        //protected WaveFileWriter waveFile = null;
+        protected WaveIn waveSource = null;
+        protected WaveFileWriter waveFile = null;
         protected SoundPlayer simpleSound = null;
         protected Form form1 = null;
+        protected ChatProgressBarView progressView = null;
+        protected IWavePlayer waveOutDevice = null;
+        protected AudioFileReader audioFileReader = null;
 
         //versuch oder | probieren geht über studieren 
         protected Dictionary<string, byte[]> SoundZwischenSpeicher = new Dictionary<string, byte[]>();
         protected Dictionary<string, byte[]> BildZwischenSpeicher = new Dictionary<string, byte[]>();
         protected Dictionary<string, byte[]> DokumentZwischenSpeicher = new Dictionary<string, byte[]>();
-
-
+        public Dictionary<string, string> Speicherpfad = new Dictionary<string, string>();
 
         protected bool sortLabelSwitch = false; 
 
@@ -774,7 +778,7 @@ namespace BeWo.View
 
                 item1.Header = "Dokumentieren";
                 item1.Visibility = Visibility.Visible;
-                item1.Click += new RoutedEventHandler(OnChatRightClickMenue);
+                item1.Click += OnChatRightClickMenue;
 
                 item2.Header = "Speichern unter";
                 item2.Visibility = Visibility.Visible;
@@ -821,8 +825,12 @@ namespace BeWo.View
                     {                  
                         SpeichernUnter(3, SoundZwischenSpeicher[Item2.UserMessage], Item2.UserMessage);             
                     }
-                }
 
+                    if (Item2.SoundVisibility == Visibility.Collapsed && Item2.DokumentVisibility == Visibility.Collapsed && Item2.PictureVisibility == Visibility.Collapsed)
+                    {
+                        MessageBox.Show("Sie können keine normalen Chat Nachrichten Speichern.", "Info", MessageBoxButton.OK);
+                    }
+                }
             }
             else
             {
@@ -840,19 +848,6 @@ namespace BeWo.View
 
                 saveFileDialog1.FileName = dateiname;
 
-                //using (var compressedMs = new MemoryStream(datensatz))
-                //{
-                //    using (var decompressedMs = new MemoryStream())
-                //    {
-                //        using (var gzs = new BufferedStream(new GZipStream(compressedMs,
-                //         CompressionMode.Decompress)))
-                //        {
-                //            gzs.CopyTo(decompressedMs);
-                //        }
-                //        datensatz = decompressedMs.ToArray();
-                //    }
-                //}
-
                 if (filterTyp == 1) // Bilder 
                 {
                     saveFileDialog1.Filter = "Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp";
@@ -1048,14 +1043,22 @@ namespace BeWo.View
                         if (blub.TypeChat == ChatType.Klienten)
                         {
                             context.Visibility = Visibility.Visible;
+
+                            var item = context.Items[0] as MenuItem;
+                            item.Visibility = Visibility.Visible;
+
                             Chat.SelectionMode = SelectionMode.Extended;
                             Chat.Focusable = true;
                         }
-                        else
+                        else 
                         {
-                            context.Visibility = Visibility.Collapsed;
+                            context.Visibility = Visibility.Visible; // Visibility. Collapsed
+                            //context.Items[0].SetPropertyValue("Visibility","Collapsed");
+                            var item = context.Items[0] as MenuItem;
+                            item.Visibility = Visibility.Collapsed;
+
                             Chat.SelectionMode = SelectionMode.Single;
-                            Chat.Focusable = false;       
+                            Chat.Focusable = true; // Focusable = false       
                         }
                     }
                 }
@@ -1117,14 +1120,25 @@ namespace BeWo.View
                         if (curItem.TypeChat == ChatType.Klienten)
                         {
                             context.Visibility = Visibility.Visible;
+
+                            var item = context.Items[0] as MenuItem;
+                            item.Visibility = Visibility.Visible;
+
                             Chat.SelectionMode = SelectionMode.Extended;
                             Chat.Focusable = true;
                         }
                         else
                         {
-                            context.Visibility = Visibility.Collapsed;
-                            Chat.SelectionMode = SelectionMode.Single;
-                            Chat.Focusable = false;    
+
+                            context.Visibility = Visibility.Visible; // Visibility. Collapsed
+                            // context.Items[0].SetPropertyValue("Visibility", "Collapsed");
+
+                            var item = context.Items[0] as MenuItem;
+
+                            item.Visibility = Visibility.Collapsed;
+                            //context.Visibility = Visibility.Collapsed;
+                            Chat.SelectionMode = SelectionMode.Single;  
+                            Chat.Focusable = true;    
                         }
                     }
                 }
@@ -1270,13 +1284,15 @@ namespace BeWo.View
         {
             try
             {
+                var guid = Guid.NewGuid();
+
                 if (type == ChatType.Team)
                 {
-                    ServiceFacade.DoOperationsServiceSync(s => s.CreateNewChatMessagesDC(senderoid, empfangid, message, istZugestellt, empfangid));
+                    ServiceFacade.DoOperationsServiceSync(s => s.CreateNewChatMessagesDC(senderoid, empfangid, message, istZugestellt, empfangid,guid.ToString()));
                 }
                 else
                 {
-                    ServiceFacade.DoOperationsServiceSync(s => s.CreateNewChatMessagesDC(senderoid, empfangid, message, istZugestellt, 0));
+                    ServiceFacade.DoOperationsServiceSync(s => s.CreateNewChatMessagesDC(senderoid, empfangid, message, istZugestellt, 0, guid.ToString()));
                 }
             }
             catch (InvalidOperationException e)
@@ -1294,15 +1310,41 @@ namespace BeWo.View
                 SoundZwischenSpeicher.Clear();
                 BildZwischenSpeicher.Clear();
                 DokumentZwischenSpeicher.Clear();
+                //Für anzeige MEhr Anzeigen wen mehr als 20 items Vorhanden
+
+                int itemGrenze = 20;
+
 
                 if (Curitem.TypeChat == ChatType.Team)
                 {
                     int sx = 0;
 
                     var allTeamItems =
-                        ServiceFacade.DoCustomerServiceSync(
-                            s => s.FindAllChatMessagesFromTeam(senderoid, empfaengerOid));
-                  
+                       ServiceFacade.DoCustomerServiceSync(
+                           s => s.FindAllChatMessagesFromTeam(senderoid, empfaengerOid));
+
+                    // List<ChatMessageDC> allTeamItems = new List<ChatMessageDC>();
+                         //ServiceFacade.DoCustomerServiceAsync(
+                         //    s => s.FindAllChatMessagesFromTeam(senderoid, empfaengerOid),
+                         //    r =>
+                         //    {
+                           
+                      
+                         //    });
+
+                    //original 
+
+                    //Umbauen daraus soll ein Button gemacht werden  
+                    if (allTeamItems.Count >= itemGrenze)
+                    {
+                        Chat.Items.Add(new KontakMessageBuilder("", "------------------------ Mehr Nachrichten Vorhanden -----------------------", "", 0, false));
+                    }
+                    else
+                    {
+                        Chat.Items.Add(new KontakMessageBuilder("", "------------------------ Keine weiteren Nachrichten Verfügbar -----------------------", "", 0, false));
+                    }
+
+
                     List<long> x = new List<long>();
 
                     foreach (var team in allTeamItems)
@@ -1321,41 +1363,58 @@ namespace BeWo.View
 
                         if (x.Contains(anzeige.SenderPersonOid.Value))
                         {
+
+                                //Chat Message dem array übergeben
+                                object[] datenmengen = new object[2];
+                                datenmengen[0] = anzeige;
+
                             if (anzeige.SenderPersonOid.Value == BeWoApp.LoggedOnUser.Employee.PersonOid)
                             {
                                 int zahl = (int)x.IndexOf(anzeige.SenderPersonOid.Value);
 
-                                if (anzeige.SoundDatei == null && anzeige.BildDatei == null && anzeige.DokuDatei == null)
+
+                                if (anzeige.MediaDatei == null)
                                 {
                                     Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true));
                                 }
                                 else
                                 {
-                                    if (anzeige.BildDatei != null)
+                                    if (anzeige.MediaDatei != null && anzeige.MediaTyp == 1)
                                     {
 
-                                        var bild = DecodeBild(anzeige.BildDatei);
+                                        var bild = DecodeBild(anzeige.MediaDatei);
 
                                         if (!BildZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            BildZwischenSpeicher.Add(anzeige.ChatText, anzeige.BildDatei);
+                                            BildZwischenSpeicher.Add(anzeige.ChatText, anzeige.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true, false, true,false, bild));
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(person[zahl].FirstName,
+                                            anzeige.ChatText, anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value,
+                                            true, false, false, false, bild, null, null, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+                                       
+                                        //Bearbeiten ,false,null 
+                                        Chat.Items.Add(builder);
                                     }
 
-                                    if (anzeige.SoundDatei != null)
-                                    {
-                                        if (!SoundZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            SoundZwischenSpeicher.Add(anzeige.ChatText, anzeige.SoundDatei);
+                                    //if (anzeige.SoundDatei != null)
+                                    //{
+                                    //    if (!SoundZwischenSpeicher.ContainsKey(anzeige.ChatText))
+                                    //        SoundZwischenSpeicher.Add(anzeige.ChatText, anzeige.SoundDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true, true, false,false, null));                               
-                                    }
+                                    //    Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true, true, false,false, null,null,null));                               
+                                    //}
 
-                                    if (anzeige.DokuDatei != null)
+                                    if (anzeige.MediaDatei != null && anzeige.MediaTyp == 2)
                                     {
                                         if (!DokumentZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            DokumentZwischenSpeicher.Add(anzeige.ChatText, anzeige.DokuDatei);
+                                            DokumentZwischenSpeicher.Add(anzeige.ChatText, anzeige.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true, false,false, true, null));                             
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText, anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, true, false, false, false, null, anzeige.ChatText, anzeige.MediaDatei, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+                                        Chat.Items.Add(builder);                             
                                     }
                                 }
 
@@ -1371,38 +1430,47 @@ namespace BeWo.View
                                 int zahl = (int)x.IndexOf(anzeige.SenderPersonOid.Value);
 
 
-                                if (anzeige.SoundDatei == null && anzeige.BildDatei == null && anzeige.DokuDatei == null)
+                                if (anzeige.MediaDatei == null )
                                 {
                                     Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,
                                         anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false));
                                 }
                                 else
                                 {
-                                    if (anzeige.BildDatei != null)
+                                    if (anzeige.MediaDatei != null && anzeige.MediaTyp == 1)
                                     {
 
-                                        var bild = DecodeBild(anzeige.BildDatei);
+                                        var bild = DecodeBild(anzeige.MediaDatei);
 
                                         if (!BildZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            BildZwischenSpeicher.Add(anzeige.ChatText, anzeige.BildDatei);
+                                            BildZwischenSpeicher.Add(anzeige.ChatText, anzeige.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, false, true,false, bild));                               
+
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText, anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, false, false, false, bild, null, null, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+                                        Chat.Items.Add(builder);                               
                                     }
 
-                                    if (anzeige.SoundDatei != null)
-                                    {
-                                        if (!SoundZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            SoundZwischenSpeicher.Add(anzeige.ChatText, anzeige.SoundDatei);
+                                    //if (anzeige.SoundDatei != null)
+                                    //{
+                                    //    if (!SoundZwischenSpeicher.ContainsKey(anzeige.ChatText))
+                                    //        SoundZwischenSpeicher.Add(anzeige.ChatText, anzeige.SoundDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, true, false,false, null));                                
-                                    }
+                                    //    Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, true, false,false, null,null,null));                                
+                                    //}
 
-                                    if (anzeige.DokuDatei != null)
+                                    if (anzeige.MediaDatei != null && anzeige.MediaTyp == 1)
                                     {
                                         if (!DokumentZwischenSpeicher.ContainsKey(anzeige.ChatText))
-                                            DokumentZwischenSpeicher.Add(anzeige.ChatText, anzeige.DokuDatei);
+                                            DokumentZwischenSpeicher.Add(anzeige.ChatText, anzeige.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText,anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, false, false, true, null));                            
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(person[zahl].FirstName, anzeige.ChatText, anzeige.Uhrzeit.ToString(), anzeige.SenderPersonOid.Value, false, false, false, false, null, anzeige.ChatText, anzeige.MediaDatei, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+                                        Chat.Items.Add(builder);                            
                                     }
                                 }
 
@@ -1424,6 +1492,27 @@ namespace BeWo.View
                         ServiceFacade.DoCustomerServiceSync(
                             s => s.FindAllChatMessages(senderoid, empfaengerOid));
 
+
+                   /* List<ChatMessageDC> allitems = new List<ChatMessageDC>();
+
+                    ServiceFacade.DoCustomerServiceAsync(
+                        s => s.FindAllChatMessages(senderoid, empfaengerOid),
+                        r =>
+                        {
+
+                            allitems = r;
+                        });*/
+
+                    //Umbauen daraus soll ein Button gemacht werden  
+                    if (allitems.Count >= itemGrenze)
+                    {
+                        Chat.Items.Add(new KontakMessageBuilder("", "------------------------ Mehr Nachrichten Vorhanden -----------------------", "", 0, false));
+                    }
+                    else
+                    {
+                        Chat.Items.Add(new KontakMessageBuilder("", "------------------------ Keine weiteren Nachrichten Verfügbar -----------------------", "", 0, false));
+                    }
+
                     List<long> x = new List<long>();
                     x.Add(senderoid);
                     x.Add(empfaengerOid);
@@ -1434,81 +1523,104 @@ namespace BeWo.View
 
                     foreach (var list in allitems)
                     {
+
+                        //Chat Message dem array übergeben
+                        object[] datenmengen = new object[2];
+                        datenmengen[0] = list;
+
                         if (list.IstGelesen == 1 && (list.TeamOid == null || list.TeamOid == 0))
                         {
                             if (list.SenderPersonOid == senderoid)
                             {
-                                if (list.SoundDatei == null && list.BildDatei == null && list.DokuDatei == null)
+                                if (list.MediaDatei == null)
                                 {
                                     Chat.Items.Add(new KontakMessageBuilder(person[0].FirstName, list.ChatText,
                                     list.Uhrzeit.ToString(), senderoid,true));
                                 }
                                 else
                                 {
-                                    if (list.BildDatei != null)
+                                    if (list.MediaDatei != null && list.MediaTyp == 1)
                                     {
 
-                                        var bild = DecodeBild(list.BildDatei);
+                                        var bild = DecodeBild(list.MediaDatei);
 
                                         if (!BildZwischenSpeicher.ContainsKey(list.ChatText))
-                                             BildZwischenSpeicher.Add(list.ChatText,list.BildDatei);
+                                            BildZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, true, false, bild));
+
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, false, bild, null, null, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+
+                                        Chat.Items.Add(builder);
                                     }
 
-                                    if (list.SoundDatei != null)
-                                    {
-                                        if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
-                                             SoundZwischenSpeicher.Add(list.ChatText,list.SoundDatei);
+                                    //if (list.SoundDatei != null)
+                                    //{
+                                    //    if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
+                                    //         SoundZwischenSpeicher.Add(list.ChatText,list.SoundDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, true, false, false, null));
-                                   
-                                    }
+                                    //    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, true, false, false, null,null,null));                                
+                                    //}
 
-                                    if (list.DokuDatei != null)
+                                    if (list.MediaDatei != null &&list.MediaTyp == 2)
                                     {
                                         if (!DokumentZwischenSpeicher.ContainsKey(list.ChatText))
-                                             DokumentZwischenSpeicher.Add(list.ChatText,list.DokuDatei);
+                                            DokumentZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, true, null));
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, false, null, list.ChatText, list.MediaDatei, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+                                        Chat.Items.Add(builder);
                                     }
                                 }                        
                             }
                             else
                             {
-                                if (list.SoundDatei == null && list.BildDatei == null && list.DokuDatei == null)
+                                if (list.MediaDatei == null)
                                 {
                                     Chat.Items.Add(new KontakMessageBuilder(person[1].FirstName, list.ChatText,
                                    list.Uhrzeit.ToString(), empfaengerOid, false));
                                 }
                                 else
                                 {
-                                    if (list.BildDatei != null)
+                                    if (list.MediaDatei != null && list.MediaTyp == 1)
                                     {
 
-                                        var bild = DecodeBild(list.BildDatei);
+                                        var bild = DecodeBild(list.MediaDatei);
 
                                         if (!BildZwischenSpeicher.ContainsKey(list.ChatText))
-                                             BildZwischenSpeicher.Add(list.ChatText, list.BildDatei);
+                                            BildZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, true, false, bild));
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, false, bild, null, null, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+
+                                        Chat.Items.Add(builder);
                                     }
 
-                                    if (list.SoundDatei != null)
-                                    {
-                                        if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
-                                             SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
+                                    //if (list.SoundDatei != null)
+                                    //{
+                                    //    if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
+                                    //         SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, true, true, false, false, null));
-                                   
-                                    }
+                                    //    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, true, true, false, false, null,null,null));         
+                                    //}
 
-                                    if (list.DokuDatei != null)
+                                    if (list.MediaDatei != null && list.MediaTyp == 2)
                                     {
                                         if (!DokumentZwischenSpeicher.ContainsKey(list.ChatText))
-                                             DokumentZwischenSpeicher.Add(list.ChatText, list.DokuDatei);
+                                            DokumentZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                        Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, true, null));
+
+                                        KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, false, null, list.ChatText, list.MediaDatei, true, datenmengen);
+
+                                        datenmengen[1] = builder;
+
+                                        Chat.Items.Add(builder);
                                     }
                                 }                           
                             }
@@ -1519,39 +1631,48 @@ namespace BeWo.View
                             {
                                 if (list.SenderPersonOid == senderoid)
                                 {
-                                    if (list.SoundDatei == null && list.BildDatei == null && list.DokuDatei == null)
+                                    if (list.MediaDatei == null)
                                     {
                                         Chat.Items.Add(new KontakMessageBuilder(person[0].FirstName, list.ChatText,
                                         list.Uhrzeit.ToString(), senderoid, true));
                                     }
                                     else
                                     {
-                                        if (list.BildDatei != null)
+                                        if (list.MediaDatei != null && list.MediaTyp == 1)
                                         {
 
-                                            var bild = DecodeBild(list.BildDatei);
+                                            var bild = DecodeBild(list.MediaDatei);
 
                                             if (!BildZwischenSpeicher.ContainsKey(list.ChatText))
-                                                 BildZwischenSpeicher.Add(list.ChatText, list.BildDatei);
+                                                BildZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, true, false, bild));
+
+                                            KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, false, bild, null, null, true, datenmengen);
+
+                                            datenmengen[1] = builder;
+
+                                            Chat.Items.Add(builder);
                                         }
 
-                                        if (list.SoundDatei != null)
-                                        {
-                                            if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
-                                                 SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
+                                        //if (list.SoundDatei != null)
+                                        //{
+                                        //    if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
+                                        //         SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
 
-                                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, true, false, false, null));
-                                   
-                                        }
+                                        //    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, true, false, false, null,null,null));               
+                                        //}
 
-                                        if (list.DokuDatei != null)
+                                        if (list.MediaDatei != null && list.MediaTyp == 2)
                                         {
                                             if(!DokumentZwischenSpeicher.ContainsKey(list.ChatText))
-                                                DokumentZwischenSpeicher.Add(list.ChatText, list.DokuDatei);
+                                                DokumentZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, true, null));
+
+                                            KontakMessageBuilder builder = new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), senderoid, true, false, false, false, null, list.ChatText, list.MediaDatei, true, datenmengen);
+
+                                            datenmengen[1] = builder;
+
+                                            Chat.Items.Add(builder);
                                         }
                                     }                               
                                 }
@@ -1563,38 +1684,38 @@ namespace BeWo.View
                                         i++;
                                     }
 
-                                   if (list.SoundDatei == null && list.BildDatei == null && list.DokuDatei == null)
+                                   if (list.MediaDatei == null)
                                    {
                                        Chat.Items.Add(new KontakMessageBuilder(person[1].FirstName, list.ChatText,
                                         list.Uhrzeit.ToString(), empfaengerOid, false));
                                    }
                                    else
                                    {
-                                       if (list.BildDatei != null)
+                                       if (list.MediaDatei != null && list.MediaTyp == 1)
                                        {
 
-                                           var bild = DecodeBild(list.BildDatei);
+                                           var bild = DecodeBild(list.MediaDatei);
 
                                            if (!BildZwischenSpeicher.ContainsKey(list.ChatText))
-                                                BildZwischenSpeicher.Add(list.ChatText, list.BildDatei);
+                                               BildZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                           Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, true, false, bild));
+                                           Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, false, bild, null, null, true, datenmengen));
                                        }
 
-                                       if (list.SoundDatei != null)
-                                       {
-                                           if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
-                                                SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
+                                       //if (list.SoundDatei != null)
+                                       //{
+                                       //    if (!SoundZwischenSpeicher.ContainsKey(list.ChatText))
+                                       //         SoundZwischenSpeicher.Add(list.ChatText, list.SoundDatei);
 
-                                           Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, true, true, false, false, null));                                
-                                       }
+                                       //    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, true, true, false, false, null,null,null));                                
+                                       //}
 
-                                       if (list.DokuDatei != null)
+                                       if (list.MediaDatei != null && list.MediaTyp == 2)
                                        {
                                            if (!DokumentZwischenSpeicher.ContainsKey(list.ChatText))
-                                                DokumentZwischenSpeicher.Add(list.ChatText,list.DokuDatei);
+                                               DokumentZwischenSpeicher.Add(list.ChatText, list.MediaDatei);
 
-                                           Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, true, null));
+                                           Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, list.ChatText, list.Uhrzeit.ToString(), empfaengerOid, false, false, false, false, null, list.ChatText, list.MediaDatei, true, datenmengen));
                                        }
                                    }
                                 }
@@ -1679,19 +1800,6 @@ namespace BeWo.View
             }
         }
 
-        private void Chatbox_OnTextChanged(object sender, TextChangedEventArgs e)
-        {
-        /*    if (ChatViewName.Height < 850 && Chatbox.LineCount >= 3)
-            {
-                ChatViewName.Height = ChatViewName.Height + 50;
-               
-            }else
-                if(Chatbox.LineCount <=2)
-                {
-                    ChatViewName.Height = 800;
-                }*/
-        }
-
 
         public void PruefeInDbObNeueNachrichtenVerfügbar()
         {
@@ -1753,11 +1861,6 @@ namespace BeWo.View
             }
         }
 
-        private void SortCheckBox_OnChecked(object sender, RoutedEventArgs e)
-        {       
-            //AktualisiereChatKontakt();
-        }
-
         private void Suche_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
@@ -1858,17 +1961,14 @@ namespace BeWo.View
                         imgg.Source = BuildImg(null, curItem.TypeChat);
                     }
 
-
                     BmpBitmapEncoder encoder = new BmpBitmapEncoder();
                     MemoryStream ms = new MemoryStream();
                     encoder.Frames.Add(BitmapFrame.Create((BitmapSource)imgg.Source));
                     encoder.Save(ms);
                     System.Drawing.Image img = System.Drawing.Image.FromStream(ms);
 
-
                     Bitmap imgbit = new Bitmap(img);
 
-
                     form.StartPosition = FormStartPosition.CenterScreen;
                     form.Size = imgbit.Size;
                     form.FormBorderStyle = FormBorderStyle.FixedSingle;
@@ -1888,260 +1988,191 @@ namespace BeWo.View
 
         }
 
-        //################# Lade ein Dokument in das programm  ##################################################### 
-        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        //################# Umbauen in ein Stream programm zum videochatten. ##################################################### 
+        private void ButtonVideoChat_OnClick(object sender, RoutedEventArgs e)
         {
-            string file = "";
-            string text = "";
-            int size = -1;
-            OpenFileDialog openFileDialog1 = new OpenFileDialog();
-
-            openFileDialog1.Filter = "Alle Dateien|*.*"+
-                                     "|Office Dokumente |*.doc;*.xls;*.ppt;*.txt"+
-                                     "|Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp"; 
-                                            
-
-            DialogResult result = openFileDialog1.ShowDialog(); 
-
-            if (result == System.Windows.Forms.DialogResult.OK)  // result beinhaltet ob etwas ausegwählt wurde oder nicht. 
-            {
-                file = openFileDialog1.FileName;
-                try
-                {
-                     text = File.ReadAllText(file);
-                     size = text.Length;
-
-
-                     //  Bitmap image1 = (Bitmap) System.Drawing.Image.FromFile(file,true);
-                     //  Bitmap verschicken wie?? das wird lustig hehe. und nicht nur die sondern auch die files.
-
-
-
-                }
-                catch (IOException)
-                {
-
-                }
-            }
-
-            Console.WriteLine(size); 
-            Console.WriteLine(file); 
-            Console.WriteLine(result); 
+            
         }
 
 
-        //IWavePlayer waveOutDevice = null;
-        //AudioFileReader audioFileReader = null;
+       
         // Code zum Abspielen von Sounds
         private void PlayAufnahme_OnClick(object sender, RoutedEventArgs e)
         {
+
+            var btn = sender as System.Windows.Controls.Button;
+
+            var soundArray = btn.Tag;
+
+            //Verarbeite den SoundArray 
+            //byte array  
+
+
+
+
+            Console.WriteLine("Abspielen Aufnahme");
+
+
+
+
+            //Image img = FindChildControl<Image>(this, "image") as Image;
+            //img.Source = new BitmapImage(new Uri(@"..\..\Ressources\Icons\ClipboardDisabled.png", UriKind.Relative));
+
            
-          //  Console.WriteLine("Abspielen Aufnahme");
+            //btn.Image = new Bitmap("pack://application:,,,/Ressources/icons/UserHomeBoyDisabled.png");
 
-
-          // // DisplayVisualTree(this, 1);
-
-          //  Image img = FindChildControl<Image>(this, "image") as Image;
-          //  img.Source = new BitmapImage(new Uri(@"..\..\Ressources\Icons\ClipboardDisabled.png", UriKind.Relative)); 
-          ////  Button btn = (Button) sender;
-
-          //  //btn.Image = new Bitmap("pack://application:,,,/Ressources/icons/UserHomeBoyDisabled.png");
-
-          //  if (waveOutDevice == null)
+          //  if (mediaPlayer == null/*waveOutDevice == null*/)
           //  {
-          //      //simpleSound = new SoundPlayer(@"C:\Temp\WOMBO.mp3");   // Lade hier den Zwischenspeicher der noch erstellt werden soll und den Pfad der wav datei enthält
-          //      //simpleSound.Play();
+                //simpleSound = new SoundPlayer(@"C:\Temp\WOMBO.mp3");   // Lade hier den Zwischenspeicher der noch erstellt werden soll und den Pfad der wav datei enthält
+                //simpleSound.Play();
 
-          //      waveOutDevice = new WaveOut();
-          //      audioFileReader = new AudioFileReader(@"C:\Temp\WOMBO.mp3");
+                /*waveOutDevice = new WaveOut();
+                audioFileReader = new AudioFileReader(@"C:\Temp\WOMBO.mp3");
 
-          //      waveOutDevice.Init(audioFileReader);
-          //      waveOutDevice.Play();
-          //  }
-          //  else
-          //  {
-          //      //simpleSound.Stop();
-          //      //simpleSound = null;
+                waveOutDevice.Init(audioFileReader);
+                waveOutDevice.Play();
+                */
+            //    InitialiseMediaPlayer();
+            // }
+           // else
+           // {
+                //simpleSound.Stop();
+                //simpleSound = null;
 
-          //      waveOutDevice.Stop();
-          //      audioFileReader.Dispose();
-          //      waveOutDevice.Dispose();
-          //      waveOutDevice = null;
-          //      audioFileReader = null;
-          //  }
+            //    mediaPlayer.Stop();
+            //    mediaPlayerTimer.Stop();
+            //    mediaPlayer = null;
+            //    mediaPlayerTimer = null;
+                /*waveOutDevice.Stop();
+                audioFileReader.Dispose();
+                waveOutDevice.Dispose();
+                waveOutDevice = null;
+                audioFileReader = null;*/
+           // }
 
-          //  Console.WriteLine("Abspielen Beendet");
+            Console.WriteLine("Abspielen Beendet");
         }
 
-        //########################## Test Versuche zu lern zwecken ######################################
-        private void DisplayVisualTree(DependencyObject control, int indent)
+
+        //######################## Test phasen für Sound Datei ##########################
+       /* MediaPlayer mediaPlayer = null;
+        DispatcherTimer mediaPlayerTimer = null;
+        KontakSliderBuilder newSlide = new KontakSliderBuilder();
+        private void InitialiseMediaPlayer()
         {
-        /*    string tab = "";
-            for (int i = 1; i <= indent; i++)
-                tab += "t";
+            mediaPlayer = new MediaPlayer();
+            mediaPlayer.MediaOpened += MediaPlayer_MediaOpened;
+            mediaPlayer.Open(new Uri(@"C:\Temp\WOMBO.mp3", UriKind.Absolute));
+        }
 
-          // FrameworkElement ctrl = control as FrameworkElement;
-           Console.WriteLine("{0}, {1}",
-                tab ,control);*/
-
-            int childNumber = VisualTreeHelper.GetChildrenCount(control);
-
-            for (int i = 0; i < childNumber; i++)
+        private void MediaPlayer_MediaOpened(object sender, EventArgs e)
+        {
+            if (mediaPlayer.NaturalDuration.HasTimeSpan)
             {
-                DependencyObject child = VisualTreeHelper.GetChild(control, i);
-
-                DisplayVisualTree(child, indent + 1);
+                newSlide.sliderMaximum = mediaPlayer.NaturalDuration.TimeSpan.TotalSeconds;
+                mediaPlayerTimer = new DispatcherTimer();
+                mediaPlayerTimer.Interval = TimeSpan.FromMilliseconds(1000);
+                mediaPlayerTimer.Tick += MediaPlayerTimer_Tick;
+                mediaPlayerTimer.Start();
+                mediaPlayer.Play();
             }
         }
 
 
-        private DependencyObject FindChildControl<T>(DependencyObject control, string ctrlName)
-        {
-            int childNumber = VisualTreeHelper.GetChildrenCount(control);
-            for (int i = 0; i < childNumber; i++)
-            {
-                DependencyObject child = VisualTreeHelper.GetChild(control, i);
-                FrameworkElement fe = child as FrameworkElement;
-                // Not a framework element or is null
-                if (fe == null) return null;
- 
-                if (child is T && fe.Name == ctrlName)
-                {
-                    // Found the control so return
-                    return child;
-                }
-                else
-                {
-                    // Not found it - search children
-                    DependencyObject nextLevel = FindChildControl<T>(child, ctrlName);
-                    if (nextLevel != null)
-                        return nextLevel;
-                }
-            }
-            return null;
-        }
 
-        //#################################################################################################
+        private void MediaPlayerTimer_Tick(object sender, EventArgs e)
+        {
+            if (mediaPlayer != null)
+            {
+                newSlide.position = mediaPlayer.Position.TotalSeconds;
+                newSlide.time = mediaPlayer.Position;
+            }
+        }*/
+        //##################################################################################
 
         private void Sound_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            //if (AktChatUser.Items.Count != 0)
-            //{ 
-            //    if (WaveIn.DeviceCount != 0)
-            //    {
-            //        try
-            //        {
-            //            WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(0);
-            //            Console.WriteLine("Device {0}: {1}, {2} channels", WaveIn.DeviceCount, deviceInfo.ProductName,
-            //                deviceInfo.Channels);
+            if (AktChatUser.Items.Count != 0)
+            {
+                if (WaveIn.DeviceCount != 0)
+                {
+                    try
+                    {
+                        WaveInCapabilities deviceInfo = WaveIn.GetCapabilities(0);
+                        Console.WriteLine("Device {0}: {1}, {2} channels", WaveIn.DeviceCount, deviceInfo.ProductName,
+                            deviceInfo.Channels);
 
-            //            waveSource = new WaveIn();
-            //            waveSource.WaveFormat = new WaveFormat(441000, 2);
-            //            // waveSource.DeviceNumber = 1;
-            //            waveSource.DataAvailable += waveSource_DataAvailable;
-            //            waveSource.RecordingStopped += waveSource_RecordingStopped;
+                        waveSource = new WaveIn();
+                        waveSource.WaveFormat = new WaveFormat(441000, 2);
+                        // waveSource.DeviceNumber = 1;
+                        waveSource.DataAvailable += waveSource_DataAvailable;
+                        waveSource.RecordingStopped += waveSource_RecordingStopped;
 
-            //          //  waveFile = new WaveFileWriter(@"C:\Temp\Ich_Hau_Dich.wav", waveSource.WaveFormat); // <---- Muss abgesprochen werden
+                        //  waveFile = new WaveFileWriter(@"C:\Temp\Ich_Hau_Dich.wav", waveSource.WaveFormat); // <---- Muss abgesprochen werden
 
 
-            //            waveSource.StartRecording();            //<---- Da gibt es zurzeit probleme, der grund könnte mit dem mic zusammen hängen.
-            //        }
-            //        catch (Exception f)
-            //        {
-                        
-            //            MessageBox.Show("Unbekannter Fehler: " + f.Message + "\n" + f.StackTrace, "Fehler: 2393 ", MessageBoxButton.OK);
-            //        }
-            //    }
-            //    else
-            //    {
-            //      //  MessageBox.Show("Bitte Schließen sie ein Microfon an, um diese Funktion nutzen zu können.", "Kein Microfon vorhanden.",MessageBoxButton.OK);
-            //    }
+                        waveSource.StartRecording();            //<---- Da gibt es zurzeit probleme, der grund könnte mit dem mic zusammen hängen.
+                    }
+                    catch (Exception f)
+                    {
 
-            //}
-            //else
-            //{
-            //    MessageBox.Show("Bitte Wählen sie einen Chat Partner aus","Info",MessageBoxButton.OK);
-            //}
+                        MessageBox.Show("Unbekannter Fehler: " + f.Message + "\n" + f.StackTrace, "Fehler: 2393 ", MessageBoxButton.OK);
+                    }
+                }
+                else
+                {
+                    //  MessageBox.Show("Bitte Schließen sie ein Microfon an, um diese Funktion nutzen zu können.", "Kein Microfon vorhanden.",MessageBoxButton.OK);
+                }
+
+            }
+            else
+            {
+                MessageBox.Show("Bitte Wählen sie einen Chat Partner aus", "Info", MessageBoxButton.OK);
+            }
             
-
-
         }
 
         private void Sound_OnPreviewMouseUp(object sender, MouseButtonEventArgs e)
         {
-            //if (AktChatUser.Items.Count != 0)
-            //{
-            //    if (WaveIn.DeviceCount != 0)
-            //    {               
-            //        waveSource.StopRecording();
-            //    }
-
-                
-
-            //    KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
-
-            //    string filename = Path.GetFileName(@"C:\Temp\WOMBO.mp3");     
-            //    // Sound name muss übergeben werden bzw eigentlich garnicht weil wir ja sound aufnehmen und da kann dann der name und das aufnahme datum hin
-            //    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName,filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, true, false, false,null));
-
-            //    //waveSource in byte[] umwandeln und in db speichern 
-
-            //    FileStream fileStream = new FileStream(@"C:\Temp\WOMBO.mp3", FileMode.Open, FileAccess.Read);
-
-            //    //versuchen geht über studieren 
-            //    byte[] soundBytes = new Byte[fileStream.Length];
-
-            //    fileStream.Read(soundBytes, 0, soundBytes.Length);
-
-            //    //byte[] compressedbuffer = null;
-            //    //using (var buffercompress = new MemoryStream())
-            //    //{
-            //    //    using (var gzs = new BufferedStream(new GZipStream(buffercompress,
-            //    //        CompressionMode.Compress)))
-            //    //    {
-            //    //        gzs.Write(soundBytes, 0, soundBytes.Length);
-            //    //    }
-            //    //    compressedbuffer = buffercompress.ToArray();
-            //    //}
-
-            //    SendSpeziallToServer(curItem.EmpfaengerOid, curItem.TypeChat, filename, soundBytes, null, null);
-
-            //    Chat.Items.MoveCurrentToLast();
-            //    Chat.ScrollIntoView(Chat.Items.CurrentItem);
-
-            //    //Erstelle Hier den Bereich der im Chat dann die Sounddatei enthält um diese abspielen zu können.  
-            //}
+            if (AktChatUser.Items.Count != 0)
+            {
+                if (WaveIn.DeviceCount != 0)
+                {
+                    waveSource.StopRecording();
+                }
+                //übergebe gespeicherte aufnahme an prozess zum senden/speichern    WOMBO.mp3
+               // ZeigeProgressWärendUpload(3, @"C:\Temp\WOMBO.mp3");
+            }
  
         }
        
         //testen
-        //private void waveSource_DataAvailable(object sender, WaveInEventArgs e)
-        //{
-        //    if (waveFile != null)
-        //    {
-        //        waveFile.Write(e.Buffer, 0, e.BytesRecorded);
-        //        waveFile.Flush();
-        //    }
-        //}
+        private void waveSource_DataAvailable(object sender, WaveInEventArgs e)
+        {
+            if (waveFile != null)
+            {
+                waveFile.Write(e.Buffer, 0, e.BytesRecorded);
+                waveFile.Flush();
+            }
+        }
 
         ////testen
-        //private void waveSource_RecordingStopped(object sender, StoppedEventArgs e)
-        //{
-        //    if (waveSource != null)
-        //    {
-        //        waveSource.Dispose();
-        //        waveSource = null;
-        //    }
+        private void waveSource_RecordingStopped(object sender, StoppedEventArgs e)
+        {
+            if (waveSource != null)
+            {
+                waveSource.Dispose();
+                waveSource = null;
+            }
 
-        //    if (waveFile != null)
-        //    {
-        //        waveFile.Dispose();
-        //        waveFile = null;
-        //    }
-        //}
+            if (waveFile != null)
+            {
+                waveFile.Dispose();
+                waveFile = null;
+            }
+        }
 
 
-      
         //fertig | design aber noch nicht 
         private void MediaBase_OnClick(object sender, RoutedEventArgs e)
         {
@@ -2151,22 +2182,27 @@ namespace BeWo.View
                 {
 
                     form1.StartPosition = FormStartPosition.CenterParent;
-                    form1.Size = new System.Drawing.Size(250, 100);
+                    form1.Size = new System.Drawing.Size(260, 80);
                     form1.FormBorderStyle = FormBorderStyle.FixedSingle;
                     form1.Text = "Media";
 
                     Button btnPic = new Button(); 
                     btnPic.Text = "Bild";
+                    btnPic.Name = "Pic";
                     btnPic.Size = new System.Drawing.Size(120, 45);
+                    btnPic.Margin = new Padding(2,2,2,2);
                     btnPic.TextAlign = ContentAlignment.MiddleCenter;
-                    btnPic.Click += buttonPic_Click;
+                    btnPic.Click += buttonMedia_Click;
+                    
                    
                     Button btnDok = new Button();
                     btnDok.Text = "Dokument";
+                    btnDok.Name = "Dok";
                     btnDok.Size = new System.Drawing.Size(120, 45);
+                    btnDok.Margin = new Padding(2,2,2,2);
                     btnDok.Location = new System.Drawing.Point(125,0);
                     btnDok.TextAlign = ContentAlignment.MiddleCenter;
-                    btnDok.Click += buttonDok_Click;
+                    btnDok.Click += buttonMedia_Click;
 
                     form1.Controls.Add(btnPic);
                     form1.Controls.Add(btnDok);
@@ -2183,79 +2219,102 @@ namespace BeWo.View
         }
 
         //fertig
-        public void buttonPic_Click(object s,EventArgs x)
-        { 
-            bool format = false;
+        public void buttonMedia_Click(object s,EventArgs x)
+        {        
             try
             {
-                string file = "";
-                string text = "";
-                int size = -1;
+                Button btn = (Button) s;  
+                int typ = 0;
+
+                if (btn.Name.Equals("Pic"))              
+                    typ = 1;
+                else
+                    typ = 2;           
+
                 OpenFileDialog openFileDialog1 = new OpenFileDialog();
 
-                openFileDialog1.Filter = "Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp"; 
-                                         
+                if(typ == 1)
+                    openFileDialog1.Filter = "Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp";
+                else
+                    openFileDialog1.Filter = "Office Dokumente |*.doc;*.xls;*.ppt;*.txt";
+                     
                 DialogResult result = openFileDialog1.ShowDialog();
-
+         
                 if (result == System.Windows.Forms.DialogResult.OK)
                 {
-                    format = true;
-                    file = openFileDialog1.FileName;
-
-                    string filename = Path.GetFileName(file);                
-                    
-                    ImageSource imageSource = new BitmapImage(new Uri(file));
-                    
-                    KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
-
-                    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, false, true, false, imageSource));
-
-                    if (form1 != null)
-                    {
-                        form1.Close();
-                    }
-
-                    Chat.Items.MoveCurrentToLast();
-                    Chat.ScrollIntoView(Chat.Items.CurrentItem);
-
-                    // Bereich zum Speichern der Fotos in die Datenbank 
-                    FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read);
-                                            
-                    BitmapImage i = new BitmapImage();
-
-                    i.BeginInit();
-                    i.StreamSource = fileStream;
-                    i.EndInit();
-
-                    byte[] bits = ImageToByte(i);
-
-                    //byte[] compressedbuffer = null;
-                    //using (var buffercompress = new MemoryStream())
-                    //{
-                    //    using (var gzs = new BufferedStream(new GZipStream(buffercompress,
-                    //        CompressionMode.Compress)))
-                    //    {
-                    //        gzs.Write(bits, 0, bits.Length);
-                    //    }
-                    //    compressedbuffer = buffercompress.ToArray();
-                    //}
-
-                    SendSpeziallToServer(curItem.EmpfaengerOid, curItem.TypeChat, filename, null, null, bits);
-                }
-               
+                    ZeigeProgressWärendUpload(typ,openFileDialog1.FileName);    
+                }           
             }
             catch (Exception e)
-            {
-                if(format)
-                    MessageBox.Show("Bitte wählen sie das richtige Dateiformat aus. ","Fehler: Falsches Dateiformat",MessageBoxButton.OK); 
-                else
-                    MessageBox.Show("Unbekannter Fehler: " + e.Message + "\n" + e.StackTrace, "Fehler: 2394 ", MessageBoxButton.OK); 
+            {        
+                MessageBox.Show("Unbekannter Fehler: " + e.Message + "\n" + e.StackTrace, "Fehler: 2394 ", MessageBoxButton.OK); 
             }
         }
 
+        private void ZeigeProgressWärendUpload(int mediaart, string file)
+        {
+            KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
+            string filename = "";
 
-        //#################################### Extra für Speziall Messages Erstellt #########################################################################
-        private void SendSpeziallToServer(long empfängeroid,ChatType type,string filename,byte[] sound, byte[] doku, byte[] bild)
+            try
+            {
+                filename = Path.GetFileName(file);
+
+                Dispatcher.BeginInvoke(
+                    DispatcherPriority.Background,
+                    (Action)(() =>
+                    {
+                        progressView = new ChatProgressBarView("Upload");
+                        progressView.Show();
+
+                        var upload = new ProgressStream(File.OpenRead(file));
+
+                        upload.ProgressChanged += (s, e) => Dispatcher.BeginInvoke(  
+                            DispatcherPriority.Normal,
+                            (Action)(() =>
+                            {
+                                progressView.progressBar.Value = e.Data * 100;
+                            }));
+
+                        SendSpeziallToServer(curItem.EmpfaengerOid, curItem.TypeChat, filename, upload, mediaart);
+                        
+                    }));
+            }
+            catch (Exception edf)
+            {
+                MessageBox.Show("Es ist ein Fehler beim speichern der Datei aufgetreten. \n" + edf.Message + "\n" + edf.StackTrace, "Fehler", MessageBoxButton.OK);
+            }
+
+            try
+            {
+                switch (mediaart)
+                {
+                    case 1:
+                            ImageSource imageSource = new BitmapImage(new Uri(file));
+
+                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName,
+                                filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, false, true, false,
+                                imageSource,null,null,false,null));
+                            break;
+                    case 2:
+                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName,
+                                filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, false, false, true, null, file, null, false, null));
+                        break;
+                    case 3:
+                            Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName,
+                                filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, true, false, false, null, null, null, false, null));
+                        break;
+                }
+                Chat.Items.MoveCurrentToLast();
+                Chat.ScrollIntoView(Chat.Items.CurrentItem);
+            }
+            catch (Exception edfx)
+            {
+                MessageBox.Show("Bitte wählen sie das richtige Dateiformat aus. \n" + edfx.Message + "\n" + edfx.StackTrace, "Fehler: Falsches Dateiformat", MessageBoxButton.OK);
+            }    
+        }
+      
+        private void SendSpeziallToServer(long empfängeroid, ChatType type, string filename, Stream istream,int mediatyp)
         {
             if (tcpClient.Connected)
             {
@@ -2276,65 +2335,54 @@ namespace BeWo.View
                     outStream = a.GetDataStream(BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, BeWoApp.LoggedOnUser.LoginName, filename, 0, BeWoApp.Tenant, false, true, guid.ToString()/*,sound,doku,bild*/ );
                 }
 
-
                 serverStream.Write(outStream, 0, outStream.Length);
                 serverStream.Flush();
-
             }
             else
             {
-                SaveChatSpeziallMessageinDB(type, BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, filename, false, sound,doku,bild);
+                SaveChatSpeziallMessageinDB(type, BeWoApp.LoggedOnUser.Employee.PersonOid, empfängeroid, filename, false,mediatyp,istream);
             }
         }
 
         //fertig
-        private void SaveChatSpeziallMessageinDB(ChatType type,long senderoid,long empfangid,string message, bool istZugestellt,byte[] sound, byte[] doku, byte[] bild)
+        private void SaveChatSpeziallMessageinDB(ChatType type, long senderoid, long empfangid, string message, bool istZugestellt, int mediatype, Stream upload)
         {
+            UploadChatPackage chatpack;
+            var guid = Guid.NewGuid();   
+            
             if (type == ChatType.Team)
-            {
-                ServiceFacade.DoOperationsServiceSync(s => s.CreateNewSpeziallChatMessagesDC(senderoid, empfangid, message, istZugestellt, empfangid, sound, doku, bild));
+            {   
+                chatpack = new UploadChatPackage(empfangid, istZugestellt, mediatype, message,guid.ToString() ,senderoid, empfangid, upload);
             }
             else
             {
-                ServiceFacade.DoOperationsServiceSync(s => s.CreateNewSpeziallChatMessagesDC(senderoid, empfangid, message, istZugestellt, 0, sound, doku, bild));
+                chatpack = new UploadChatPackage(empfangid, istZugestellt, mediatype, message,guid.ToString(), senderoid, 0, upload);
             }
+
+            ServiceFacade.DoStreamingServiceAsync(s => s.CreateNewSpeziallStreamChatMessagesDC(chatpack),
+                                                    r => this.Dispatch(
+                                                    delegate
+                                                    {  
+                                                        if (form1 != null)
+                                                        {
+                                                            form1.Close();                                                         
+                                                        }
+                                                        progressView.Close();
+                                                        upload.Dispose();
+                                                    }), 
+                                                        () => this.Dispatch(
+                                                        delegate
+                                                        {
+                                                            progressView.Close();
+                                                            upload.Dispose();
+                                                        }));    
         }
 
-        //fertig
-        public Byte[] ImageToByte(BitmapImage imageSource)
-        {     
-            var encoder = new JpegBitmapEncoder();
-            encoder.Frames.Add(BitmapFrame.Create(imageSource));
 
-            using (var ms = new MemoryStream())
-            {
-                encoder.Save(ms);
-                return ms.ToArray();
-            }
-        }
-
-        //fertig
         private ImageSource DecodeBild(byte[] byteVal)
         {         
             try
             {
-
-                //using (var compressedMs = new MemoryStream(byteVal))
-                //{
-                //    using (var decompressedMs = new MemoryStream())
-                //    {
-                //        using (var gzs = new BufferedStream(new GZipStream(compressedMs,
-                //         CompressionMode.Decompress)))
-                //        {
-                //            gzs.CopyTo(decompressedMs);
-                //        }
-                //        byteVal = decompressedMs.ToArray();
-                //    }
-                //}
-
-
-
-
                 var image = new BitmapImage();
                 using (var mem = new MemoryStream(byteVal))
                 {
@@ -2345,102 +2393,117 @@ namespace BeWo.View
                     image.UriSource = null;
                     image.StreamSource = mem;
                     image.EndInit();
-                }
-                
+                }         
                 return image;
             }
             catch (Exception ex)
             {
                 return null;
             }
-
         }
 
-        
-        //####################################################################################################################################################
-
-        public void buttonDok_Click(object s, EventArgs x)
-        {
-            try
-            {
-                string file = "";
-                string text = "";
-                int size = -1;
-                OpenFileDialog openFileDialog1 = new OpenFileDialog();
-
-                openFileDialog1.Filter = "Office Dokumente |*.doc;*.xls;*.ppt;*.txt";
-
-                DialogResult result = openFileDialog1.ShowDialog();
-
-                if (result == System.Windows.Forms.DialogResult.OK)
-                {
-                    file = openFileDialog1.FileName;
-
-                    string filename = Path.GetFileName(file);
-
-                    //text = File.ReadAllText(file);
-                    size = text.Length;
-
-
-                    KontaktlistBuilder curItem = (KontaktlistBuilder)AktChatUser.Items[0];
-
-                    Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.Employee.FirstName, filename, DateTime.Now.ToString(), curItem.EmpfaengerOid, true, false, false, true, null));
-
-
-                    // Maximum liegt hier bei 2GB 
-                    byte[] buffer = null;
-                    using (FileStream fs = new FileStream(file, FileMode.Open, FileAccess.Read))
-                    {
-                        buffer = new byte[fs.Length];
-                        fs.Read(buffer, 0, (int)fs.Length);
-                    }
-
-                    //byte[] compressedbuffer= null;  
-                    //using (var buffercompress = new MemoryStream())
-                    //{
-                    //    using (var gzs = new BufferedStream(new GZipStream(buffercompress,
-                    //        CompressionMode.Compress)))
-                    //    {
-                    //        gzs.Write(buffer, 0, buffer.Length);
-                    //    }
-                    //    compressedbuffer = buffercompress.ToArray();
-                    //}
-
-
-
-                    SendSpeziallToServer(curItem.EmpfaengerOid, curItem.TypeChat, filename, null, buffer, null);
-                    
-                    Chat.Items.MoveCurrentToLast();
-                    Chat.ScrollIntoView(Chat.Items.CurrentItem);
-
-                    if (form1 != null)
-                    {
-                        form1.Close();                 
-                    }
-                }
-
-                Console.WriteLine(size);
-                Console.WriteLine(file);
-                Console.WriteLine(result);
-
-                
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Fehler: "+ e.StackTrace);
-            }
-        }
-
-
-        
-
-
-        //###########################################################################################################
+         
         private void OpenDokument_OnClick(object sender, RoutedEventArgs e)
         {
-            Process.Start(@"C:\Users\LoginDaten.txt");
+            var btn = sender as System.Windows.Controls.Button;
+
+           //Process myProcess = new Process();
+
+            if (btn.Tag != null)
+            {
+                var filename = btn.Tag;
+
+                var fileType = filename.GetType();
+
+
+                if (fileType == typeof (String))
+                {            
+                    Process.Start(filename.ToString());
+
+                    if (!Speicherpfad.ContainsKey(filename.ToString()))
+                        Speicherpfad.Add(filename.ToString(), filename.ToString());
+                }
+                else if (fileType == typeof (object[]))
+                {
+                    var dokarray = (object[]) btn.Tag;
+
+                    string file = dokarray[0].ToString();
+                    byte[] dokBytes = (byte[]) dokarray[1];
+
+
+                    string path = @"c:\temp\" + file;
+
+                    if (File.Exists(path))
+                    {
+                        try
+                        {
+                            File.Delete(path);
+
+                            using (FileStream SourceStream = File.Open(path, FileMode.OpenOrCreate))
+                            {
+                                SourceStream.Seek(0, SeekOrigin.End);
+                                SourceStream.Write(dokBytes, 0, dokBytes.Length);
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            
+                        }
+                        
+                    }
+                    else
+                    {
+                        using (FileStream SourceStream = File.Open(path, FileMode.OpenOrCreate))
+                        {
+                            SourceStream.Seek(0, SeekOrigin.End);
+                            SourceStream.Write(dokBytes, 0, dokBytes.Length);
+                        }
+                    }
+
+
+                    //Dispatcher.BeginInvoke(
+                    //    DispatcherPriority.Normal,
+                    //    (Action)(() =>
+                    //    {
+
+
+                        //    myProcess.StartInfo.FileName = path;
+                        //    myProcess.EnableRaisingEvents = true;
+                        //    myProcess.Exited += myProcess_Exited;
+
+                        //    myProcess.Start();
+
+                        //    myProcess.WaitForExit();
+
+                        //    myProcess.Close();
+                        //}));
+                    Process.Start(path);
+
+                    if(!Speicherpfad.ContainsKey(file))
+                        Speicherpfad.Add(file,path);
+
+                }
+            }
         }
 
+        //private void myProcess_Exited(object sender, EventArgs e)
+        //{
+        //    var x = (Process)sender;
+
+        //    try
+        //    {
+        //        if (File.Exists(x.StartInfo.FileName))
+        //        {
+        //            File.Delete(x.StartInfo.FileName);
+        //            MessageBox.Show("File wurde erfolgreich deletet/ ID: " + x.Id, "File Deletet Info", MessageBoxButton.OK);
+        //        }
+        //    }
+        //    catch (Exception)
+        //    {
+        //        MessageBox.Show("File Wurde bereits gelöscht / ID: " + x.Id + " / Filename: " + x.StartInfo.FileName, "File Deletet Info", MessageBoxButton.OK);
+        //    }
+        //}
+
         private void ChatView_OnStateChanged(object sender, EventArgs e)
         {
             if (this.WindowState == WindowState.Maximized)
@@ -2448,6 +2511,47 @@ namespace BeWo.View
                 this.WindowState = WindowState.Normal;
             }
         }
+
+        //VerunVolständigt
+        //private void AudioSlider_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        //{
+
+        //    var slider = sender as Slider;
+
+        //    slider.Minimum = 0;
+        //    slider.Maximum = audioFileReader.Length;
+        //    slider.Value = (int)audioFileReader.Position;
+        //}
+
+
+        private void DatenRunterladen_OnClick(object sender, RoutedEventArgs e)
+        {
+            System.Windows.Controls.Button x = (System.Windows.Controls.Button)sender;
+
+            object[] array = (object[])x.Tag;
+
+            ChatMessageDC messagedc = (ChatMessageDC) array[0];
+
+            KontakMessageBuilder kontaktmessage = (KontakMessageBuilder) array[1];
+
+            var index = Chat.Items.IndexOf(kontaktmessage);
+        
+            if(messagedc.MediaTyp == 1)
+                kontaktmessage.PictureVisibility = Visibility.Visible;
+            else
+                kontaktmessage.DokumentVisibility = Visibility.Visible;
+
+            kontaktmessage.Herunterladen = Visibility.Collapsed;
+
+            Chat.Items[index] = kontaktmessage;
+
+
+
+            //Von der Datenbank aus die Daten Rausholen.
+
+
+            Chat.Items.Refresh();
+        }
     }
 
     public class KontaktlistBuilder : INotifyPropertyChanged
@@ -2464,8 +2568,7 @@ namespace BeWo.View
 
             if (statustyp == StatusType.Online)
             {
-                this.Color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;//new SolidColorBrush(Colors.Green);
-               //Color.Opacity = 0.5;         
+                this.Color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;         
             }
             else if (statustyp == StatusType.Offline)
             {
@@ -2503,7 +2606,7 @@ namespace BeWo.View
 
             if (statustyp == StatusType.Online)
             {
-                this.Color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;//new SolidColorBrush(Colors.Green);
+                this.Color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;
             }
             else if (statustyp == StatusType.Offline)
             {
@@ -2535,7 +2638,7 @@ namespace BeWo.View
 
             if (_statustyp == StatusType.Online)
             {
-                _color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;//new SolidColorBrush(Colors.Green);
+                _color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;
             }
             else if (_statustyp == StatusType.Offline)
             {
@@ -2543,7 +2646,7 @@ namespace BeWo.View
             }
             else
             {
-                _color = new SolidColorBrush(Colors.Orange);  //Orange
+                _color = new SolidColorBrush(Colors.Orange); 
             }
             
             OnPropertyChanged("Lastms"); } }
@@ -2567,7 +2670,7 @@ namespace BeWo.View
             {
                 if (StatusTyp == StatusType.Online)
                 {
-                    _color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;//new SolidColorBrush(Colors.Green);             
+                    _color = new BrushConverter().ConvertFromString("#00ae00") as SolidColorBrush;           
                 }
                 else if (StatusTyp == StatusType.Offline)
                 {
@@ -2577,8 +2680,7 @@ namespace BeWo.View
                 {
                     _color = new SolidColorBrush(Colors.Orange);           
                 }
-
-                //_color = value;
+        
                 OnPropertyChanged("Color"); }
         }
 
@@ -2604,7 +2706,6 @@ namespace BeWo.View
                     _colorType = new SolidColorBrush(Colors.Green);
                 }
 
-                //_color = value;
                 OnPropertyChanged("ColorType");
             }
         }
@@ -2628,33 +2729,32 @@ namespace BeWo.View
             SendTime = sendtime;
             MessagePersonOid = messagePersonOid;
 
-            if (isme && messagePersonOid == 0)
+            if (messagePersonOid == 0)
             {
-                ChatColor = new SolidColorBrush(Colors.Lavender);
+                ChatColor = new SolidColorBrush(Colors.CornflowerBlue);
                 Posi = "Center";
             }else
                 if (isme)
-                {
-                    //ChatColor = new SolidColorBrush(Colors.DarkOrange);
+                {                 
                     ChatColor = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush;
                     Posi = "Right";
                 }
                 else
-                {
-                    //ChatColor = new SolidColorBrush(Colors.LightGray); 
+                {                   
                     ChatColor = new BrushConverter().ConvertFromString("#cccccc") as SolidColorBrush;
                     Posi = "Left"; 
                 }
 
-            ChatVisibility = Visibility.Visible;
-            SoundVisibility = Visibility.Collapsed;
-            PictureVisibility = Visibility.Collapsed;
-            DokumentVisibility = Visibility.Collapsed;
+            ChatVisibility      = Visibility.Visible;
+            SoundVisibility     = Visibility.Collapsed;
+            _pictureVisibility = Visibility.Collapsed;
+            DokumentVisibility  = Visibility.Collapsed;
+            _herunterladen      = Visibility.Collapsed;
                 
         }
-
-        //########################################### Konstrucktor für Sound Datei und Picture :) ################################################ 
-        public KontakMessageBuilder(string username, string message, string sendtime, long messagePersonOid, bool isme, bool isSoundDatei, bool isPicDatei, bool isDokument,ImageSource source)
+    
+        public KontakMessageBuilder(string username, string message, string sendtime, long messagePersonOid, bool isme,
+            bool isSoundDatei, bool isPicDatei, bool isDokument, ImageSource source, string fulldokpfad, byte[] dokarray,bool isHerunterladen,object[] herunterladbares)
         {
             Username = username;
             UserMessage = message;
@@ -2666,59 +2766,97 @@ namespace BeWo.View
                 ChatColor = new SolidColorBrush(Colors.Lavender);
                 Posi = "Center";
             }
+            else if (isme)
+            {
+               
+                ChatColor = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush;
+                Posi = "Right";
+            }
             else
-                if (isme)
-                {
-                    //ChatColor = new SolidColorBrush(Colors.DarkOrange);
-                    ChatColor = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush;
-                    Posi = "Right";
-                }
-                else
-                {
-                    //ChatColor = new SolidColorBrush(Colors.LightGray); 
-                    ChatColor = new BrushConverter().ConvertFromString("#cccccc") as SolidColorBrush;
-                    Posi = "Left";
-                }
+            {
+               
+                ChatColor = new BrushConverter().ConvertFromString("#cccccc") as SolidColorBrush;
+                Posi = "Left";
+            }
 
             if (isSoundDatei)
             {
                 ChatVisibility = Visibility.Collapsed;
                 SoundVisibility = Visibility.Visible;
-                PictureVisibility = Visibility.Collapsed;
+                _pictureVisibility = Visibility.Collapsed;
                 DokumentVisibility = Visibility.Collapsed;
-                ImageSources = null;
+                _herunterladen = Visibility.Collapsed;             
 
-            }else 
-                if (isDokument)
-                {
-                    ChatVisibility = Visibility.Collapsed;
-                    SoundVisibility = Visibility.Collapsed;
-                    PictureVisibility = Visibility.Collapsed;
-                    DokumentVisibility = Visibility.Visible;
-                    ImageSources = null;
-                }else
-                    if (isPicDatei && source != null)
-                    {
-                        ChatVisibility = Visibility.Collapsed;
-                        SoundVisibility = Visibility.Collapsed;
-                        PictureVisibility = Visibility.Visible;
-                        DokumentVisibility = Visibility.Collapsed;
-                        ImageSources = source;
-                    }
-                    else
-                    {
-                        ChatVisibility = Visibility.Visible;
-                        SoundVisibility = Visibility.Collapsed;
-                        PictureVisibility = Visibility.Collapsed;
-                        DokumentVisibility = Visibility.Collapsed;
-                        ImageSources = null;
-                    }
+            }
+            else if (isDokument)
+            {
+                ChatVisibility = Visibility.Collapsed;
+                SoundVisibility = Visibility.Collapsed;
+                _pictureVisibility = Visibility.Collapsed;
+                DokumentVisibility = Visibility.Visible;
+                _herunterladen = Visibility.Collapsed;
+              
+            }
+            else if (isPicDatei && source != null)
+            {
+                ChatVisibility = Visibility.Collapsed;
+                SoundVisibility = Visibility.Collapsed;
+                _pictureVisibility = Visibility.Visible;
+                DokumentVisibility = Visibility.Collapsed;
+                _herunterladen = Visibility.Collapsed;            
+            }
+            else if (isHerunterladen)
+            {
+                _herunterladen = Visibility.Visible;
+                ChatVisibility = Visibility.Collapsed;
+                SoundVisibility = Visibility.Collapsed;
+                _pictureVisibility = Visibility.Collapsed;
+                DokumentVisibility = Visibility.Collapsed;
+                
+            }
+            else
+            {
+                ChatVisibility = Visibility.Visible;
+                SoundVisibility = Visibility.Collapsed;
+                _pictureVisibility = Visibility.Collapsed;
+                DokumentVisibility = Visibility.Collapsed;
+                _herunterladen = Visibility.Collapsed;
+               
+            }
+
+
+            if (source != null)
+            {
+                ImageSources = source;
+            }
+
+
+            //Dokument 
+            object[] array1 = new object[2];
+            
+            if (fulldokpfad != null && dokarray == null)
+            {
+                Dokpfad = fulldokpfad;
+            }
+            else if (dokarray != null && fulldokpfad != null)
+            {
+                array1[0] = fulldokpfad; 
+                array1[1] = dokarray;
+
+                Dokpfad = array1;
+            }
+
+
+            if (herunterladbares != null)
+            {
+                Herunterladbares = herunterladbares;
+            }
+
+            //array übergabe für Sound ermöglichen
+            SoundArray = null;
 
         }
 
-        //###########################################################################################################################################
-
-
         public string Username { get; private set; }
         public string UserMessage { get; private set; }
         public string SendTime { get; private set; }
@@ -2726,15 +2864,89 @@ namespace BeWo.View
         public Brush ChatColor { get; private set; }
         public int ChatPosition { get; private set; }
         public string Posi { get; private set; }
-        public Visibility ChatVisibility { get; private set; }
-        public Visibility SoundVisibility { get; private set; }
-        public Visibility PictureVisibility { get; private set; }
-        public Visibility DokumentVisibility { get; private set; }
+        public Visibility ChatVisibility { get;  set; }
+        public Visibility SoundVisibility { get;  set; }
+
+        private Visibility _pictureVisibility;
+        public Visibility PictureVisibility { get { return _pictureVisibility; } set { _pictureVisibility = value; OnPropertyChanged("PictureVisibility"); } }
+
+        public Visibility DokumentVisibility { get;  set; }
         public ImageSource ImageSources { get; private set; }
-        
+        public object Dokpfad { get; private set; }
+        public byte[] SoundArray { get; private set; }
+
+
+        private Visibility _herunterladen;
+        public Visibility Herunterladen
+        {
+            get { return _herunterladen; }
+            set { _herunterladen = value; OnPropertyChanged("Herunterladen"); }
+        }
+   
+        public object[] Herunterladbares { get; private set; }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            var handler = PropertyChanged;
+            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+        }
 
     }
+
+    // Funktioniert zurzeit nicht 
+  /*  public class KontakSliderBuilder : INotifyPropertyChanged
+    {
+        private double SliderMaximum;
+        public double sliderMaximum
+        {
+            get { return SliderMaximum; }
+            set
+            {
+                SliderMaximum = value;
+                OnPropertyChanged("sliderMaximum");
+            }
+        }
+
+        private double Position;
+
+        public double position
+        {
+            get { return Position; }
+            set
+            {
+                Position = value;
+                OnPropertyChanged("position");
+            }
+        }
+
+        private TimeSpan Time;// { get; set; }
+
+        public TimeSpan time
+        {
+            get { return Time; }
+            set
+            {
+                Time = value;
+                OnPropertyChanged("time");
+            }
+        }
+
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            var handler = PropertyChanged;
+            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }*/
 }
 
 
 
+
+
+
+
diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml
index f1a2e3802..84f98b5d9 100644
--- a/BeWo/View/Detail/OrganisationView.xaml
+++ b/BeWo/View/Detail/OrganisationView.xaml
@@ -85,7 +85,8 @@
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="Auto" />
-											<RowDefinition Height="Auto" />
+											                      <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <Label Grid.Column="0" Grid.Row="0" Content="Name" />
                                         <TextBox VerticalAlignment="Top" Margin="10,3,3,3" Height="23" Grid.Column="1"
@@ -97,8 +98,14 @@
                                         <TextBox x:Name="txtDebitorNumber" Grid.Column="1" Grid.Row="1" Margin="10,3,3,3" Height="23" 
                                                  Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}" 
                                                  Width="300" HorizontalAlignment="Left" />
-										<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="2" Content="Archiviert" />
-										<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="2" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
+
+                                      <Label Grid.Column="0" Grid.Row="2" Content="Funktion" />
+                                      <ComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="2" Margin="10,3,3,3" Height="23" Width="300" HorizontalAlignment="Left" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
+                                      
+                                      
+                                      
+										<Label x:Name="lblArchiviert" Grid.Column="0" Grid.Row="3" Content="Archiviert" />
+										<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="3" Margin="10,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
                                     </Grid>
                                     <GroupBox Grid.Column="0" Grid.Row="1" Header="Adresse"
                                             Style="{StaticResource ObjectEditGroupBox}" Margin="0,8,0,0">
diff --git a/BeWo/View/Detail/OrganisationView.xaml.cs b/BeWo/View/Detail/OrganisationView.xaml.cs
index 0c1b8239a..ce5b5ab2b 100644
--- a/BeWo/View/Detail/OrganisationView.xaml.cs
+++ b/BeWo/View/Detail/OrganisationView.xaml.cs
@@ -35,6 +35,7 @@ namespace BeWo.View.Detail
 
             tabitem_costbearer.Visibility = BeWoApp.LoggedOnUser.HasRight(UserRightType.OrganisationView_AllowEditCostBearer) ? Visibility.Visible : Visibility.Collapsed;
 
+            comboBox_Function.ItemsSource = _ViewModel.Functions;
             
 			if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Organisation_AllowArchiving))
 			{
diff --git a/BeWo/View/Detail/SupportConceptView.xaml b/BeWo/View/Detail/SupportConceptView.xaml
index bd55914e5..9bff93c28 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml
+++ b/BeWo/View/Detail/SupportConceptView.xaml
@@ -1112,6 +1112,7 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -1126,14 +1127,26 @@
 					                          PopUpClick="popupedit_betreuungsschluessel_PopUpClick"
 					                          PreviewMouseDoubleClick="Popupedit_betreuungsschluessel_OnPreviewMouseDoubleClick"
 					                          Cursor="Arrow" />
-                                    <Label Content="Anteil an der Betreuung (%)" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
-                                    <dxe:SpinEdit IsFloatValue="True" MinValue="0" MaxValue="100" Increment="10" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" 
-                                                  Grid.ColumnSpan="2"
-                                                  EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" /> 
-                                    <Button Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
+                                    
+                                    <StackPanel Orientation="Horizontal" Grid.Row="1" x:Name="RadioAbsolPro" Visibility="Collapsed">
+                                        <RadioButton  GroupName="ProAbso" Content="Prozentual" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsProzentual}" Click="ToggledProz_OnChecked"/>
+                                        <RadioButton  GroupName="ProAbso" Content="Absolut" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsAbsolut}" Margin="5,0,0,0" Click="ToggledAbsol_OnChecked"/>
+                                    </StackPanel>
+                                  
+                                    <Label Content="Anteil an der Betreuung (%)" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Visible" x:Name="LabelProzentual"/>
+                                    <dxe:SpinEdit IsFloatValue="True" MinValue="0" MaxValue="100" Increment="10" Grid.Column="1" Grid.Row="2" Margin="3" Height="23" 
+                                                  Grid.ColumnSpan="2" Visibility="Visible" x:Name="editProzentual"
+                                                  EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
+
+                                  <Label Content="Anteil an der Betreuung (Absolut)" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" x:Name="LabelAbsolut"/>
+                                  <dxe:SpinEdit IsFloatValue="True" MinValue="0" Increment="1" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
+                                                Grid.ColumnSpan="2" Visibility="Collapsed" x:Name="editAbsolut"
+                                                EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
+
+                                  <Button Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
 											Margin="3" Content="Hinzufügen" x:Name="button_addBetreuungsschluessel"
 											Click="button_addBetreuungsschluessel_Click" />
-                                    <Button Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
+                                    <Button Grid.Row="3" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
 											Margin="3" Content="Abbrechen" x:Name="button_cancelBetreuungsschluessel"
 											Click="button_cancelBetreuungsschluessel_Click" />
                                 </Grid>
diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs
index f1a762371..46e0a496e 100644
--- a/BeWo/View/Detail/SupportConceptView.xaml.cs
+++ b/BeWo/View/Detail/SupportConceptView.xaml.cs
@@ -1148,7 +1148,7 @@ namespace BeWo.View.Detail
 		    var employeeColumn = new GridColumn {Header = "Mitarbeiter", FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250};
 
             var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False;
-            var betreuungsschluesselColumn = new GridColumn { Header = "Anteil an der Betreuung (%)", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
+            var betreuungsschluesselColumn = new GridColumn { Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
 
             gridControl.Columns.Add(employeeColumn);
             gridControl.Columns.Add(betreuungsschluesselColumn);
@@ -1264,11 +1264,58 @@ namespace BeWo.View.Detail
 
 			if (SelectedApprovalPeriodVM != null)
 			{
-				var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
+			    if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Count == 0)
+			    {
+			       RadioAbsolPro.Visibility = Visibility.Visible;
+			    }
+			    else 
+			    {
+                    RadioAbsolPro.Visibility = Visibility.Collapsed;
+			        if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Last().IsAbsolut)
+			        {
+                        LabelProzentual.Visibility = Visibility.Collapsed;
+                        LabelAbsolut.Visibility = Visibility.Visible;
 
-				if (alt > 100)
-					alt = 100;
-				SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
+                        editProzentual.Visibility = Visibility.Collapsed;
+                        editAbsolut.Visibility = Visibility.Visible;
+
+
+                        SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
+
+                        var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
+                        var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
+
+			            editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
+
+			            var alt =
+			                SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(
+			                    s => s.Betreuungsschluessel);
+
+			            if (alt > actual.ApprovedBEPerInterval)
+			                alt = actual.ApprovedBEPerInterval ?? 0;
+
+                        SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = Math.Round((actual.ApprovedBEPerInterval ?? 0) - alt,2);
+
+			        }
+			        else
+			        {
+                        LabelProzentual.Visibility = Visibility.Visible;
+                        LabelAbsolut.Visibility = Visibility.Collapsed;
+
+                        editProzentual.Visibility = Visibility.Visible;
+                        editAbsolut.Visibility = Visibility.Collapsed;
+
+                        SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
+
+                        var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
+
+                        if (alt > 100)
+                            alt = 100;
+                        SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
+			        }
+			    }
+
+				
 			}
         }
 
@@ -1276,13 +1323,28 @@ namespace BeWo.View.Detail
         {
             if (SelectedApprovalPeriodVM != null && Validate(groupbox_newBetreuungsschluessel))
             {
-                var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
-
-                if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > 100)
+                if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut)
                 {
-					MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
+                    var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
+
+
+                    if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > editAbsolut.MaxValue)
+                    {
+                        MessageBox.Show("Die Summe der Anteile liegt bei über " + Math.Round(editAbsolut.MaxValue ?? 0,2) + ". Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
+                        return;
+                    }    
                 }
+                else
+                {
+                    var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
+
+                    if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > 100)
+                    {
+                        MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
+                        return;
+                    }    
+                }
+                
 
                 SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.AddNewVMToList();
             }
@@ -1290,6 +1352,7 @@ namespace BeWo.View.Detail
             SelectedApprovalPeriodVM = null;
 
             popup_newBetreuungsschluessel.IsOpen = false;
+
         }
 
         private void button_cancelBetreuungsschluessel_Click(object sender, RoutedEventArgs e)
@@ -1353,6 +1416,33 @@ namespace BeWo.View.Detail
 
             var abc = SelectedApprovalPeriodVM;
         }
+
+        private void ToggledProz_OnChecked(object sender, RoutedEventArgs e)
+        {
+            LabelProzentual.Visibility = Visibility.Visible;
+            LabelAbsolut.Visibility = Visibility.Collapsed;
+
+            editProzentual.Visibility = Visibility.Visible;
+            editAbsolut.Visibility = Visibility.Collapsed;
+            SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
+        }
+
+        private void ToggledAbsol_OnChecked(object sender, RoutedEventArgs e)
+        {
+            var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
+            var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
+
+            editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
+
+
+            LabelProzentual.Visibility = Visibility.Collapsed;
+            LabelAbsolut.Visibility = Visibility.Visible;
+
+            editProzentual.Visibility = Visibility.Collapsed;
+            editAbsolut.Visibility = Visibility.Visible;
+
+            SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
+        }
     }
 
     public class ValueListEntryTypeToColorConverter : IValueConverter
diff --git a/BeWo/View/Detail/ValueListView.xaml b/BeWo/View/Detail/ValueListView.xaml
index 911e13b82..764d1590a 100644
--- a/BeWo/View/Detail/ValueListView.xaml
+++ b/BeWo/View/Detail/ValueListView.xaml
@@ -9,41 +9,41 @@
 					xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" 
 					xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" 
 					Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
+  
+    <GroupBox Name="groupbox_root" Header="{Binding Path=HeaderText}" Style="{StaticResource ObjectEditGroupBox}" >
+      <Grid Width="Auto">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+          <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
 
-	<GroupBox Name="groupbox_root" Header="{Binding Path=HeaderText}" Style="{StaticResource ObjectEditGroupBox}">
-		<Grid Width="Auto">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="*" />
-			</Grid.RowDefinitions>
+        <Label Name="label_" Content="Bezeichnung" />
+        <TextBox Margin="3" Grid.Column="1" Text="{val:ValidationBinding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" Height="23" VerticalAlignment="Center" />
+        <Button Margin="3" Padding="3,2,3,2" Grid.Column="2" IsDefault="True" Name="button_add" Click="button_add_Click" VerticalAlignment="Center" Content="Hinzufügen" Height="25" Width="Auto" FontWeight="Normal" />
 
-			<Label Name="label_" Content="Bezeichnung" />
-			<TextBox Margin="3" Grid.Column="1" Text="{val:ValidationBinding Path=NewVM.Description, UpdateSourceTrigger=PropertyChanged}" Height="23" VerticalAlignment="Center" />
-			<Button Margin="3" Padding="3,2,3,2" Grid.Column="2" IsDefault="True" Name="button_add" Click="button_add_Click" VerticalAlignment="Center" Content="Hinzufügen" Height="25" Width="Auto" FontWeight="Normal" />
+        <dxg:GridControl Margin="0,10,0,0" Grid.Row="1" Grid.ColumnSpan="3" Name="grid">
+          <dxg:GridControl.Columns>
+            <dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
 
-			<dxg:GridControl Margin="0,10,0,0" Grid.Row="1" Grid.ColumnSpan="3" Name="grid">
-				<dxg:GridControl.Columns>
-					<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+              <dxg:GridColumn.CellTemplate>
+                <DataTemplate>
+                  <Button Content="r" Click="DeleteButton_Click" Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                </DataTemplate>
+              </dxg:GridColumn.CellTemplate>
 
-						<dxg:GridColumn.CellTemplate>
-							<DataTemplate>
-								<Button Content="r" Click="DeleteButton_Click" Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
-							</DataTemplate>
-						</dxg:GridColumn.CellTemplate>
-
-					</dxg:GridColumn>
-					<dxg:GridColumn FieldName="Description" Header="Beschreibung" />
-				</dxg:GridControl.Columns>
-				<dxg:GridControl.View>
-					<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
-				</dxg:GridControl.View>
-			</dxg:GridControl>
-		</Grid>
-	</GroupBox>
+            </dxg:GridColumn>
+            <dxg:GridColumn FieldName="Description" Header="Beschreibung" />
+          </dxg:GridControl.Columns>
+          <dxg:GridControl.View>
+            <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
+          </dxg:GridControl.View>
+        </dxg:GridControl>
+      </Grid>
+    </GroupBox>
 
 </localView:BeWoView>
\ No newline at end of file
diff --git a/BeWo/View/Detail/ValueListView.xaml.cs b/BeWo/View/Detail/ValueListView.xaml.cs
index 932e6acdc..957961cb7 100644
--- a/BeWo/View/Detail/ValueListView.xaml.cs
+++ b/BeWo/View/Detail/ValueListView.xaml.cs
@@ -20,12 +20,12 @@ namespace BeWo.View.Detail
     /// </summary>
     public partial class ValueListView : BeWoView
     {
-        private ValueListEntryListVM _ViewModel;
+        private ValueListEntryListVM _ViewModel;       
 
         public ValueListView(ValueListEntryListVM pViewModel)
         {
             this.InitializeComponent();
-            this.ViewModel = pViewModel;
+            this.ViewModel = pViewModel;           
         }
 
         public override bool IsDirty
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index 4bd0552d7..263a43064 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -67,7 +67,7 @@ namespace BeWo.View
         protected TextBox chat = new TextBox();
 
         protected MiniChatView miniChatView = null;
-        protected ChatView chatView = null; 
+        public ChatView chatView = null; 
 
         Dictionary<long, MiniChatView> miniChatViewList = new Dictionary<long, MiniChatView>();
         Dictionary<long, MiniChatView> miniChatTeamViewList = new Dictionary<long, MiniChatView>();
@@ -1359,7 +1359,7 @@ namespace BeWo.View
         {
             try
             {            
-                var ipAdresse = "192.168.1.107"; //3    |9  || 192.168.1.103"app4.bewoplaner.de"
+                var ipAdresse = "192.168.1.103"; //3    |9  || 192.168.1.103"app4.bewoplaner.de"
                 var port = 5000;
                 var uri = BeWoApp.SiteOfOrigin;
 
@@ -1394,11 +1394,11 @@ namespace BeWo.View
             }
             catch (Exception e)
             {
-                if (!isReconnect){ 
-                    SystemSounds.Hand.Play();
-                    MessageBox.Show("Verbindung zum Chat-Server konnte nicht aufgebaut werden.", "Fehler: 2010 ",
-                        MessageBoxButton.OK);              
-                }
+                //if (!isReconnect){ 
+                //    SystemSounds.Hand.Play();
+                //    MessageBox.Show("Verbindung zum Chat-Server konnte nicht aufgebaut werden.", "Fehler: 2010 ",
+                //        MessageBoxButton.OK);              
+                //}
 
                 if(!threadstop){
                     Dispatcher.Invoke(
diff --git a/BeWo/View/Master/AdministrationView.xaml.cs b/BeWo/View/Master/AdministrationView.xaml.cs
index 628bea89d..77d029451 100644
--- a/BeWo/View/Master/AdministrationView.xaml.cs
+++ b/BeWo/View/Master/AdministrationView.xaml.cs
@@ -217,7 +217,12 @@ namespace BeWo.View.Master
 		{
 			if (!_OpenViews.ContainsKey(tabitem_functions) || _SavePerformed)
 			{
-				VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType, r => this.Dispatch(() => AddView(tabitem_functions, new ValueListView(r))));
+				//VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType, r => this.Dispatch(() => AddView(tabitem_functions, new ValueListView(r))));
+
+                VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType,
+                                                 personList => VMFactory.CreateValueListVMAsync(ValueListEntryType.OrganisationFunctionType,
+                                                                                                orgList =>
+                                                                                                this.Dispatch(() => AddView(tabitem_functions, new EnvironmentRoleView(personList, orgList)))));
 			}
 		}
 
diff --git a/BeWo/ViewModel/ChatMessageVM.cs b/BeWo/ViewModel/ChatMessageVM.cs
index 1198aa30f..bb4a426ac 100644
--- a/BeWo/ViewModel/ChatMessageVM.cs
+++ b/BeWo/ViewModel/ChatMessageVM.cs
@@ -15,19 +15,15 @@ namespace BeWo.ViewModel
 
         public static string PropertyName_MessageId = "MessageId";
 
-        public static string PropertyName_SoundDatei = "SoundDatei";
-
-        public static string PropertyName_DokuDatei = "DokuDatei";
-
-        public static string PropertyName_BildDatei = "BildDatei";
+        public static string PropertyName_MediaDatei = "MediaDatei";
 
+        public static string PropertyName_MediaTyp = "MediaTyp";
+     
         private string _ChatText;
 
-        private byte[] _SoundDatei;
+        private byte[] _MediaDatei;
 
-        private byte[] _DokuDatei;
-        
-        private byte[] _BildDatei;
+        private int _MediaTyp;
 
         private DateTime _Uhrzeit;
 
@@ -73,41 +69,15 @@ namespace BeWo.ViewModel
             }
         }
 
-        public virtual byte[] SoundDatei
+        public virtual byte[] MediaDatei
         {
-            get { return _SoundDatei; }
+            get { return _MediaDatei; }
 
             set
             {
-                if (AreDifferent(_SoundDatei, value))
+                if (AreDifferent(_MediaDatei, value))
                 {
-                    _SoundDatei = value;
-                }
-            }
-        }
-
-        public virtual byte[] DokuDatei
-        {
-            get { return _DokuDatei; }
-
-            set
-            {
-                if (AreDifferent(_DokuDatei, value))
-                {
-                    _DokuDatei = value;
-                }
-            }
-        }
-
-        public virtual byte[] BildDatei
-        {
-            get { return _BildDatei; }
-
-            set
-            {
-                if (AreDifferent(_BildDatei, value))
-                {
-                    _BildDatei = value;
+                    _MediaDatei = value;
                 }
             }
         }
@@ -207,6 +177,23 @@ namespace BeWo.ViewModel
             }
         }
 
+        public virtual int MediaTyp
+        {
+            get
+            {
+                return _MediaTyp;
+            }
+
+            set
+            {
+                if (AreDifferent(_MediaTyp, value))
+                {
+                    _MediaTyp = value;
+                }
+            }
+        }
+        
+
         protected override void InitByDataContract(ChatMessageDC pDataContract)
         {
             _SenderPersonOid    = pDataContract.SenderPersonOid;
@@ -217,9 +204,9 @@ namespace BeWo.ViewModel
             _IstGelesen         = pDataContract.IstGelesen;
             _TeamOid            = pDataContract.TeamOid;
             _MessageId          = pDataContract.MessageId;
-            _DokuDatei = pDataContract.DokuDatei;
-            _SoundDatei = pDataContract.SoundDatei;
-            _BildDatei = pDataContract.BildDatei;
+            _MediaDatei         = pDataContract.MediaDatei;
+            _MediaTyp           = pDataContract.MediaTyp;
+
         }
 
         protected override ChatMessageDC MapToDataContract(ChatMessageDC pDataContract, bool doCommit)
@@ -232,9 +219,8 @@ namespace BeWo.ViewModel
             pDataContract.IstGelesen         = _IstGelesen;
             pDataContract.TeamOid            = _TeamOid;
             pDataContract.MessageId          = _MessageId;
-            pDataContract.SoundDatei = _SoundDatei;
-            pDataContract.DokuDatei = _DokuDatei;
-            pDataContract.BildDatei = _BildDatei;
+            pDataContract.MediaDatei         = _MediaDatei;
+            pDataContract.MediaTyp           = _MediaTyp;
 
             return pDataContract;
         }
diff --git a/BeWo/ViewModel/OrganisationVM.cs b/BeWo/ViewModel/OrganisationVM.cs
index f701fd2e3..0f56895e6 100644
--- a/BeWo/ViewModel/OrganisationVM.cs
+++ b/BeWo/ViewModel/OrganisationVM.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
+using BeWo.Core;
 using BeWo.Validation;
 using BeWo.ViewModel.ListViewModel;
 
@@ -70,6 +71,8 @@ namespace BeWo.ViewModel
 
 		public static string PropertyName_VarFields = "VarFields";
 
+        public static string PropertyName_Function = "OrganisationsFunction";
+
         private readonly List<ValueListEntryDC> _AllQualifications;
 
         private string _AccountNumber;
@@ -126,9 +129,17 @@ namespace BeWo.ViewModel
 
 		private VarFieldListVM _VarFields;
 
-        public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications) : base(pDataContract, pDataContract.OrganisationOid == null)
+        private ObservableSortCollection<ValueListEntryDC> _Functions;
+        
+        private ValueListEntryDC _Function;
+
+        public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions)
+            : base(pDataContract, pDataContract.OrganisationOid == null)
         {
             this._AllQualifications = pAllQualifications;
+
+            this._Functions = new ObservableSortCollection<ValueListEntryDC>(pPossibleFunctions, Comparer.ValueListEntryDCComparer);
+
         }
 
         public string AccountNumber
@@ -599,6 +610,38 @@ namespace BeWo.ViewModel
 			}
 		}
 
+        public ObservableSortCollection<ValueListEntryDC> Functions
+        {
+            get
+            {
+                if (this._Functions == null)
+                {
+                    this._Functions = new ObservableSortCollection<ValueListEntryDC>();
+                }
+
+                return this._Functions;
+            }
+        }
+
+        public ValueListEntryDC Function
+        {
+            get { return this._Function; }
+
+            set
+            {
+                if (this.AreDifferent(this._Function, value))
+                {
+                    this._Function = value;
+
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Function, value), PropertyName_Function);
+
+                    this.FirePropertyChanged(PropertyName_Function);
+                }
+            }
+        }
+
+
+
         protected void CommitContact(string pValue, ContactType pContactType)
         {
             List<ContactDC> lOldContactDCs;
@@ -658,6 +701,8 @@ namespace BeWo.ViewModel
                 this._DebitorNumber = pDataContract.DebitorNumber;
 				this._IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
 
+                _Function = pDataContract.Function;
+
                 foreach (ContactDC iContactDC in pDataContract.ContactInformations)
                 {
                     if (iContactDC.ContactType == ContactType.business_Mail)
@@ -754,7 +799,8 @@ namespace BeWo.ViewModel
             pDataContract.IsSingleInvoicePerCustomer = this._IsSingleInvoicePerCustomer;
             pDataContract.DebitorNumber = this._DebitorNumber;
 			pDataContract.ActivationType = this._IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
-
+            pDataContract.Function = this._Function;
+            
             this.CommitContact(this._Phone, ContactType.business_Phone);
             this.CommitContact(this._Website, ContactType.business_Homepage);
             this.CommitContact(this._Fax, ContactType.business_Fax);
@@ -762,6 +808,7 @@ namespace BeWo.ViewModel
             this.CommitContact(this._ContactPerson, ContactType.ContactPerson);
             this.CommitContact(this._POBox, ContactType.business_POBox);
             this.CommitContact(this._InvoiceAddressPOBox, ContactType.private_POBox);
+            
 
             pDataContract.CostRatePeriods = this._CostRatePeriods.CopyToDCList(doCommit);
 
diff --git a/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs b/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
index f0913e669..dd572abf1 100644
--- a/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
+++ b/BeWo/ViewModel/SupportConceptApprovalPeriodEmployeeRelVM.cs
@@ -11,9 +11,11 @@ namespace BeWo.ViewModel
     {
         public static string PropertyName_Employee             = "Employee";
         public static string PropertyName_Betreuungsschluessel = "Betreuungsschluessel";
+        public static string PropertyName_IsAbsolut = "IsAbsolut";
         public static string PropertyName_EmployeeString       = "EmployeeString";
 
         private CompactEmployeeDC _Employee;
+        private bool _IsAbsolut;
         private decimal _Betreuungsschluessel;
 
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
@@ -55,6 +57,29 @@ namespace BeWo.ViewModel
             }
         }
 
+        public bool IsProzentual
+        {
+            get { return !IsAbsolut; }
+
+            set { IsAbsolut = !value; }
+        }
+
+        public bool IsAbsolut
+        {
+            get { return _IsAbsolut; }
+
+            set
+            {
+                if (AreDifferent(_IsAbsolut, value))
+                {
+                    _IsAbsolut = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.IsAbsolut, value), PropertyName_IsAbsolut);
+                    FirePropertyChanged(PropertyName_IsAbsolut);
+                }
+            }
+        }
+
+
         public SupportConceptApprovalPeriodEmployeeRelVM(SupportConceptApprovalPeriodEmployeeRelDC pDataContract) : base(pDataContract, pDataContract.SupportConceptApprovalPeriod2EmployeeOid == null) { }
 
         protected override void InitByDataContract(SupportConceptApprovalPeriodEmployeeRelDC pDataContract)
@@ -63,6 +88,7 @@ namespace BeWo.ViewModel
             {
                 _Employee             = pDataContract.Employee;
                 _Betreuungsschluessel = pDataContract.Betreuungsschluessel;
+                _IsAbsolut            = pDataContract.IsAbsolut;
             }
         }
 
@@ -70,7 +96,7 @@ namespace BeWo.ViewModel
         {
             pDataContract.Employee             = _Employee;
             pDataContract.Betreuungsschluessel = _Betreuungsschluessel;
-
+            pDataContract.IsAbsolut            = _IsAbsolut;
             return pDataContract;
         }
     }
diff --git a/BeWo/ViewModel/VMFactory.cs b/BeWo/ViewModel/VMFactory.cs
index 5a1a683eb..89f144561 100644
--- a/BeWo/ViewModel/VMFactory.cs
+++ b/BeWo/ViewModel/VMFactory.cs
@@ -335,7 +335,7 @@ namespace BeWo.ViewModel
         {
             ServiceFacade.DoCustomerServiceAsync(
                 s => s.LoadOrganisation(pOid),
-				r1 => ServiceFacade.DoValueListServiceAsync(s1 => s1.GetAllValueListEntrysByType(ValueListEntryType.StaffQualificationsType), r2 => pCallBack(new OrganisationVM(r1, r2))));
+				r1 => ServiceFacade.DoValueListServiceAsync(s1 => s1.GetAllValueListEntrysByType(ValueListEntryType.StaffQualificationsType),r2 => Cache.GetInstance().GetAllValueListEntrysByTypeAsync(ValueListEntryType.OrganisationFunctionType, r3 => pCallBack(new OrganisationVM(r1,r2,r3)))));
         }
 
         public static void CreateOrganisationVMAsync(Action<OrganisationVM> pCallBack)
@@ -345,11 +345,13 @@ namespace BeWo.ViewModel
 					r1 =>
 					ServiceFacade.DoOperationsServiceAsync(
 						s => s.GetVarFieldDefs(TableID.Organisation),
-							r2 => pCallBack(new OrganisationVM(
+                        r2 =>Cache.GetInstance().GetAllValueListEntrysByTypeAsync(
+                            ValueListEntryType.OrganisationFunctionType,
+							r3 => pCallBack(new OrganisationVM(
 								new OrganisationDC
 								{
 									VarFields = r2
-								}, r1))));
+								}, r1,r3)))));
         }
 
 		//public static void CreatePersonOrganisationRelationVMAsync(CompactOrganisationDC pOrganisation, Action<PersonOrganisationRelationVM> pCallBack)
diff --git a/Data/Entities/ChatMessage.cs b/Data/Entities/ChatMessage.cs
index 283c3bf07..e54c0411a 100644
--- a/Data/Entities/ChatMessage.cs
+++ b/Data/Entities/ChatMessage.cs
@@ -21,19 +21,15 @@ namespace BeWo.Data.Entities
 
         public static string PropertyName_MessageId = "MessageId";
 
-        public static string PropertyName_SoundDatei = "SoundDatei";
+        public static string PropertyName_MediaDatei = "MediaDatei";
 
-        public static string PropertyName_DokuDatei = "DokuDatei";
-
-        public static string PropertyName_BildDatei = "BildDatei";
+        public static string PropertyName_MediaTyp = "MediaTyp";    
 
         private byte[] _ChatText;
 
-        private byte[] _SoundDatei;
+        private byte[] _MediaDatei;
 
-        private byte[] _DokuDatei;
-
-        private byte[] _BildDatei;
+        private int _MediaTyp;
 
         private long? _EmpfaengerPersonOid;
 
@@ -79,44 +75,18 @@ namespace BeWo.Data.Entities
             }
         }
 
-        public virtual byte[] SoundDatei
+        public virtual byte[] MediaDatei
         {
-            get { return _SoundDatei; }
+            get { return _MediaDatei; }
 
             set
             {
-                if (AreDifferent(_SoundDatei, value))
+                if (AreDifferent(_MediaDatei, value))
                 {
-                    _SoundDatei = value;
+                    _MediaDatei = value;
                 }
             }
-        }
-
-        public virtual byte[] DokuDatei
-        {
-            get { return _DokuDatei; }
-
-            set
-            {
-                if (AreDifferent(_DokuDatei, value))
-                {
-                    _DokuDatei = value;
-                }
-            }
-        }
-
-        public virtual byte[] BildDatei
-        {
-            get { return _BildDatei; }
-
-            set
-            {
-                if (AreDifferent(_BildDatei, value))
-                {
-                    _BildDatei = value;
-                }
-            }
-        }
+        } 
 
         public virtual DateTime Uhrzeit
         {
@@ -196,5 +166,17 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public virtual int MediaTyp
+        {
+            get { return _MediaTyp; }
+            set
+            {
+                if (AreDifferent(_MediaTyp, value))
+                {
+                    _MediaTyp = value;
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/Organisation.cs b/Data/Entities/Organisation.cs
index b0dba6c92..5477e9027 100644
--- a/Data/Entities/Organisation.cs
+++ b/Data/Entities/Organisation.cs
@@ -22,6 +22,8 @@ namespace BeWo.Data.Entities
 
         public static string PropertyName_Organisation2PersonList = "Organisation2PersonList";
 
+        public static string PropertyName_Function = "OrganisationsFunction";
+
         private Address _Address;
 
         private BankAccount _BankAccount;
@@ -32,6 +34,8 @@ namespace BeWo.Data.Entities
 
         private Address _InvoiceAddress;
 
+        private ValueListEntry _Function;
+
         private string _Name;
 
         private string _DebitorNumber;
@@ -184,5 +188,21 @@ namespace BeWo.Data.Entities
 				}
 			}
 		}
+
+        public virtual ValueListEntry Function
+        {
+            get
+            {
+                return this._Function;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._Function, value))
+                {
+                    this._Function = value;
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/SupportConceptApprovalPeriod2Employee.cs b/Data/Entities/SupportConceptApprovalPeriod2Employee.cs
index 2a6b6b5ef..b65349d5e 100644
--- a/Data/Entities/SupportConceptApprovalPeriod2Employee.cs
+++ b/Data/Entities/SupportConceptApprovalPeriod2Employee.cs
@@ -6,11 +6,13 @@ namespace BeWo.Data.Entities
     {
         public static string PropertyName_Employee                     = "Employee";
         public static string PropertyName_SupportConceptApprovalPeriod = "SupportConceptApprovalPeriod";
+        public static string PropertyName_IsAbsolut                     = "IsAbsolut";
         public static string PropertyName_Betreuungsschluessel         = "Betreuungsschluessel";
 
         private Employee                     _Employee;
         private SupportConceptApprovalPeriod _SupportConceptApprovalPeriod;
         private decimal                      _Betreuungsschluessel;
+        private bool                         _IsAbsolut;
 
 
         public SupportConceptApprovalPeriod2Employee()
@@ -57,5 +59,18 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public virtual bool IsAbsolut
+        {
+            get { return _IsAbsolut; }
+
+            set
+            {
+                if (AreDifferent(_IsAbsolut, value))
+                {
+                    _IsAbsolut = value;
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/Mappings/ChatMessage.hbm.xml b/Data/Mappings/ChatMessage.hbm.xml
index 01e57c7bc..442319b6b 100644
--- a/Data/Mappings/ChatMessage.hbm.xml
+++ b/Data/Mappings/ChatMessage.hbm.xml
@@ -21,9 +21,8 @@
     <property name="IstGelesen" column="IstGelesen" />
     <property name="TeamOid" column="TeamOid" />
     <property name="MessageId" column="MessageId" />
-    <property name="SoundDatei"          column="SoundDatei"      />
-    <property name="DokuDatei"          column="DokuDatei"      />
-    <property name="BildDatei"          column="BildDatei"      />
-
+    <property name="MediaDatei"          column="MediaDatei"      />
+    <property name="MediaTyp"            column="MediaTyp"      />
+    
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/Data/Mappings/Organisation.hbm.xml b/Data/Mappings/Organisation.hbm.xml
index 547425bb9..2b2dbad34 100644
--- a/Data/Mappings/Organisation.hbm.xml
+++ b/Data/Mappings/Organisation.hbm.xml
@@ -20,6 +20,7 @@
         <many-to-one name="InvoiceAddress" column="InvoiceAddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
         <many-to-one name="BankAccount" column="BankAccountOid" class="BeWo.Data.Entities.BankAccount, BeWo.Data" cascade="all" />
         <many-to-one name="CostBearer" column="CostBearerOid" cascade="all-delete-orphan" class="BeWo.Data.Entities.CostBearer, BeWo.Data" fetch="join"/>
+        <many-to-one name="Function" column="FunctionValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry,BeWo.Data" cascade="none" fetch="join"/>
       
         <bag name="Contacts" table="Contact" generic="true" cascade="all-delete-orphan" batch-size="250">
             <key column="OrganisationOid" />
diff --git a/Data/Mappings/SupportConceptApprovalPeriod2Employee.hbm.xml b/Data/Mappings/SupportConceptApprovalPeriod2Employee.hbm.xml
index a6a4e47b4..a19456d6a 100644
--- a/Data/Mappings/SupportConceptApprovalPeriod2Employee.hbm.xml
+++ b/Data/Mappings/SupportConceptApprovalPeriod2Employee.hbm.xml
@@ -14,6 +14,7 @@
         <property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
         <property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
         <property column="Betreuungsschluessel" type="System.Decimal" name="Betreuungsschluessel" />
+        <property column="IsAbsolut"  name="IsAbsolut" />
 
         <many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee, BeWo.Data" cascade="none" />
         <many-to-one name="SupportConceptApprovalPeriod" column="SupportConceptApprovalPeriodOid" class="BeWo.Data.Entities.SupportConceptApprovalPeriod, BeWo.Data" cascade="none" />
diff --git a/Model/Changes_03_11_2016.txt b/Model/Changes_03_11_2016.txt
new file mode 100644
index 000000000..98a2a3440
--- /dev/null
+++ b/Model/Changes_03_11_2016.txt
@@ -0,0 +1,12 @@
+ALTER TABLE `1234567890`.`chatmessages`
+ 
+DROP COLUMN `BildDatei`,
+
+DROP COLUMN `DokuDatei`,
+
+CHANGE COLUMN `SoundDatei` `MediaDatei` LONGBLOB NULL DEFAULT NULL COMMENT '' ;
+
+
+ALTER TABLE `1234567890`.`chatmessages` 
+
+ADD COLUMN `MediaTyp` INT(10) NULL DEFAULT NULL COMMENT '' AFTER `MessageId`;
diff --git a/Model/Changes_04_11_2016.txt b/Model/Changes_04_11_2016.txt
new file mode 100644
index 000000000..21826509c
--- /dev/null
+++ b/Model/Changes_04_11_2016.txt
@@ -0,0 +1,3 @@
+ALTER TABLE `1234567890`.`supportconceptapprovalperiod2employee` 
+
+ADD COLUMN `IsAbsolut` INT(10) NULL DEFAULT 0 COMMENT '' AFTER `Betreuungsschluessel`;
diff --git a/Model/Changes_07_11_2016.txt b/Model/Changes_07_11_2016.txt
new file mode 100644
index 000000000..224a308a9
--- /dev/null
+++ b/Model/Changes_07_11_2016.txt
@@ -0,0 +1,3 @@
+ALTER TABLE `1234567890`.`organisation` 
+
+ADD COLUMN `FunctionValueListEntryOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `AccountNumber`;
diff --git a/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs b/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
index af952a73d..fcba0aeae 100644
--- a/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
+++ b/Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs
@@ -16,9 +16,9 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.IstGelesen         = pEntity.IstGelesen;
             pDataContract.TeamOid            = pEntity.TeamOid;
             pDataContract.MessageId          = pEntity.MessageId;
-            pDataContract.SoundDatei         = pEntity.SoundDatei;
-            pDataContract.DokuDatei          = pEntity.DokuDatei;
-            pDataContract.BildDatei          = pEntity.BildDatei;
+            pDataContract.MediaDatei         = pEntity.MediaDatei;
+            pDataContract.MediaTyp           = pEntity.MediaTyp;
+           
 
             return pDataContract;
         }
@@ -33,9 +33,8 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.IstGelesen          = pDataContract.IstGelesen;
             pEntity.TeamOid             = pDataContract.TeamOid;
             pEntity.MessageId           = pDataContract.MessageId;
-            pEntity.SoundDatei         = pDataContract.SoundDatei;
-            pEntity.DokuDatei          = pDataContract.DokuDatei;
-            pEntity.BildDatei          = pDataContract.BildDatei;
+            pEntity.MediaDatei          = pDataContract.MediaDatei;
+            pEntity.MediaTyp            = pDataContract.MediaTyp;
 
             return pEntity;
         }
diff --git a/Service/DCEntityMapper/CustomerDC_Customer.cs b/Service/DCEntityMapper/CustomerDC_Customer.cs
index d5fcfe53f..c9b10a074 100644
--- a/Service/DCEntityMapper/CustomerDC_Customer.cs
+++ b/Service/DCEntityMapper/CustomerDC_Customer.cs
@@ -69,7 +69,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.GradDerBehinderung        = pEntity.GradDerBehinderung;
             pDataContract.Pflegegrad                = pEntity.Pflegegrad;
             pDataContract.CustomerImage             = pEntity.CustomerImage;
-		
+		    
 
 		    if (pEntity.BehinderungsartenListe != null)
 		    {
diff --git a/Service/DCEntityMapper/OrganisationDC_Organisation.cs b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
index 83c7c4425..b490fa719 100644
--- a/Service/DCEntityMapper/OrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
@@ -25,6 +25,11 @@ namespace BeWo.Service.DCEntityMapper
 
             pDataContract.RelatedPersons = MapperFactory.OrganisationPersonRelDC_Organisation2PersonMapper.MapToNewDCs(pEntity.Organisation2PersonList.Where(o2P => o2P.Person.IsActive != ActivationTypeId.Deleted));
 
+            if (pEntity.Function != null)
+            {
+                pDataContract.Function = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Function);
+            }
+
             if (pEntity.Address != null)
             {
                 pDataContract.AddressOid = pEntity.Address.Oid;
@@ -87,6 +92,15 @@ namespace BeWo.Service.DCEntityMapper
 			pEntity.IsActive = pDataContract.ActivationType;
             //MapperFactory.OrganisationPersonRelDC_Organisation2PersonMapper.MergeWithEntitys(pDataContract.RelatedPersons, pEntity.Organisation2PersonList);
 
+            if (pDataContract.Function == null)
+            {
+                pEntity.Function = null;
+            }
+            else if (pEntity.Function == null || pEntity.Function.Oid != pDataContract.Function.ValueListEntryOid)
+            {
+                pEntity.Function = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Function.ValueListEntryOid.Value);
+            }
+
             if (pDataContract.ContainsAddressData())
             {
                 if (pEntity.Address == null)
diff --git a/Service/DCEntityMapper/SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.cs b/Service/DCEntityMapper/SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.cs
index 3e82e4dcb..17012270b 100644
--- a/Service/DCEntityMapper/SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.cs
+++ b/Service/DCEntityMapper/SupportConceptApprovalPeriodEmployeeRelDC_SupportConceptApprovalPeriod2Employee.cs
@@ -13,6 +13,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.SupportConceptApprovalPeriod2EmployeeVersion = pEntity.Version;
             pDataContract.Betreuungsschluessel                         = pEntity.Betreuungsschluessel;
             pDataContract.Employee                                     = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Employee);
+            pDataContract.IsAbsolut                                    = pEntity.IsAbsolut;
 
             return pDataContract;
         }
@@ -23,6 +24,7 @@ namespace BeWo.Service.DCEntityMapper
 
             pEntity.Employee                     = DAOFactory.GenericDAO.LoadByID<Employee>(pDataContract.Employee.EmployeeOid);
             pEntity.Betreuungsschluessel         = pDataContract.Betreuungsschluessel;
+            pEntity.IsAbsolut                    = pDataContract.IsAbsolut;
 
             return pEntity;
         }
diff --git a/Service/Service.csproj b/Service/Service.csproj
index bb6433a15..d8bf10d2d 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -280,6 +280,8 @@
     <Compile Include="Invoicing\LWLInvoiceCreation.cs" />
     <Compile Include="Invoicing\LWLSettlementInvoiceCreation.cs" />
     <Compile Include="Invoicing\SettlementInvoiceCreation.cs" />
+    <Compile Include="MessageContracts\UploadChatPackage.cs" />
+    <Compile Include="MessageContracts\UploadChatResult.cs" />
     <Compile Include="MessageContracts\UpdatePackage.cs" />
     <Compile Include="MessageContracts\UploadPackage.cs" />
     <Compile Include="MessageContracts\UploadResult.cs" />
diff --git a/Service/ServiceContracts/IEmployeeService.cs b/Service/ServiceContracts/IEmployeeService.cs
index 187e5dcc3..c93cd2039 100644
--- a/Service/ServiceContracts/IEmployeeService.cs
+++ b/Service/ServiceContracts/IEmployeeService.cs
@@ -322,5 +322,9 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         Byte[] GetEmployeeThumbnail(long employeeOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void DeleteEmployeeCustomerRelationForEmployee(long employeeOid);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 6a2bb5552..75409e1eb 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -515,18 +515,12 @@ namespace BeWo.Service.ServiceContracts
 
         [FaultContract(typeof (BeWoFault))]
         [OperationContract]
-        ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid);
-
-        [FaultContract(typeof (BeWoFault))]
-        [OperationContract]
-        ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd,long teamid,byte[] sound,byte[] doku,byte[] bild);
-            
+        ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, string messageid);
 
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);
 
-
         [FaultContract(typeof (BeWoFault))]
         [OperationContract]
         IList<CustomerAPPCodeDC> GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);
diff --git a/Service/ServiceContracts/IStreamingService.cs b/Service/ServiceContracts/IStreamingService.cs
index 0efcc5b13..7cd5f6f03 100644
--- a/Service/ServiceContracts/IStreamingService.cs
+++ b/Service/ServiceContracts/IStreamingService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.ServiceModel;
 
 using BeWo.Service.MessageContracts;
@@ -33,5 +34,10 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof (BeWoFault))]
         [OperationContract]
         UploadResult UpdateDocument(UpdatePackage pUpload);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        UploadChatResult CreateNewSpeziallStreamChatMessagesDC(UploadChatPackage istream);
+            
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs
index 6983d3e3b..2162547bf 100644
--- a/Service/ServiceImplementations/CustomerServiceImp.cs
+++ b/Service/ServiceImplementations/CustomerServiceImp.cs
@@ -348,7 +348,7 @@ namespace BeWo.Service.ServiceImplementations
 			{
 				var s = PluginLoader.FindClass<CustomerService>();
 
-				return s.GetAllCustomersCompact(false, currentEmployeeOid);
+				return s.GetAllCustomersCompact(true, currentEmployeeOid);
 
 			}
 			catch (Exception e)
@@ -1969,6 +1969,7 @@ namespace BeWo.Service.ServiceImplementations
 			customerDC.CustomerVersion = cust.Version.Value;
 			customerDC.FirstName = cust.Person.FirstName;
 			customerDC.LastName = cust.Person.LastName;
+            customerDC.CustomerAlias = cust.CustomerAlias;
 			customerDC.DateOfBirth = cust.Person.DateOfBirth;
 			customerDC.Sex = cust.Person.Sex;
 			customerDC.ActivationType = cust.IsActive;
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index d325b0c70..bcd0334f4 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -85,6 +85,9 @@ namespace BeWo.Service.ServiceImplementations
                 var e = DAOFactory.GenericDAO.LoadByID<Employee>(pOid);
                 e.Person.IsActive = ActivationTypeId.Deleted;
                 ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Deleted);
+
+                DeleteEmployeeCustomerRelationForEmployee(pOid);
+
             }
             catch (Exception e)
             {
@@ -92,11 +95,25 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        public void DeleteEmployeeCustomerRelationForEmployee(long employeeOid)
+        {
+            var emp = DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid);
+            foreach (var e2c in emp.Employee2CustomerList)
+            {
+                DAOFactory.GenericDAO.Delete(e2c);
+            }
+        }
+
         public void DeactivateEmployees(Dictionary<long, long> pOid2Version)
         {
             try
             {
                 ServiceLogic.SetActivationType<Employee>(pOid2Version, ActivationTypeId.Deleted);
+
+                foreach (var key in pOid2Version.Keys)
+                {
+                    DeleteEmployeeCustomerRelationForEmployee(key);
+                }
             }
             catch (Exception e)
             {
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 057c2df2d..ae7756dfc 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -3128,7 +3128,7 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
-        public ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid)
+        public ChatMessageDC CreateNewChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid,string messageid)
         {
             try
             {
@@ -3139,45 +3139,9 @@ namespace BeWo.Service.ServiceImplementations
                     Uhrzeit = DateTime.Now,
                     IsDelivered = isDeliverd,
                     ChatText = Encoding.UTF8.GetBytes(message),
-                    IstGelesen = 0
-                };
-
-                if (teamid != 0)
-                {
-                    chatMessage.TeamOid = teamid;
-                }
-                else
-                {
-                    chatMessage.TeamOid = null;
-                }
-
-                DAOFactory.GenericDAO.Insert(chatMessage);
-
-                var ChatMessagesDC = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage);
-
-                return ChatMessagesDC;
-            }
-            catch (Exception e)
-            {
-                throw Utils.CreateBeWoFaultException(e);
-            }
-        }
-
-        public ChatMessageDC CreateNewSpeziallChatMessagesDC(long senderOid, long empfängerOid, string message, bool isDeliverd, long teamid, byte[] sound, byte[] doku,byte[] bild)
-        {
-            try
-            {
-                var chatMessage = new ChatMessage
-                {
-                    EmpfaengerPersonOid = empfängerOid,
-                    SenderPersonOid = senderOid,
-                    Uhrzeit = DateTime.Now,
-                    IsDelivered = isDeliverd,
-                    ChatText = Encoding.UTF8.GetBytes(message),
-                    SoundDatei = sound,
-                    DokuDatei = doku,
-                    BildDatei = bild,
-                    IstGelesen = 0
+                    IstGelesen = 0,
+                    MessageId = messageid
+                    
                 };
 
                 if (teamid != 0)
diff --git a/Service/ServiceImplementations/StreamingServiceImp.cs b/Service/ServiceImplementations/StreamingServiceImp.cs
index 5c5b64517..16010d881 100644
--- a/Service/ServiceImplementations/StreamingServiceImp.cs
+++ b/Service/ServiceImplementations/StreamingServiceImp.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.ServiceModel;
-
+using System.Text;
 using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BeWo.Service.Core;
@@ -12,7 +13,9 @@ using BeWo.Service.MessageContracts;
 using BeWo.Service.ServiceContracts;
 
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
+using Utils = BeWo.Service.Core.Utils;
 
 namespace BeWo.Service.ServiceImplementations
 {
@@ -167,5 +170,50 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
+
+
+        public UploadChatResult CreateNewSpeziallStreamChatMessagesDC(UploadChatPackage istream)
+        {
+            try
+            {                                  
+                var chatMessage = new ChatMessage
+                {
+                    EmpfaengerPersonOid = istream.empfängerOid,
+                    SenderPersonOid = istream.senderOid,
+                    Uhrzeit = DateTime.Now,
+                    IsDelivered = istream.isDeliverd,
+                    ChatText = Encoding.UTF8.GetBytes(istream.message),
+                    MediaDatei = BS.Shared.Core.Utils.ReadFully(istream.Stream),
+                    MediaTyp = istream.mediatype,
+                    IstGelesen = 0,
+                    MessageId = istream.messageid
+                };
+
+                istream.Stream.Close();
+                istream.Stream.Dispose();
+
+                if (istream.teamid != 0)
+                {
+                    chatMessage.TeamOid = istream.teamid;
+                }
+                else
+                {
+                    chatMessage.TeamOid = null;
+                }
+
+                DAOFactory.GenericDAO.Insert(chatMessage);
+
+
+                var result = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage);
+                result.MediaDatei = null;            
+                //return new UploadChatResult { ChatMessage = MapperFactory.ChatMessagesDC_ChatMessages.MapToNewDC(chatMessage)};
+                return new UploadChatResult {ChatMessage = result};
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 0fe0d36d6..1574814b0 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -518,8 +518,8 @@ namespace BS.Shared
         SupportConceptIndividualGoalType,
 		Auszahlungsart,
         SupportConceptIndividualGoalCategoryType, // 20
-        DocumentType
-
+        DocumentType,
+        OrganisationFunctionType
     }
 
     public enum ContactType
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 4cdacffc5..fb4a23c42 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -716,7 +716,10 @@ namespace BS.Shared.Core
                                                      },
                                                  {
                                                      ValueListEntryType.DocumentType, "Dokumentationstypen"
-                                                     }
+                                                     },
+                                                 {
+                                                     ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
+                                                    }
                                              };
 			#endregion
 
@@ -776,7 +779,10 @@ namespace BS.Shared.Core
                                                     },
                                                 {
                                                      ValueListEntryType.DocumentType, "Dokumentationstypen"
-                                                     }
+                                                     },
+                                                {
+                                                     ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
+                                                    }
                                         };
 			#endregion
 
diff --git a/Shared/DataContracts/ChatMessageDC.cs b/Shared/DataContracts/ChatMessageDC.cs
index 76e8b4df5..3cfd15a27 100644
--- a/Shared/DataContracts/ChatMessageDC.cs
+++ b/Shared/DataContracts/ChatMessageDC.cs
@@ -34,12 +34,10 @@ namespace BS.Shared.DataContracts
         public string MessageId { get; set; }
 
         [DataMember]
-        public byte[] SoundDatei { get; set; }
+        public byte[] MediaDatei { get; set; }
 
         [DataMember]
-        public byte[] DokuDatei { get; set; }
-
-        [DataMember]
-        public byte[] BildDatei { get; set; }
+        public int MediaTyp { get; set; }        
+     
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs
index 660230bd3..5f22db1ef 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactCustomerDC.cs
@@ -53,7 +53,7 @@ namespace BS.Shared.DataContracts.Compact
         {
             get
             {
-                string lResult = this.FirstName + " " + this.LastName + " ";
+                string lResult = this.FirstName + " " + this.LastName + " " + CustomerAlias + " ";
                 if (this.CostBearerReferenceNumbers != null)
                 {
                     lResult += string.Join(" ", this.CostBearerReferenceNumbers.Values.ToArray());
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
index ad2494d9a..98b460999 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
@@ -136,7 +136,7 @@ namespace BS.Shared.DataContracts.Compact
                 // return string.Join(" ", CostBearerDetailStrings.ToArray())
                 // + " " + string.Join(" ", CustomerReferenceNumbers.ToArray())
                 // + " " + Customer.ToString();
-                string fr = string.Join(" ", this.CustomerReferenceNumbers.ToArray()) + " " + this.Customer;
+                string fr = string.Join(" ", this.CustomerReferenceNumbers.ToArray()) + " " + this.Customer + " " + Customer.CustomerAlias;
 
                 fr += " " + string.Join(" ", this.CostBearerDetailStrings.ToArray());
                 return fr;
diff --git a/Shared/DataContracts/OrganisationDC.cs b/Shared/DataContracts/OrganisationDC.cs
index 090c21567..2391572d1 100644
--- a/Shared/DataContracts/OrganisationDC.cs
+++ b/Shared/DataContracts/OrganisationDC.cs
@@ -150,5 +150,8 @@ namespace BS.Shared.DataContracts
 
 		[DataMember]
 		public List<VarFieldDC> VarFields { get; set; }
+
+        [DataMember]
+        public ValueListEntryDC Function { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/SupportConceptApprovalPeriodEmployeeRelDC.cs b/Shared/DataContracts/SupportConceptApprovalPeriodEmployeeRelDC.cs
index b7a681b6c..ede4e03be 100644
--- a/Shared/DataContracts/SupportConceptApprovalPeriodEmployeeRelDC.cs
+++ b/Shared/DataContracts/SupportConceptApprovalPeriodEmployeeRelDC.cs
@@ -13,6 +13,9 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public decimal Betreuungsschluessel { get; set; }
 
+        [DataMember]
+        public bool IsAbsolut { get; set; }
+
         [DataMember]
         public long? SupportConceptApprovalPeriod2EmployeeVersion { get; set; }