3 files changed, 12 insertions, 1 deletions
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 3f7b6a58a..e43a7bb60 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -96,7 +96,7 @@ function rcube_identity_form($attrib)
                     'spellcheck' => true),
                 'html_signature' => array('type' => 'checkbox',
                     'label'   => $RCMAIL->gettext('htmlsignature'),
-                    'onclick' => 'return rcmail_toggle_editor(this, \'rcmfd_signature\');'),
+                    'onclick' => 'return rcmail.command(\'toggle-editor\', {id: \'rcmfd_signature\', html: this.checked}, \'\', event)'),
         ))
     );
 
diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 05f4db6a6..b72c3e73f 100644
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -51,6 +51,10 @@ function rcmail_user_prefs_form($attrib)
 
     $out = $form_start;
 
+    if(!empty($SECTIONS[$CURR_SECTION]['header'])) {
+        $out .= html::div(array('id' => 'preferences-header', 'class' =>'boxcontent'), $SECTIONS[$CURR_SECTION]['header']);
+    }
+
     foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $class => $block) {
         if (!empty($block['options'])) {
             $table = new html_table(array('cols' => 2));
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 5da01b757..8f9cf090f 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -1241,6 +1241,13 @@ function rcmail_user_prefs($current = null)
             $sections[$idx]['blocks'] = $data['blocks'];
     }
 
+    $data = $RCMAIL->plugins->exec_hook('preferences_section_header',
+        array('section' => $sect['id'], 'header' => '', 'current' => $current));
+
+    if(!empty($data['header'])) {
+        $sections[$idx]['header'] = $data['header'];
+    }
+
     return array($sections, $plugin['cols']);
 }