diff --git a/app/views/recordings/_list.rhtml b/app/views/recordings/_list.rhtml
index e28730468546f996e42b14b9a4ff4920ac5a59ea..0d496df06354bcf6990c0fd8b113fddd41bdda93 100644
--- a/app/views/recordings/_list.rhtml
+++ b/app/views/recordings/_list.rhtml
@@ -1,39 +1,34 @@
-<% special_columns = ["when", "length"] %>
 <% ignored_columns = ["file", "created_on", "updated_on"] %>
-<% first_columns = ["when", "cid", "from", "length", "user_id", "comment"] %>
+<% sorted_columns = ["when", "cid", "from", "length", "user_id", "comment"] %>
+
+<% for column in Recording.content_columns %>
+  <% if not (ignored_columns + sorted_columns).include?(column.name) %>
+    <% sorted_columns << column.name %>
+  <% end %>
+<% end %>
+
 <table border="1">
   <tr>
     <th>&nbsp;</th>
-    <% for column_name in first_columns %>
+    <% for column_name in sorted_columns %>
       <th><%= Recording.columns_hash[column_name].human_name %></th>
     <%end%>
-    <% for column in Recording.content_columns %>
-      <% if not (ignored_columns + first_columns).include?(column.name) %>
-        <th><%= column.human_name %></th>
-      <% end %>
-    <% end %>
   </tr>
   
 <% for recording in @recordings %>
   <tr>
     <td><%= link_to 'Play', :action => 'play', :id => recording %></td>
-    <% for column_name in first_columns %>
+    <% for column_name in sorted_columns %>
       <td>
-      <% if special_columns.include?(column_name) %>
-        <% if column_name == "when" %>
+        <% case column_name
+	   when "when": %>
 	  <%= recording["when"].strftime("%Y-%m-%d&nbsp;%H:%M:%S") %>
-	<% elsif column_name == "length" %>
+	<% when "length": %>
 	  <%= (10*recording["length"].to_f).round / 10.0 %>
+	<% else %>
+          <%=h recording.send(column_name) %>
 	<% end %>
-      <% else %>
-        <%=h recording.send(column_name) %>
-      <%end%>
       </td>
-    <%end%>
-    <% for column in Recording.content_columns %>
-      <% if not (ignored_columns + first_columns).include?(column.name) %>
-        <td><%=h recording.send(column.name) %></td>
-      <% end %>
     <% end %>
     <td><%= link_to 'Show', :action => 'show', :id => recording %></td>
     <td><%= link_to 'Edit', :action => 'edit', :id => recording %></td>