diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
index d1a4cd2..3acc54e 100644
--- a/app/views/tasks/_task.html.erb
+++ b/app/views/tasks/_task.html.erb
@@ -61,6 +61,13 @@
         <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
+
+    <div class="formfieldline">
+      <div class="formfield tag-list-fields">
+        <%= labelled_text_field(_('Tags'),"tasks[#{task.id}][task][tag_list]", '', :size => 36, :class => 'tag-list') %>
+      </div>
+    </div>
+
   <% end %>
 
 </div><!-- class="task_box" -->
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 6eb8533..9a5e990 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -72,6 +72,13 @@
       <% end %>
     </ul>
 
+    <script>
+      jQuery('.tag-list').inputosaurus({
+        autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/cms/search_tags'," %>
+        activateFinalResult : true
+      })
+    </script>
+
     <%= pagination_links(@tasks)%>
 
     <% button_bar(:class => 'task-actions') do %>
diff --git a/public/stylesheets/tasks.css b/public/stylesheets/tasks.css
index 714947d..1af513b 100644
--- a/public/stylesheets/tasks.css
+++ b/public/stylesheets/tasks.css
@@ -53,3 +53,23 @@
 .task_responsible {
   text-align: right;
 }
+
+/* Task tags list */
+
+.formfieldline label {
+  font-weight: bold;
+  margin: 0 5px 0 10px;
+}
+
+.formfieldline .inputosaurus-container {
+  vertical-align: middle;
+}
+
+.tag-list-fields input {
+  background-color: #fff !important;
+}
+
+.formfield.tag-list-fields .ui-autocomplete-loading {
+  background: url('/images/loading-small.gif') right center no-repeat !important;
+  background-color: #fff !important;
+}
--
libgit2 0.21.2