Index: src/ephy-toolbar.c
===================================================================
--- src/ephy-toolbar.c	(révision 7354)
+++ src/ephy-toolbar.c	(copie de travail)
@@ -457,6 +457,25 @@
 }
 
 void
+ephy_toolbar_set_navigation_tooltips (EphyToolbar *toolbar,
+				      const char *back_title,
+				      const char *forward_title)
+{
+	EphyToolbarPrivate *priv = toolbar->priv;
+	GValue value = { 0 };
+
+	g_value_init (&value, G_TYPE_STRING);
+
+	g_value_set_string (&value, back_title);
+	g_object_set_property (G_OBJECT (priv->actions[BACK_ACTION]),
+			       "tooltip", &value);
+
+	g_value_set_string (&value, forward_title);
+	g_object_set_property (G_OBJECT (priv->actions[FORWARD_ACTION]),
+			       "tooltip", &value);
+}
+
+void
 ephy_toolbar_set_security_state (EphyToolbar *toolbar,
 				 gboolean is_secure,
 				 gboolean show_lock,
Index: src/ephy-toolbar.h
===================================================================
--- src/ephy-toolbar.h	(révision 7354)
+++ src/ephy-toolbar.h	(copie de travail)
@@ -86,6 +86,10 @@
 							 gboolean forward,
 							 gboolean up);
 
+void		ephy_toolbar_set_navigation_tooltips	(EphyToolbar *toolbar,
+							 const char *back_title,
+							 const char *forward_title);
+
 void		ephy_toolbar_set_security_state		(EphyToolbar *toolbar,
 							 gboolean is_secure,
 							 gboolean show_lock,
Index: src/ephy-window.c
===================================================================
--- src/ephy-window.c	(révision 7354)
+++ src/ephy-window.c	(copie de travail)
@@ -1474,6 +1474,9 @@
 {
 	EphyTabNavigationFlags flags;
 	gboolean up = FALSE, back = FALSE, forward = FALSE;
+	EphyEmbed *embed;
+	char *back_url   = NULL, *forward_url   = NULL;
+	char *back_title = NULL, *forward_title = NULL;
 
 	if (window->priv->closing) return;
 
@@ -1494,6 +1497,25 @@
 
 	ephy_toolbar_set_navigation_actions (window->priv->toolbar,
 					     back, forward, up);
+
+	embed = ephy_tab_get_embed (tab);
+	if (embed == NULL) return;
+
+	if (ephy_embed_shistory_get_pos (embed) > 0)
+	{
+		ephy_embed_shistory_get_nth (embed, -1, TRUE,
+					     &back_url, &back_title);
+	}
+
+	if (ephy_embed_shistory_get_pos (embed) < ephy_embed_shistory_n_items (embed) - 1)
+	{
+		ephy_embed_shistory_get_nth (embed,  1, TRUE,
+					     &forward_url, &forward_title);
+	}
+
+	ephy_toolbar_set_navigation_tooltips (window->priv->toolbar,
+					      back_title,
+					      forward_title);
 }
 
 static void
