diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 44de84a..6a79d1e 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -18,7 +18,7 @@
 <% end %>
 
 <% if @issue.safe_attribute? 'subject' %>
-<p><%= f.text_field :subject, :size => 80, :required => true %></p>
+<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true %></p>
 <% end %>
 
 <% if @issue.safe_attribute? 'description' %>
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index 7ecdd44..f8f04ad 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -12,7 +12,7 @@
 	<p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></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 %></p>
+	<p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></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>