4 files changed, 30 insertions, 12 deletions
diff --git a/plugins/help/skins/classic/help.css b/plugins/help/skins/classic/help.css
index 8f67f111e..c45b8f0b0 100644
--- a/plugins/help/skins/classic/help.css
+++ b/plugins/help/skins/classic/help.css
@@ -5,9 +5,23 @@
   background-image: url('help.gif');
 }
 
+.extwin #tabsbar
+{
+  top: 21px;
+  left: 20px;
+  right: 100px;
+  border-bottom: 0;
+}
+
+.closelink {
+	position: absolute;
+	top: 20px;
+	right: 20px;
+}
+
 .help-box
 {
-  overflow: auto;  
+  overflow: auto;
   background-color: #F2F2F2;
 }
 
diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 2e430ecf3..3d5b22869 100644
--- a/plugins/help/skins/classic/templates/help.html
+++ b/plugins/help/skins/classic/templates/help.html
@@ -7,23 +7,28 @@
 <script type="text/javascript">
 function help_init_settings_tabs()
 {
-    var action, tab = '#helptabdefault';
+    var action, tab = '#helptabindex';
     if (window.rcmail && (action = rcmail.env.action)) {
-	    tab = '#helptab' + (action ? action : 'default');
+        tab = '#helptab' + (action ? action : 'index');
     }
     $(tab).addClass('tablink-selected');
 }
 </script>
 </head>
+<roundcube:if condition="env:extwin" />
+<body class="extwin">
+<roundcube:object name="message" id="message" />
+<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
+<roundcube:else />
 <body>
-
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
+<roundcube:endif />
 
 <div id="tabsbar">
-<span id="helptabdefault" class="tablink"><roundcube:button name="helpdefault" href="?_task=help" type="link" label="help.help" title="help.help" /></span>
-<span id="helptababout" class="tablink"><roundcube:button name="helpabout" href="?_task=help&_action=about" type="link" label="help.about" title="help.about" class="tablink" /></span>
-<span id="helptablicense" class="tablink"><roundcube:button name="helplicense" href="?_task=help&_action=license" type="link" label="help.license" title="help.license" class="tablink" /></span>
+<span id="helptabindex" class="tablink"><roundcube:object name="tablink" action="index" type="link" label="help.help" title="help.help" /></span>
+<span id="helptababout" class="tablink"><roundcube:object name="tablink" action="about" type="link" label="help.about" title="help.about" class="tablink" /></span>
+<span id="helptablicense" class="tablink"><roundcube:object name="tablink" action="license" type="link" label="help.license" title="help.license" class="tablink" /></span>
 <roundcube:container name="helptabs" id="helptabsbar" />
 <script type="text/javascript"> if (window.rcmail) rcmail.add_onload(help_init_settings_tabs);</script>
 </div>
diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index c2e369af6..d9af6e15e 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -39,7 +39,6 @@
 	background: url(help.png) center -130px no-repeat;
 }
 
-.iframebox.help_about,
 .iframebox.help_license {
 	overflow: auto;
 }
diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html
index 39caaa62f..bfd3f1141 100644
--- a/plugins/help/skins/larry/templates/help.html
+++ b/plugins/help/skins/larry/templates/help.html
@@ -4,16 +4,16 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
 
 <div id="helptoolbar" class="toolbar">
-<roundcube:button name="helpdefault" href="?_task=help" type="link" label="help.help" title="help.help" class="button help" />
-<roundcube:button name="helpabout" href="?_task=help&amp;_action=about" type="link" label="help.about" title="help.about" class="button about" />
-<roundcube:button name="helplicense" href="?_task=help&amp;_action=license" type="link" label="help.license" title="help.license" class="button license" />
+<roundcube:object name="tablink" action="index" type="link" label="help.help" title="help.help" class="button help" />
+<roundcube:object name="tablink" action="about" type="link" label="help.about" title="help.about" class="button about" />
+<roundcube:object name="tablink" action="license" type="link" label="help.license" title="help.license" class="button license" />
 <roundcube:container name="helptabs" id="helptabsbar" />
 </div>