diff --git a/src/webqueue2api/parser/parser.py b/src/webqueue2api/parser/parser.py
index baa4c2f..0252e29 100644
--- a/src/webqueue2api/parser/parser.py
+++ b/src/webqueue2api/parser/parser.py
@@ -243,7 +243,7 @@ def error_handler(original_string, match_start_index, tokens):
     (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() +
     pp.Group(
         pp.SkipTo(
-            pp.Literal(reply_from_user_start_delimiter)
+            (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter))
             | (pp.LineStart() + pp.Literal(action_start_delimiter))
         ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content") 
@@ -258,7 +258,7 @@ def error_handler(original_string, match_start_index, tokens):
     (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() +
     pp.Group(
         pp.SkipTo(
-            pp.Literal(reply_from_user_start_delimiter)
+            (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter))
             | (pp.LineStart() + pp.Literal(action_start_delimiter))
         ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content") 
@@ -273,7 +273,7 @@ def error_handler(original_string, match_start_index, tokens):
     (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() +
     pp.Group(
         pp.SkipTo(
-            pp.Literal(reply_from_user_start_delimiter)
+            (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter))
             | (pp.LineStart() + pp.Literal(action_start_delimiter))
         ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content")