diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 7824c7f8f..1019a34ed 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -36,10 +36,15 @@
 </div>
 
 <div id="messageframe">
+
+<div class="messageheaderbox">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
+</div>
+
 <roundcube:object name="blockedObjects" id="remote-objects-message" />
 <roundcube:object name="messageBody" id="messagebody" showImages="true" />
+
 </div>
 
 </body>