diff --git a/src/webqueue2api/parser/parser.py b/src/webqueue2api/parser/parser.py
index f69056d..261e0d6 100644
--- a/src/webqueue2api/parser/parser.py
+++ b/src/webqueue2api/parser/parser.py
@@ -214,10 +214,9 @@ 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.Literal(reply_from_user_start_delimiter)
             | pp.Literal(action_start_delimiter)
-            | pp.StringEnd()
-        )
+        ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content") 
 ).leaveWhitespace().setParseAction(parse_section_by_type("reply_to_user"))
 
@@ -231,8 +230,7 @@ def error_handler(original_string, match_start_index, tokens):
         pp.SkipTo(
             pp.Literal(reply_from_user_start_delimiter)
             | pp.Literal(action_start_delimiter)
-            | pp.stringEnd()
-        )
+        ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content") 
 ).leaveWhitespace().setParseAction(parse_section_by_type("edit"))
 
@@ -244,10 +242,9 @@ 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.Literal(reply_from_user_start_delimiter)
             | pp.Literal(action_start_delimiter)
-            | pp.StringEnd()
-        ) 
+        ) | pp.SkipTo(pp.StringEnd(), include=True)
     ).setResultsName("content") 
 ).leaveWhitespace().setParseAction(parse_section_by_type("status"))