diff --git a/src/empathy-misc.c b/src/empathy-misc.c
index a1a0847..7d521b7 100644
--- a/src/empathy-misc.c
+++ b/src/empathy-misc.c
@@ -26,6 +26,7 @@
 #include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-conf.h>
+#include <libnotify/notify.h>
 
 /* public methods */
 
@@ -34,16 +35,29 @@ empathy_misc_get_pixbuf_for_notification (EmpathyContact *contact,
 					  const char *icon_name)
 {
 	GdkPixbuf *pixbuf = NULL;
+	gint       size;
+	gchar     *server_name = NULL;
+	
+	notify_get_server_info (&server_name, NULL, NULL, NULL);
+	
+	if (!g_strcmp0 ("notification-daemon", server_name)) {
+		size = 48;
+	}
+	else {
+		size = 128;
+	}
 
 	if (contact != NULL) {
 		pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact,
-								    48, 48);
+								    size, size);
 	}
 
 	if (!pixbuf) {
 		pixbuf = empathy_pixbuf_from_icon_name_sized
-					(icon_name, 48);
+					(icon_name, size);
 	}
+	
+	g_free (server_name);
 
 	return pixbuf;
 }
