diff --git a/client/src/app-components/ticket-event.scss b/client/src/app-components/ticket-event.scss
index 5e36aaa0..50105bbe 100644
--- a/client/src/app-components/ticket-event.scss
+++ b/client/src/app-components/ticket-event.scss
@@ -47,6 +47,7 @@
 
     &__comment {
         position: relative;
+        word-break: break-all;
 
         &-pointer {
             right: 100%;
diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php
index d9db4566..2f016ebf 100644
--- a/server/controllers/ticket/comment.php
+++ b/server/controllers/ticket/comment.php
@@ -13,7 +13,7 @@ class CommentController extends Controller {
             'permission' => 'user',
             'requestData' => [
                 'content' => [
-                    'validation' => DataValidator::length(20, 500),
+                    'validation' => DataValidator::length(20, 5000),
                     'error' => ERRORS::INVALID_CONTENT
                 ],
                 'ticketNumber' => [
diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php
index 2d9294ba..d36c3757 100644
--- a/server/controllers/ticket/create.php
+++ b/server/controllers/ticket/create.php
@@ -20,7 +20,7 @@ class CreateController extends Controller {
                     'error' => ERRORS::INVALID_TITLE
                 ],
                 'content' => [
-                    'validation' => DataValidator::length(10, 500),
+                    'validation' => DataValidator::length(10, 5000),
                     'error' => ERRORS::INVALID_CONTENT
                 ],
                 'departmentId' => [
diff --git a/tests/ticket/comment.rb b/tests/ticket/comment.rb
index 27222b87..9c39af38 100644
--- a/tests/ticket/comment.rb
+++ b/tests/ticket/comment.rb
@@ -32,7 +32,7 @@ describe '/ticket/comment/' do
 
     it 'should fail if content is very long' do
         long_text = ''
-        600.times {long_text << 'a'}
+        6000.times {long_text << 'a'}
 
         result = request('/ticket/comment', {
             content: long_text,
diff --git a/tests/ticket/create.rb b/tests/ticket/create.rb
index abafdc07..6b548d51 100644
--- a/tests/ticket/create.rb
+++ b/tests/ticket/create.rb
@@ -58,7 +58,7 @@ describe '/ticket/create' do
 
     it 'should fail if content is very long' do
         long_text = ''
-        600.times {long_text << 'a'}
+        6000.times {long_text << 'a'}
 
         result = request('/ticket/create',{
             title: 'Winter is coming',