1 files changed, 4 insertions, 12 deletions
diff --git a/Juick/ThreadView.xaml b/Juick/ThreadView.xaml
index 4f622c7..7de5533 100644
--- a/Juick/ThreadView.xaml
+++ b/Juick/ThreadView.xaml
@@ -6,20 +6,14 @@
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:bindings="clr-namespace:Juick.Classes"
+    xmlns:controls="clr-namespace:Juick.Controls"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
     mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="480"
     shell:SystemTray.IsVisible="True">
-
-    <phone:PhoneApplicationPage.Resources>
-        <ResourceDictionary>
-            <bindings:RichTextConverter x:Key="inlineConverter"/>
-        </ResourceDictionary>
-    </phone:PhoneApplicationPage.Resources>
-
+    
     <!--LayoutRoot is the root grid where all page content is placed-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
         <Grid.RowDefinitions>
@@ -62,13 +56,11 @@
                                        FontSize="{StaticResource PhoneFontSizeLarge}"
                                        Style="{StaticResource PhoneTextAccentStyle}" />
                                 <!--Style="{StaticResource PhoneTextNormalStyle}"-->
-                                <RichTextBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
+                                <controls:HyperLinkRichTextBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
                                        Foreground="{StaticResource PhoneForegroundBrush}"
                                        Margin="5,0,5,5" VerticalAlignment="Top"
                                        TextWrapping="Wrap" HorizontalAlignment="Left"
-                                       IsReadOnly="True">
-                                    <Paragraph bindings:ParagraphBindingBehavior.AssignedInlines="{Binding MessageText, Converter={StaticResource inlineConverter}}" />
-                                </RichTextBox>
+                                       IsReadOnly="True" Text="{Binding MessageText}" />
                                 <Image Source="{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}"