Index: /trunk/plugins/newmail_notifier/config.inc.php.dist
===================================================================
--- /trunk/plugins/newmail_notifier/config.inc.php.dist	(revision 4788)
+++ /trunk/plugins/newmail_notifier/config.inc.php.dist	(revision 4788)
@@ -0,0 +1,9 @@
+<?php
+
+// Enables basic notification
+$rcmail_config['newmail_notifier_basic'] = false;
+
+// Enables sound notification
+$rcmail_config['newmail_notifier_sound'] = false;
+
+?>
Index: /trunk/plugins/newmail_notifier/localization/en_US.inc
===================================================================
--- /trunk/plugins/newmail_notifier/localization/en_US.inc	(revision 4788)
+++ /trunk/plugins/newmail_notifier/localization/en_US.inc	(revision 4788)
@@ -0,0 +1,6 @@
+<?php
+
+$labels['basic'] = 'Display notifications on new message';
+$labels['sound'] = 'Play the sound on new message';
+
+?>
Index: /trunk/plugins/newmail_notifier/localization/pl_PL.inc
===================================================================
--- /trunk/plugins/newmail_notifier/localization/pl_PL.inc	(revision 4788)
+++ /trunk/plugins/newmail_notifier/localization/pl_PL.inc	(revision 4788)
@@ -0,0 +1,6 @@
+<?php
+
+$labels['basic'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości';
+$labels['sound'] = 'Odtwarzaj dźwięk o nadejściu nowej wiadomości';
+
+?>
Index: /trunk/plugins/newmail_notifier/newmail_notifier.js
===================================================================
--- /trunk/plugins/newmail_notifier/newmail_notifier.js	(revision 4788)
+++ /trunk/plugins/newmail_notifier/newmail_notifier.js	(revision 4788)
@@ -0,0 +1,64 @@
+/**
+ * New Mail Notifier plugin script
+ *
+ * @version 0.1
+ * @author Aleksander Machniak <alec@alec.pl>
+ */
+
+if (window.rcmail && rcmail.env.task == 'mail') {
+    rcmail.addEventListener('plugin.newmail_notifier', newmail_notifier_run);
+    rcmail.addEventListener('actionbefore', newmail_notifier_stop);
+    rcmail.addEventListener('init', function() {
+        // bind to messages list select event, so favicon will be reverted on message preview too
+        if (rcmail.message_list)
+            rcmail.message_list.addEventListener('select', newmail_notifier_stop);
+    });
+}
+
+// Executes notification methods
+function newmail_notifier_run(prop)
+{
+    if (prop.basic)
+        newmail_notifier_basic();
+    if (prop.sound)
+        newmail_notifier_sound();
+}
+
+// Stops notification
+function newmail_notifier_stop(prop)
+{
+    // revert original favicon
+    if (rcmail.env.favicon_href && (!prop || prop.action != 'check-recent')) {
+        $('<link rel="shortcut icon" href="'+rcmail.env.favicon_href+'"/>').replaceAll('link[rel="shortcut icon"]');
+        rcmail.env.favicon_href = null;
+    }
+}
+
+// Basic notification: window.focus and favicon change
+function newmail_notifier_basic()
+{
+    window.focus();
+
+    // we cannot simply change a href attribute, we must to replace the link element (at least in FF)
+    var link = $('<link rel="shortcut icon" href="plugins/newmail_notifier/favicon.ico"/>'),
+        oldlink = $('link[rel="shortcut icon"]');
+
+    rcmail.env.favicon_href = oldlink.attr('href');
+    link.replaceAll(oldlink);
+}
+
+// Sound notification
+function newmail_notifier_sound()
+{
+    // HTML5
+    try {
+        var elem = $('<audio src="success.wav" />');
+        elem.get(0).play();
+    }
+    // old method
+    catch (e) {
+        var elem = $('<embed id="sound" src="success.wav" hidden=true autostart=true loop=false />');
+        elem.appendTo($('body'));
+        window.setTimeout("$('#sound').remove()", 5000);
+    }
+}
Index: /trunk/plugins/newmail_notifier/newmail_notifier.php
===================================================================
--- /trunk/plugins/newmail_notifier/newmail_notifier.php	(revision 4788)
+++ /trunk/plugins/newmail_notifier/newmail_notifier.php	(revision 4788)
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * New Mail Notifier plugin
+ *
+ * Supports two methods of notification:
+ * 1. Basic - focus browser window and change favicon
+ * 2. Sound - play wav file
+ *
+ * @version 0.1
+ * @author Aleksander Machniak <alec@alec.pl>
+ *
+ *
+ * Copyright (C) 2011, Kolab Systems AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+class newmail_notifier extends rcube_plugin
+{
+    public $task = 'mail|settings';
+
+    private $rc;
+
+    /**
+     * Plugin initialization
+     */
+    function init()
+    {
+        $this->rc = rcmail::get_instance();
+
+        // Preferences hooks
+        if ($this->rc->task == 'settings') {
+            $this->add_hook('preferences_list', array($this, 'prefs_list'));
+            $this->add_hook('preferences_save', array($this, 'prefs_save'));
+        }
+        else { // if ($this->rc->task == 'mail') {
+            $this->add_hook('new_messages', array($this, 'notify'));
+            // add script when not in ajax and not in frame
+            if (is_a($this->rc->output, 'rcube_template') && empty($_REQUEST['_framed'])) {
+                $this->include_script('newmail_notifier.js');
+            }
+        }
+    }
+
+    /**
+     * Handler for user preferences form (preferences_list hook)
+     */
+    function prefs_list($args)
+    {
+        // Load configuration
+        $this->load_config();
+
+        // Check that configuration is not disabled
+        $dont_override  = (array) $this->rc->config->get('dont_override', array());
+        $basic_override = in_array('newmail_notifier_basic', $dont_override);
+        $sound_override = in_array('newmail_notifier_sound', $dont_override);
+
+        if($args['section'] != 'mailbox') {
+            return $args;
+        }
+
+        // Load localization and configuration
+        $this->add_texts('localization/');
+
+        if (!$basic_override) {
+            $field_id = '_newmail_notifier_basic';
+            $input    = new html_checkbox(array('name' => $field_id, 'id' => $field_id, 'value' => 1));
+            $args['blocks']['new_message']['options']['newmail_notifier_basic'] = array(
+                'title' => html::label($field_id, Q($this->gettext('basic'))),
+                'content' => $input->show($this->rc->config->get('newmail_notifier_basic')),
+            );
+        }
+
+        if (!$sound_override) {
+            $field_id = '_newmail_notifier_sound';
+            $input    = new html_checkbox(array('name' => $field_id, 'id' => $field_id, 'value' => 1));
+            $args['blocks']['new_message']['options']['newmail_notifier_sound'] = array(
+                'title' => html::label($field_id, Q($this->gettext('sound'))),
+                'content' => $input->show($this->rc->config->get('newmail_notifier_sound')),
+            );
+        }
+
+        return $args;
+    }
+
+    /**
+     * Handler for user preferences save (preferences_save hook)
+     */
+    function prefs_save($args)
+    {
+        // Load configuration
+        $this->load_config();
+
+        // Check that configuration is not disabled
+        $dont_override  = (array) $this->rc->config->get('dont_override', array());
+        $basic_override = in_array('newmail_notifier_basic', $dont_override);
+        $sound_override = in_array('newmail_notifier_sound', $dont_override);
+
+        if($args['section'] != 'mailbox') {
+            return $args;
+        }
+
+        if (!$basic_override) {
+            $key = 'newmail_notifier_basic';
+            $args['prefs'][$key] = get_input_value('_'.$key, RCUBE_INPUT_POST) ? true : false;
+        }
+        if (!$sound_override) {
+            $key = 'newmail_notifier_sound';
+            $args['prefs'][$key] = get_input_value('_'.$key, RCUBE_INPUT_POST) ? true : false;
+        }
+
+        return $args;
+    }
+
+    /**
+     * Handler for new message action (new_messages hook)
+     */
+    function notify($args)
+    {
+        // Load configuration
+        $this->load_config();
+
+        $basic = $this->rc->config->get('newmail_notifier_basic');
+        $sound = $this->rc->config->get('newmail_notifier_sound');
+
+        if ($basic || $sound) {
+            $this->rc->output->command('plugin.newmail_notifier',
+                array('basic' => $basic, 'sound' => $sound));
+        }
+
+        return $args;
+    }
+}
Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 4787)
+++ /trunk/roundcubemail/CHANGELOG	(revision 4788)
@@ -2,4 +2,5 @@
 ===========================
 
+- Removed option focus_on_new_message, added newmail_notifier plugin
 - Added general rcube_cache class with Memcache and APC support
 - Improved caching performance by skipping writes of unchanged data
Index: /trunk/roundcubemail/config/main.inc.php.dist
===================================================================
--- /trunk/roundcubemail/config/main.inc.php.dist	(revision 4787)
+++ /trunk/roundcubemail/config/main.inc.php.dist	(revision 4788)
@@ -608,7 +608,4 @@
 $rcmail_config['preview_pane_mark_read'] = 0;
 
-// focus new window if new message arrives
-$rcmail_config['focus_on_new_message'] = true;
-
 // Clear Trash on logout
 $rcmail_config['logout_purge'] = false;
Index: /trunk/roundcubemail/program/js/app.js
===================================================================
--- /trunk/roundcubemail/program/js/app.js	(revision 4787)
+++ /trunk/roundcubemail/program/js/app.js	(revision 4788)
@@ -5018,14 +5018,4 @@
   };
 
-  // notifies that a new message(s) has hit the mailbox
-  this.new_message_focus = function()
-  {
-    // focus main window
-    if (this.env.framed && window.parent)
-      window.parent.focus();
-    else
-      window.focus();
-  };
-
   this.toggle_prefer_html = function(checkbox)
   {
Index: /trunk/roundcubemail/program/steps/mail/check_recent.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/check_recent.inc	(revision 4787)
+++ /trunk/roundcubemail/program/steps/mail/check_recent.inc	(revision 4788)
@@ -72,6 +72,4 @@
 
         if ($status & 1) {
-            if ($RCMAIL->config->get('focus_on_new_message', true))
-                $OUTPUT->command('new_message_focus');
             // trigger plugin hook
             $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name));
Index: /trunk/roundcubemail/program/steps/settings/func.inc
===================================================================
--- /trunk/roundcubemail/program/steps/settings/func.inc	(revision 4787)
+++ /trunk/roundcubemail/program/steps/settings/func.inc	(revision 4788)
@@ -350,14 +350,4 @@
     }
 
-    if (!isset($no_override['focus_on_new_message'])) {
-      $field_id = 'rcmfd_focus_on_new_message';
-      $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
-
-      $blocks['new_message']['options']['focus_on_new_message'] = array(
-        'title' => html::label($field_id, Q(rcube_label('focusonnewmessage'))),
-        'content' => $input_focus_on_new_message->show($config['focus_on_new_message']?1:0),
-      );
-    }
-
     if (!isset($no_override['keep_alive'])) {
       $field_id = 'rcmfd_keep_alive';
Index: /trunk/roundcubemail/program/steps/settings/save_prefs.inc
===================================================================
--- /trunk/roundcubemail/program/steps/settings/save_prefs.inc	(revision 4787)
+++ /trunk/roundcubemail/program/steps/settings/save_prefs.inc	(revision 4788)
@@ -40,5 +40,4 @@
   case 'mailbox':
     $a_user_prefs = array(
-      'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
       'preview_pane'         => isset($_POST['_preview_pane']) ? TRUE : FALSE,
       'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],