diff --git a/ChatController/ChatEmojiiControl.xaml.cs b/ChatController/ChatEmojiiControl.xaml.cs
index 5bc95a3..fc14c8f 100644
--- a/ChatController/ChatEmojiiControl.xaml.cs
+++ b/ChatController/ChatEmojiiControl.xaml.cs
@@ -88,8 +88,10 @@ namespace ChatController
                     (ThreadStart) delegate
                     {
                         _ChatMainControl.Chatbox.Focus();
-                        _ChatMainControl.Chatbox.Text += emojiCode;
-                        _ChatMainControl.Chatbox.SelectionStart = _ChatMainControl.Chatbox.Text.Length;
+
+                        var selectionStart = _ChatMainControl.Chatbox.SelectionStart;
+                        _ChatMainControl.Chatbox.Text = _ChatMainControl.Chatbox.Text.Insert(selectionStart, emojiCode);
+                        _ChatMainControl.Chatbox.SelectionStart = selectionStart + emojiCode.Length;
                     });
             }
             catch (Exception e)
diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml
index 99a5d64..e225a20 100644
--- a/ChatController/ChatMainControl.xaml
+++ b/ChatController/ChatMainControl.xaml
@@ -534,7 +534,7 @@
                     
                     <!-- #endregion Normalmodus/Dateivorschau -->
 
-                    <!-- #region Nachrichtentextbox -->
+                    <!-- #region Nachrichtentextbox ToDo: Achtung! MaxLength wieder entfernen! -->
                     <Grid Grid.Row="2" Visibility="{Binding ChatMessageInputGridVisibility}" VerticalAlignment="Stretch" MinHeight="25" MaxHeight="200">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />