diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 29927e104..62e3f648d 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -5,14 +5,14 @@
 
 <% enumerations = klass.shared %>
 <% if enumerations.any? %>
-<table class="list">
+<table class="list"><thead>
 <tr>
     <th><%= l(:field_name) %></th>
     <th style="width:15%;"><%= l(:field_is_default) %></th>
     <th style="width:15%;"><%= l(:field_active) %></th>
     <th style="width:15%;"></th>
     <th align="center" style="width:10%;"> </th>
-</tr>
+</tr></thead>
 <% enumerations.each do |enumeration| %>
 <tr class="<%= cycle('odd', 'even') %>">
     <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb
index 613f05e2d..e5d84a17a 100644
--- a/app/views/groups/_memberships.html.erb
+++ b/app/views/groups/_memberships.html.erb
@@ -4,11 +4,11 @@
 <div class="splitcontentleft">
 <% if @group.memberships.any? %>
 <table class="list memberships">
-	<thead>
+	<thead><tr>
 	  <th><%= l(:label_project) %></th>
 	  <th><%= l(:label_role_plural) %></th>
 	  <th style="width:15%"></th>
-	</thead>
+	</tr></thead>
 	<tbody>
 	<% @group.memberships.each do |membership| %>
 	<% next if membership.new_record? %>
diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb
index 48c216ee9..d3a789936 100644
--- a/app/views/groups/_users.html.erb
+++ b/app/views/groups/_users.html.erb
@@ -1,10 +1,10 @@
 <div class="splitcontentleft">
 <% if @group.users.any? %>
 	<table class="list users">
-		<thead>
+		<thead><tr>
 		  <th><%= l(:label_user) %></th>
 		  <th style="width:15%"></th>
-		</thead>
+		</tr></thead>
 		<tbody>
 		<% @group.users.sort.each do |user| %>
 			<tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
diff --git a/app/views/my/blocks/_timelog.rhtml b/app/views/my/blocks/_timelog.rhtml
index 95679b207..fdff465e2 100644
--- a/app/views/my/blocks/_timelog.rhtml
+++ b/app/views/my/blocks/_timelog.rhtml
@@ -13,13 +13,13 @@ entries_by_day = entries.group_by(&:spent_on)
 
 <% if entries.any? %>
 <table class="list time-entries">
-<thead>
+<thead><tr>
 <th><%= l(:label_activity) %></th>
 <th><%= l(:label_project) %></th>
 <th><%= l(:field_comments) %></th>
 <th><%= l(:field_hours) %></th>
 <th></th>
-</thead>
+</tr></thead>
 <tbody>
 <% entries_by_day.keys.sort.reverse.each do |day| %>
     <tr class="odd">
diff --git a/app/views/projects/settings/_activities.rhtml b/app/views/projects/settings/_activities.rhtml
index d7b1f3a98..d82bd96fb 100644
--- a/app/views/projects/settings/_activities.rhtml
+++ b/app/views/projects/settings/_activities.rhtml
@@ -1,42 +1,42 @@
-<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %>
-
-<table class="list">
-  <tr>
-    <th><%= l(:field_name) %></th>
-    <th><%= l(:enumeration_system_activity) %></th>
-    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
-	<th><%= h value.name %></th>
-    <% end %>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-  </tr>
-
-  <% @project.activities(true).each do |enumeration| %>
-  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
-  <tr class="<%= cycle('odd', 'even') %>">
-    <td>
-      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
-      <%= h(enumeration) %>
-    </td>
-    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
-    <% enumeration.custom_field_values.each do |value| %>
-	<td align="center">
-      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
-    </td>
-    <% end %>
-    <td align="center" style="width:15%;">
-      <%= ff.check_box :active %>
-    </td>
-  </tr>
-  <% end %>
-  <% end %>
-</table>
-
-<div class="contextual">
-<%= link_to(l(:button_reset), {:controller => 'projects', :action => 'reset_activities', :id => @project},
-						:method => :delete,
-						:confirm => l(:text_are_you_sure),
-            :class => 'icon icon-del') %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
+<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %>
+
+<table class="list">
+  <thead><tr>
+    <th><%= l(:field_name) %></th>
+    <th><%= l(:enumeration_system_activity) %></th>
+    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
+	<th><%= h value.name %></th>
+    <% end %>
+    <th style="width:15%;"><%= l(:field_active) %></th>
+  </tr></thead>
+
+  <% @project.activities(true).each do |enumeration| %>
+  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
+  <tr class="<%= cycle('odd', 'even') %>">
+    <td>
+      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
+      <%= h(enumeration) %>
+    </td>
+    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
+    <% enumeration.custom_field_values.each do |value| %>
+	<td align="center">
+      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
+    </td>
+    <% end %>
+    <td align="center" style="width:15%;">
+      <%= ff.check_box :active %>
+    </td>
+  </tr>
+  <% end %>
+  <% end %>
+</table>
+
+<div class="contextual">
+<%= link_to(l(:button_reset), {:controller => 'projects', :action => 'reset_activities', :id => @project},
+						:method => :delete,
+						:confirm => l(:text_are_you_sure),
+            :class => 'icon icon-del') %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/projects/settings/_boards.rhtml b/app/views/projects/settings/_boards.rhtml
index c203a6f51..b2d5d54a1 100644
--- a/app/views/projects/settings/_boards.rhtml
+++ b/app/views/projects/settings/_boards.rhtml
@@ -1,11 +1,11 @@
 <% if @project.boards.any? %>
 <table class="list">
-	<thead>
+	<thead><tr>
 		<th><%= l(:label_board) %></th>
 		<th><%= l(:field_description) %></th>
 		<th></th>
 		<th></th>
-	</thead>
+	</tr></thead>
 	<tbody>
 <% @project.boards.each do |board|
 	next if board.new_record? %>
diff --git a/app/views/projects/settings/_issue_categories.rhtml b/app/views/projects/settings/_issue_categories.rhtml
index 52e34f4a4..95121108a 100644
--- a/app/views/projects/settings/_issue_categories.rhtml
+++ b/app/views/projects/settings/_issue_categories.rhtml
@@ -1,10 +1,10 @@
 <% if @project.issue_categories.any? %>
 <table class="list">
-	<thead>
+	<thead><tr>
 	<th><%= l(:label_issue_category) %></th>
 	<th><%= l(:field_assigned_to) %></th>
 	<th></th>
-	</thead>
+	</tr></thead>
 	<tbody>
 <% for category in @project.issue_categories %>
 	<% unless category.new_record? %>
diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml
index 1c0c11f42..35670ac74 100644
--- a/app/views/projects/settings/_members.rhtml
+++ b/app/views/projects/settings/_members.rhtml
@@ -5,12 +5,12 @@
 <div class="splitcontentleft">
 <% if members.any? %>
 <table class="list members">
-	<thead>
+	<thead><tr>
 	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
 	  <th><%= l(:label_role_plural) %></th>
 	  <th style="width:15%"></th>
           <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
-	</thead>
+	</tr></thead>
 	<tbody>
 	<% members.each do |member| %>
 	<% next if member.new_record? %>
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml
index 77dad2704..dc81f6265 100644
--- a/app/views/projects/settings/_versions.rhtml
+++ b/app/views/projects/settings/_versions.rhtml
@@ -1,6 +1,6 @@
 <% if @project.shared_versions.any? %>
 <table class="list versions">
-	<thead>
+	<thead><tr>
     <th><%= l(:label_version) %></th>
     <th><%= l(:field_effective_date) %></th>
     <th><%= l(:field_description) %></th>
@@ -8,7 +8,7 @@
     <th><%= l(:field_sharing) %></th>
     <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
     <th style="width:15%"></th>
-    </thead>
+    </tr></thead>
 	<tbody>
 <% for version in @project.shared_versions.sort %>
     <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 7659f1cc0..70921f4ab 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -4,12 +4,12 @@
 <div class="splitcontentleft">
 <% if @user.memberships.any? %>
 <table class="list memberships">
-	<thead>
+	<thead><tr>
 	  <th><%= l(:label_project) %></th>
 	  <th><%= l(:label_role_plural) %></th>
 	  <th style="width:15%"></th>
       <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
-	</thead>
+	</tr></thead>
 	<tbody>
 	<% @user.memberships.each do |membership| %>
 	<% next if membership.new_record? %>