4 files changed, 12 insertions, 14 deletions
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index ee4a13e8a..745bfefa4 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<roundcube:object name="doctype" value="html5" />
+<html>
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <meta name="Robots" content="noindex,nofollow" />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 294d1cec9..d93df4d47 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<roundcube:object name="doctype" value="html5" />
+<html>
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
@@ -14,8 +14,8 @@
 
 <!-- search box -->
 <div id="quicksearchbar">
-<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" _onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" content=" " />
 <roundcube:object name="searchform" id="quicksearchbox" />
+<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" _onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" content=" " />
 <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
 </div>
 
@@ -49,9 +49,7 @@
 <div id="messagelistcontainer" class="uibox boxlistcontent">
 <roundcube:object name="messages"
   id="messagelist"
-  cellspacing="0"
   columns=""
-  summary="Message list"
   optionsmenuIcon="true" />
 </div>
 
diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 15592a264..83cfe1341 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<roundcube:object name="doctype" value="html5" />
+<html>
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
@@ -14,12 +14,12 @@
 
 <div id="sectionslist" class="uibox listbox">
 <div class="scroller">
-	<roundcube:object name="sectionslist" id="sections-table" class="listing" cellspacing="0" />
+	<roundcube:object name="sectionslist" id="sections-table" class="listing" />
 </div>
 </div>
 
 <div id="preferences-box" class="uibox contentbox">
-<roundcube:object name="prefsframe" id="preferences-frame" width="100%" height="97%" frameborder="0" src="about:blank" />
+<roundcube:object name="prefsframe" id="preferences-frame" style="width:100%; height:96%" src="/watermark.html" />
 <roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
diff --git a/skins/larry/templates/settingsedit.html b/skins/larry/templates/settingsedit.html
index afcbeb590..e058ec6be 100644
--- a/skins/larry/templates/settingsedit.html
+++ b/skins/larry/templates/settingsedit.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<roundcube:object name="doctype" value="html5" />
+<html>
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
@@ -9,7 +9,7 @@
 <h1 class="boxtitle"><roundcube:object name="sectionname" /></h1>
 
 <div id="preferences-details" class="boxcontent">
-<roundcube:object name="userprefs" form="form" class="propform" cellspacing="0" />
+<roundcube:object name="userprefs" form="form" class="propform" />
 </div>
 
 <div id="formfooter">