diff --git a/app/models/comment.rb b/app/models/comment.rb
index c84287055..79af5d1d0 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -33,7 +33,7 @@ class Comment < ActiveRecord::Base
   alias_attribute :post, :commentable
   belongs_to :author, :class_name => 'Person'
 
-  validates :text, :presence => true, :length => {:maximum => 2500}
+  validates :text, :presence => true, :maximum => 65535, :message => I18n.t('status_messages.too_long', :count => 65535)
   validates :parent, :presence => true #should be in relayable (pending on fixing Message)
 
   scope :including_author, includes(:author => :profile)