diff --git a/public/javascripts/application.coffee b/public/javascripts/application.coffee
index 3ab4895..9acb0d9 100644
--- a/public/javascripts/application.coffee
+++ b/public/javascripts/application.coffee
@@ -101,9 +101,10 @@ class MailCatcher
           $("#message .views .tab:visible:first").addClass "selected"
 
         if message.attachments.length
-          $('#message .metadata dd.attachments ul').empty()
+          $ul = $('<ul/>').appendTo($('#message .metadata dd.attachments').empty())
+
           $.each message.attachments, (i, attachment) ->
-            $('#message .metadata dd.attachments ul').append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
+            $ul.append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
           $('#message .metadata .attachments').show()
         else
           $('#message .metadata .attachments').hide()
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 2cfe016..509a13a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -99,6 +99,7 @@
         $('#messages tbody tr:not([data-message-id="' + id + '"])').removeClass('selected');
         $('#messages tbody tr[data-message-id="' + id + '"]').addClass('selected');
         return $.getJSON('/messages/' + id + '.json', __bind(function(message) {
+          var $ul;
           $('#message .metadata dd.created_at').text(this.formatDate(message.created_at));
           $('#message .metadata dd.from').text(message.sender);
           $('#message .metadata dd.to').text((message.recipients || []).join(', '));
@@ -119,9 +120,9 @@
             $("#message .views .tab:visible:first").addClass("selected");
           }
           if (message.attachments.length) {
-            $('#message .metadata dd.attachments ul').empty();
+            $ul = $('<ul/>').appendTo($('#message .metadata dd.attachments').empty());
             $.each(message.attachments, function(i, attachment) {
-              return $('#message .metadata dd.attachments ul').append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
+              return $ul.append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
             });
             $('#message .metadata .attachments').show();
           } else {
diff --git a/views/index.haml b/views/index.haml
index 257db06..83b99dd 100644
--- a/views/index.haml
+++ b/views/index.haml
@@ -41,7 +41,6 @@
           %dd.subject
           %dt.attachments Attachments
           %dd.attachments
-            %ul
         %nav.views
           %ul
             %li.format.tab.html.selected{'data-message-format' => 'html'}