diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
old mode 100644
new mode 100755
index 5c4ad24..483fe95
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -183,6 +183,8 @@ module QueriesHelper
       value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
     when :description
       item.description? ? content_tag('div', textilizable(item, :description), :class => "wiki") : ''
+    when :comments
+      item.comments? ? content_tag('div', textilizable(item, :comments), :class => "wiki") : ''
     when :done_ratio
       progress_bar(value)
     when :relations
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
old mode 100644
new mode 100755
index 712c7bd..b510a26
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -19,14 +19,21 @@
   </p>
   <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   <p><%= f.hours_field :hours, :size => 6, :required => true %></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>
+  <p><%= f.text_area :comments,
+                      :class => 'wiki-edit',
+                      :cols => 60,
+                      :rows => [[5, @time_entry.comments.to_s.length / 50].max, 10].min,
+                      :maxlength => 1024 %></p>
+
   <% @time_entry.custom_field_values.each do |value| %>
     <p><%= custom_field_tag_with_label :time_entry, value %></p>
   <% end %>
   <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
 </div>
 
+<%= wikitoolbar_for 'time_entry_comments' %>
+
 <%= javascript_tag do %>
   $(document).ready(function(){
     $('#time_entry_project_id, #time_entry_issue_id').change(function(){