3 files changed, 20 insertions, 31 deletions
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index 08f5ca2b1..1a10f10ac 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -3,21 +3,20 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
 </head>
 <body class="iframe">
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
-
 <div id="contact-details" class="boxcontent">
-<roundcube:object name="contacteditform" size="40" />
-
-<p><br />
-<input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</p>
-
+  <roundcube:object name="contacteditform" size="40" />
+  <p>
+    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
 </form>
 </div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
 
 </body>
 </html>
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index 44111959e..a15aaf22a 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -3,21 +3,20 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
 </head>
 <body class="iframe">
 
 <div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
-
 <div id="contact-details" class="boxcontent">
-<roundcube:object name="contacteditform" size="40" />
-
-<p><br />
-<roundcube:button command="show" type="input" class="button" label="cancel" />&nbsp;
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</p>
-
+  <roundcube:object name="contacteditform" size="40" />
+  <p>
+    <roundcube:button command="show" type="input" class="button" label="cancel" />&nbsp;
+    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+  </p>
 </form>
 </div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
 
 </body>
 </html>
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index a6819f376..06d0fbee5 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -3,27 +3,18 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
 </head>
 <body class="iframe">
 
-<div id="contact-title" class="boxtitle"><roundcube:object name="contactdetails" part="name" /></div>
-
+<div id="contact-title" class="boxtitle"><roundcube:label name="contactproperties" /></div>
 <div id="contact-details" class="boxcontent">
-<fieldset>
-  <legend><roundcube:label name="contactproperties" /></legend>
   <roundcube:object name="contactdetails" />
-
-  <p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /></p>
-</fieldset>
-
-<roundcube:if condition="ENV:groups" />
-<fieldset>
-  <legend><roundcube:label name="groups" /></legend>
-  <roundcube:object name="contactgroups" />
-</fieldset>
-<roundcube:endif />
-
+  <p>
+    <roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" />
+  </p>
 </div>
+<script type="text/javascript">rcube_init_tabs('contact-details')</script>
 
 </body>
 </html>