diff --git a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
index 722f369..a1c0245 100644
--- a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
+++ b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
@@ -33,6 +33,10 @@ namespace BirdsiteLive.Domain.Tools
             var tags = new List<Tag>();
             messageContent = $" {messageContent} ";
 
+            // Replace return lines
+            messageContent = Regex.Replace(messageContent, @"\r\n\r\n?|\n\n", "</p><p>");
+            messageContent = Regex.Replace(messageContent, @"\r\n?|\n", "<br/>");
+
             // Extract Urls
             var urlMatch = _urlRegex.Matches(messageContent);
             foreach (var m in urlMatch)