diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 062e9c8..b133f50 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -39,7 +39,7 @@ class TimeEntry < ActiveRecord::Base
 
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true, :message => :invalid
-  validates_length_of :comments, :maximum => 255, :allow_nil => true
+  validates_length_of :comments, :maximum => 1024, :allow_nil => true
   validates :spent_on, :date => true
   before_validation :set_project_if_nil
   validate :validate_time_entry
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index cf665cb..84fb947 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -17,7 +17,7 @@
   </p>
   <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   <p><%= f.text_field :hours, :size => 6, :required => true %></p>
-  <p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p>
+  <p><%= f.text_field :comments, :size => 100, :maxlength => 1024 %></p>
   <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
   <% @time_entry.custom_field_values.each do |value| %>
     <p><%= custom_field_tag_with_label :time_entry, value %></p>
diff --git a/db/migrate/20150921204850_change_time_entries_comments_limit_to_1024.rb b/db/migrate/20150921204850_change_time_entries_comments_limit_to_1024.rb
new file mode 100644
index 0000000..8366e8f
--- /dev/null
+++ b/db/migrate/20150921204850_change_time_entries_comments_limit_to_1024.rb
@@ -0,0 +1,9 @@
+class ChangeTimeEntriesCommentsLimitTo1024 < ActiveRecord::Migration
+  def self.up
+    change_column :time_entries, :comments, :string, :limit => 1024
+  end
+
+  def self.down
+    change_column :time_entries, :comments, :string, :limit => 255
+  end
+end