diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 809da3333..8e8af931f 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -48,7 +48,7 @@
 </div>
 
 <div id="messageframe">
-<div class="boxlistcontent" style="top:0">
+<div class="boxlistcontent" style="top:0; overflow-x:auto">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />