3 files changed, 25 insertions, 4 deletions
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 8931e2aee..6ff105640 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -9,7 +9,23 @@ input, textarea
 
 body.iframe
 {
-  margin-top: 6px;
+  margin-top: 0px;
+}
+
+body.iframe div.boxcontent
+{
+  margin-top: 20px;
+  z-index: 2;
+}
+
+body.iframe div.boxtitle
+{
+  z-index: 100;
+}
+
+body.iframe #prefs-details
+{
+  padding-top: 1px;
 }
 
 #login-form form
@@ -66,6 +82,11 @@ div.messageheaderbox
   margin-top: 0px;
 }
 
+body.iframe div.messageheaderbox
+{
+  margin-top: 6px;
+}
+
 #abooktoolbar a.buttonPas
 {
   filter: alpha(opacity=35);
@@ -254,7 +275,7 @@ table.records-table thead tr td
 
 #contact-details
 {
-  margin-top: 12px;
+  margin-top: 20px;
 }
 
 #contact-details form {
diff --git a/skins/default/templates/error.html b/skins/default/templates/error.html
index 36862ce38..60af53b2a 100644
--- a/skins/default/templates/error.html
+++ b/skins/default/templates/error.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 
-<div id="header"><img src="/images/roundcube_logo.png" alt="<roundcube:object name='productname' />" /></div>
+<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
 
 <div style="width:400px; margin:60px auto;">
 $__page_content
diff --git a/skins/default/templates/messageprint.html b/skins/default/templates/messageprint.html
index ea7a320f9..31022394b 100644
--- a/skins/default/templates/messageprint.html
+++ b/skins/default/templates/messageprint.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<div id="header"><img src="/images/roundcube_logo.png" alt="<roundcube:object name="productname" />" /></div>
+<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div>
 
 <div id="printmessageframe">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />