diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 81ea5e8..9a7c710 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -259,6 +259,21 @@
          </long>
       </locale>
     </schema>
+	
+	<schema>
+      <key>/schemas/apps/empathy/notifications/notifications_blink</key>
+      <applyto>/apps/empathy/notifications/notifications_blink</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+		 <short>Emable blinking tray icon</short>
+		 <long>
+		 Wheter or not to show a blinking tray icon when receiving a new
+		 message if the chat is not open or focused.
+		 </long>
+      </locale>
+    </schema>
 
     <schema>
        <key>/schemas/apps/empathy/ui/separate_chat_windows</key>
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 4794913..84e2ecb 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -48,6 +48,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_NOTIFICATIONS_ENABLED        EMPATHY_PREFS_PATH "/notifications/notifications_enabled"
 #define EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY  EMPATHY_PREFS_PATH "/notifications/notifications_disabled_away"
 #define EMPATHY_PREFS_NOTIFICATIONS_FOCUS          EMPATHY_PREFS_PATH "/notifications/notifications_focus"
+#define EMPATHY_PREFS_NOTIFICATIONS_BLINK          EMPATHY_PREFS_PATH "/notifications/notifications_blink"
 #define EMPATHY_PREFS_SOUNDS_ENABLED               EMPATHY_PREFS_PATH "/sounds/sounds_enabled"
 #define EMPATHY_PREFS_SOUNDS_DISABLED_AWAY         EMPATHY_PREFS_PATH "/sounds/sounds_disabled_away"
 #define EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE      EMPATHY_PREFS_PATH "/sounds/sounds_incoming_message"
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 4c88db6..1846e3a 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -68,6 +68,7 @@ typedef struct {
 	GtkWidget *checkbutton_notifications_enabled;
 	GtkWidget *checkbutton_notifications_disabled_away;
 	GtkWidget *checkbutton_notifications_focus;
+	GtkWidget *checkbutton_notifications_blink;
 
 	GtkWidget *treeview_spell_checker;
 
@@ -199,6 +200,9 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
 	preferences_hookup_toggle_button (preferences,
 					  EMPATHY_PREFS_NOTIFICATIONS_FOCUS,
 					  preferences->checkbutton_notifications_focus);
+	preferences_hookup_toggle_button (preferences,
+                      EMPATHY_PREFS_NOTIFICATIONS_BLINK,
+				      preferences->checkbutton_notifications_blink);
 
 	preferences_hookup_sensitivity (preferences,
 					EMPATHY_PREFS_NOTIFICATIONS_ENABLED,
@@ -1201,6 +1205,7 @@ empathy_preferences_show (GtkWindow *parent)
 		"checkbutton_notifications_enabled", &preferences->checkbutton_notifications_enabled,
 		"checkbutton_notifications_disabled_away", &preferences->checkbutton_notifications_disabled_away,
 		"checkbutton_notifications_focus", &preferences->checkbutton_notifications_focus,
+		"checkbutton_notifications_blink", &preferences->checkbutton_notifications_blink,
 		"checkbutton_sounds_enabled", &preferences->checkbutton_sounds_enabled,
 		"checkbutton_sounds_disabled_away", &preferences->checkbutton_sounds_disabled_away,
 		"treeview_sounds", &preferences->treeview_sounds,
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 142e5d7..38e1ada 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -297,6 +297,22 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton_notifications_blink">
+                    <property name="label" translatable="yes">Enable blinking tray icon</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -797,7 +813,7 @@
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
-                                  <object class="GtkLabel" id="label1">
+                                  <object class="GtkLabel" id="label4">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Adium theme to use:</property>
@@ -805,13 +821,14 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkFileChooserButton" id="filechooserbutton_adium_theme">
                                     <property name="visible">True</property>
                                     <property name="preview_widget_active">False</property>
-                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                    <property name="action">select-folder</property>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 9c21948..7ab1aa4 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -221,6 +221,7 @@ status_icon_event_added_cb (EmpathyEventManager *manager,
 			    EmpathyStatusIcon   *icon)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+	gboolean              blink = FALSE;
 
 	if (priv->event) {
 		return;
@@ -235,10 +236,17 @@ status_icon_event_added_cb (EmpathyEventManager *manager,
 	status_icon_update_tooltip (icon);
 	status_icon_update_notification (icon);
 
-	if (!priv->blink_timeout) {
-		priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
-						     (GSourceFunc) status_icon_blink_timeout_cb,
-						     icon);
+
+    empathy_conf_get_bool (empathy_conf_get (),
+                    EMPATHY_PREFS_NOTIFICATIONS_BLINK,
+					&blink);
+
+	if (blink == TRUE) {
+	    if (!priv->blink_timeout) {
+		    priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
+			    			     (GSourceFunc) status_icon_blink_timeout_cb,
+				    		     icon);
+	    }
 	}
 }
 
