diff --git a/ImageBoardServerApp/Shared/Components/Comment.razor b/ImageBoardServerApp/Shared/Components/Comment.razor
index e059919..41df06a 100644
--- a/ImageBoardServerApp/Shared/Components/Comment.razor
+++ b/ImageBoardServerApp/Shared/Components/Comment.razor
@@ -71,9 +71,15 @@
                             }
                             else
                             {
-                                <span class="threadMsg">
-                                    @line
-                                </span>
+                                @if (line.StartsWith("https://") || line.StartsWith("http://"))
+                                {
+                                    <a href="@line" target="_blank">@line</a>
+                                }
+                                else
+                                {
+                                    <span class="threadMsg">@line</span>
+                                }
+                                <span >&nbsp;</span>
                             }
                             <span>&nbsp;</span>
                         }
diff --git a/ImageBoardServerApp/Shared/Components/Post.razor b/ImageBoardServerApp/Shared/Components/Post.razor
index 04ed894..f351583 100644
--- a/ImageBoardServerApp/Shared/Components/Post.razor
+++ b/ImageBoardServerApp/Shared/Components/Post.razor
@@ -57,7 +57,19 @@
                         {
                             className = "greenText";
                         }
-                        <span class='threadText @className'>@s&nbsp;</span>
+                        @foreach (string s2 in s.Split(" "))
+                        {
+                            @if (s2.StartsWith("https://") || s.StartsWith("http://"))
+                            {
+                                <a href="@s2" target="_blank">@s2</a>
+                            }
+                            else
+                            {
+                                <span class="@className">@s2</span>
+                            }
+                            <span class="@className">&nbsp;</span>
+                        }
+                        <br/>
                     }
                     @if (post.Content.Split("\n").Length > 6)
                     {
@@ -74,7 +86,19 @@
                         {
                             className = "greenText";
                         }
-                        <span class='threadText @className'>@s&nbsp;</span>
+                        @foreach (string s2 in s.Split(" "))
+                        {
+                            @if (s2.StartsWith("https://") || s2.StartsWith("http://"))
+                            {
+                                <a href="@s2" target="_blank">@s2</a>
+                            }
+                            else
+                            {
+                                <span class="@className">@s2</span>
+                            }
+                            <span class="@className">&nbsp;</span>
+                        }
+                        <br/>
                     }
                 }
             </div>