Index: branches/devel-vnext/program/steps/settings/identities.inc
===================================================================
--- branches/devel-vnext/program/steps/settings/identities.inc	(revision 623)
+++ branches/devel-vnext/program/steps/settings/identities.inc	(revision 624)
@@ -19,7 +19,17 @@
 
 */
+$registry = rc_registry::getInstance();
+$DB       = $registry->get('DB', 'core');
+$OUTPUT   = $registry->get('OUTPUT', 'core');
 
 if ($USER_DATA = $DB->fetch_assoc($sql_result)) {
-    $OUTPUT->set_pagetitle(sprintf('%s (%s@%s)', rcube_label('identities'), $USER_DATA['username'], $USER_DATA['mail_host']));
+    $OUTPUT->set_pagetitle(
+                sprintf(
+                    '%s (%s@%s)',
+                    rcube_label('identities'),
+                    $USER_DATA['username'],
+                    $USER_DATA['mail_host']
+                )
+    );
 }
 $OUTPUT->include_script('list.js');
@@ -38,5 +48,11 @@
     $OUTPUT->set_env('contentframe', $attrib['name']);
 
-    $attrib_str = rc_main::create_attrib_string($attrib, array('name', 'id', 'class', 'style', 'src', 'width', 'height', 'frameborder'));
+    $attrib_str = rc_main::create_attrib_string(
+                        $attrib,
+                        array(
+                            'name', 'id', 'class', 'style',
+                            'src', 'width', 'height', 'frameborder'
+                        )
+    );
     $out = '<iframe'. $attrib_str . '></iframe>';
 
@@ -46,4 +62,4 @@
 $OUTPUT->add_handler('identityframe', 'rcmail_identity_frame');
 
-parse_template('identities');
+rc_main::parse_template('identities');
 ?>