diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css
index 6f4b47a5..e8853774 100644
--- a/plugins/calendar/skins/default/calendar.css
+++ b/plugins/calendar/skins/default/calendar.css
@@ -90,6 +90,7 @@ pre {
 	padding: 0;
 }
 
+#attachmentlist li,
 #calendarslist li {
 	margin: 0;
 	padding: 1px;
@@ -277,6 +278,11 @@ a.miniColors-trigger {
 	font-size: 11px;
 }
 
+#partheader table td.title {
+	color: #666;
+	font-weight: bold;
+}
+
 .attachments-list ul {
 	margin: 0px;
 	padding: 0px;
@@ -287,9 +293,8 @@ a.miniColors-trigger {
 .attachments-list ul li {
 	height: 18px;
 	font-size: 12px;
-	padding-left: 2px;
 	padding-top: 2px;
-	padding-right: 4px;
+	padding-right: 8px;
 	white-space: nowrap;
 }
 
@@ -306,14 +311,26 @@ a.miniColors-trigger {
 	text-decoration: underline;
 }
 
-#eventshow .attachments-list ul {
-	display: block;
+#attachmentlist {
+	margin: 0 -0.8em;
+}
+
+#attachmentlist li {
+	padding: 2px 2px 3px 0.8em;
 }
 
 #eventshow .attachments-list ul li {
 	float: left;
 }
 
+#edit-attachments-form {
+	padding-top: 1.2em;
+}
+
+#edit-attachments-form .buttons {
+	margin: 0.5em 0;
+}
+
 
 /* jQuery UI overrides */
 
diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/default/templates/calendar.html
index ca33b8ce..2a75662f 100644
--- a/plugins/calendar/skins/default/templates/calendar.html
+++ b/plugins/calendar/skins/default/templates/calendar.html
@@ -78,7 +78,7 @@
   </div>
   <div class="event-section" id="event-attachments">
     <label><roundcube:label name="attachments" /></label>
-    <span class="event-text attachments-list"></span>
+    <div class="event-text attachments-list"></div>
   </div>
 </div>
 
@@ -170,12 +170,12 @@
     </div>
     <!-- attachments list (with upload form) -->
     <div id="event-tab-4">
-      <div class="border-after" id="edit-attachments-form">
+      <div id="edit-attachments" class="attachments-list">
+        <roundcube:object name="plugin.attachments_list" id="attachmentlist" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+      </div>
+      <div id="edit-attachments-form">
         <roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
       </div>
-      <span id="edit-attachments" class="attachments-list">
-        <roundcube:object name="plugin.attachments_list" id="attachmentlist" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
-      </span>
     </div>
   </form>