diff --git a/AMessanger/Views/MainWindow.axaml b/AMessanger/Views/MainWindow.axaml
index 12bd49e..781ba4b 100644
--- a/AMessanger/Views/MainWindow.axaml
+++ b/AMessanger/Views/MainWindow.axaml
@@ -24,10 +24,20 @@
         <ListBox Grid.Row="0" ItemsSource="{Binding Messages}">
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="{Binding UserName}" Margin="5" />
-                        <TextBlock Text="{Binding Content}" Margin="5" />
-                    </StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0"
+                                   Text="{Binding UserName}"
+                                   Margin="5" />
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Content}"
+                                   TextWrapping="WrapWithOverflow"
+                                   Margin="5" />
+                    </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
@@ -39,8 +49,8 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <TextBox Text="{Binding UserName}" />
-            <TextBox Grid.Column="1" Text="{Binding Message}" />
+            <TextBox Text="{Binding UserName}" VerticalContentAlignment="Center" />
+            <TextBox Grid.Column="1" Text="{Binding Message}" TextWrapping="WrapWithOverflow" />
             <Button Grid.Column="2" Command="{Binding SendButtonCommand}">Send</Button>
         </Grid>
     </Grid>