diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index 447acc0..c6bb2a3 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -376,7 +376,7 @@ namespace Banshee.NotificationArea
             }
             
             string message = String.Format ("{0}\n<i>{1}</i>", 
-                GLib.Markup.EscapeText (current_track.DisplayTrackTitle),
+                GLib.Markup.EscapeText (current_track.DisplayAlbumTitle),
                 GLib.Markup.EscapeText (current_track.DisplayArtistName));
             
             if (artwork_manager_service == null) {
@@ -401,8 +401,8 @@ namespace Banshee.NotificationArea
                     current_nf.Close ();
                 }
                 
-                Notification nf = new Notification (Catalog.GetString ("Now Playing"), 
-                    message, image, notif_area.Widget);
+                Notification nf = new Notification (
+                    current_track.DisplayTrackTitle, message, image, notif_area.Widget);
                 nf.Urgency = Urgency.Low;
                 nf.Timeout = 4500;
                 if (!current_track.IsLive && interface_action_service.PlaybackActions["NextAction"].Sensitive) {
