1 files changed, 3 insertions, 42 deletions
diff --git a/Juick/Controls/MessageList.xaml b/Juick/Controls/MessageList.xaml
index afa6c69..ac6db00 100644
--- a/Juick/Controls/MessageList.xaml
+++ b/Juick/Controls/MessageList.xaml
@@ -12,10 +12,10 @@
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     d:DesignHeight="480" d:DesignWidth="480">
-
+    
     <Grid x:Name="LayoutRoot">
         <toolkit:LongListSelector Margin="0, 0, -12, 0"
-                 ItemsSource="{Binding Items}" IsFlatList="true">
+                 ItemsSource="{Binding Items}" IsFlatList="true" ItemTemplate="{StaticResource PostItemDataTemplate}">
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="Link">
                     <bindings:InvokeDelegateCommandAction Command="{Binding LoadMessagesPageCommand}"
@@ -25,46 +25,7 @@
                     <bindings:InvokeDelegateCommandAction Command="{Binding NavigateNextCommand}"
                                            CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=InvokeParameter}"/>
                 </i:EventTrigger>
-            </i:Interaction.Triggers>
-            <toolkit:LongListSelector.ItemTemplate>
-                <DataTemplate>
-                    <Border BorderBrush="{StaticResource PhoneForegroundBrush}" BorderThickness="0 0 0 1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Image bindings:LowProfileImageLoader.UriSource="{Binding AvatarUri}" 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}" />
-                            <!--Style="{StaticResource PhoneTextNormalStyle}"-->
-                            <usercontrols:HyperLinkRichTextBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
-                               TextWrapping="Wrap" HorizontalAlignment="Left"
-                               Foreground="{StaticResource PhoneForegroundBrush}"
-                               Margin="5,0,5,5" VerticalAlignment="Top"
-                               IsReadOnly="True" Text="{Binding MessageText}" />
-                            <Image bindings:LowProfileImageLoader.UriSource="{Binding Attachment}" Grid.Row="2" Grid.Column="0" Margin="3" Grid.ColumnSpan="2" />
-                            <TextBlock Text="{Binding Status}" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
-                     Foreground="{StaticResource PhoneForegroundBrush}"
-                     Style="{StaticResource PhoneTextAccentStyle}"
-                     FontSize="{StaticResource PhoneFontSizeSmall}"
-                     Margin="5,0,5,5" VerticalAlignment="Top"
-                     TextWrapping="Wrap" HorizontalAlignment="Left"/>
-                        </Grid>
-                    </Border>
-
-                </DataTemplate>
-            </toolkit:LongListSelector.ItemTemplate>
+            </i:Interaction.Triggers>            
         </toolkit:LongListSelector>
     </Grid>
 </UserControl>