diff --git a/app/blueprints/threads/__init__.py b/app/blueprints/threads/__init__.py
index 705703a..6a2fdb8 100644
--- a/app/blueprints/threads/__init__.py
+++ b/app/blueprints/threads/__init__.py
@@ -199,7 +199,7 @@ def view(id):
 			flash("Please wait before commenting again", "danger")
 			return redirect(thread.getViewURL())
 
-		if len(comment) <= 500 and len(comment) > 3:
+		if len(comment) <= 2000 and len(comment) > 3:
 			reply = ThreadReply()
 			reply.author = current_user
 			reply.comment = comment
@@ -216,7 +216,7 @@ def view(id):
 			return redirect(thread.getViewURL())
 
 		else:
-			flash("Comment needs to be between 3 and 500 characters.")
+			flash("Comment needs to be between 3 and 2000 characters.")
 
 	return render_template("threads/view.html", thread=thread)
 
diff --git a/app/templates/macros/reviews.html b/app/templates/macros/reviews.html
index 6ba176c..e6aa7e9 100644
--- a/app/templates/macros/reviews.html
+++ b/app/templates/macros/reviews.html
@@ -104,7 +104,7 @@
 				<input class="form-control" id="title" name="title" required="" type="text">
 			</div>
 
-			<textarea class="form-control markdown" required maxlength=500 name="comment"></textarea><br />
+			<textarea class="form-control markdown" required maxlength=2000 name="comment"></textarea><br />
 			<input class="btn btn-primary" type="submit" value="{{ _('Post Review') }}" />
 		</form>
 	</div>
diff --git a/app/templates/macros/threads.html b/app/templates/macros/threads.html
index d19aae5..a69c474 100644
--- a/app/templates/macros/threads.html
+++ b/app/templates/macros/threads.html
@@ -85,7 +85,7 @@
 			{% else %}
 				<form method="post" action="{{ url_for('threads.view', id=thread.id)}}" class="card-body">
 					<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-					<textarea class="form-control markdown" required maxlength=500 name="comment"></textarea><br />
+					<textarea class="form-control markdown" required maxlength=2000 name="comment"></textarea><br />
 					<input class="btn btn-primary" type="submit" value="Comment" />
 				</form>
 			{% endif %}