1 files changed, 15 insertions, 8 deletions
diff --git a/Juick/ThreadView.xaml b/Juick/ThreadView.xaml
index 20529c2..2decd6e 100644
--- a/Juick/ThreadView.xaml
+++ b/Juick/ThreadView.xaml
@@ -28,9 +28,15 @@
         <!--ContentPanel - place additional content here-->
         <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
             <ListBox Margin="0,0,-12,0" ItemsSource="{Binding Items}" SelectionChanged="ListBox_SelectionChanged">
+                <ListBox.ItemContainerStyle>
+                    <Style TargetType="ListBoxItem">
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                    </Style>
+                </ListBox.ItemContainerStyle>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <Grid>
+                        <Border BorderBrush="{StaticResource PhoneForegroundBrush}" BorderThickness="0 0 0 1">
+                            <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
@@ -40,20 +46,21 @@
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"
+                                <Image Source="{Binding UserAvatar}" Grid.Row="0" Grid.Column="0" Margin="3" />
+
+                                <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"
                                        Margin="5,0,5,5" VerticalAlignment="Top"
-                                       HorizontalAlignment="Left"
                                        FontFamily="{StaticResource PhoneFontFamilySemiLight}" 
                                        FontSize="{StaticResource PhoneFontSizeLarge}"
-                                       Style="{StaticResource PhoneTextAccentStyle}" />
-                            <TextBlock Text="{Binding MessageText}" Grid.Row="1" Grid.Column="1"
+                                       Style="{StaticResource PhoneTextAccentStyle}"  HorizontalAlignment="Left"/>
+                                <TextBlock Text="{Binding MessageText}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
                                        Foreground="{StaticResource PhoneForegroundBrush}"
-                                       
+                                        HorizontalAlignment="Left"
                                        Style="{StaticResource PhoneTextNormalStyle}"                                       
                                        Margin="5,0,5,5" VerticalAlignment="Top"
-                                       TextWrapping="Wrap" HorizontalAlignment="Left"/>
+                                       TextWrapping="Wrap" />
                         </Grid>
-
+                        </Border>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>