diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c
index d480f92..3ecbf38 100644
--- a/plugins/elements/gstfakesink.c
+++ b/plugins/elements/gstfakesink.c
@@ -398,18 +398,35 @@ gst_fake_sink_event (GstBaseSink * bsink, GstEvent * event)
   if (!sink->silent) {
     const GstStructure *s;
     gchar *sstr;
+    const gchar *str_name;

     GST_OBJECT_LOCK (sink);
     g_free (sink->last_message);

-    if ((s = gst_event_get_structure (event)))
+    if ((s = gst_event_get_structure (event))) {
       sstr = gst_structure_to_string (s);
-    else
+      str_name = gst_structure_get_name (s);
+    } else {
       sstr = g_strdup ("");
+      str_name = "";
+    }

-    sink->last_message =
-        g_strdup_printf ("event   ******* E (type: %d, %s) %p",
-        GST_EVENT_TYPE (event), sstr, event);
+    if (!g_strcmp0 ("sink-message", str_name)) {
+      GstMessage *msg;
+      gchar *mstr;
+
+      mstr = gst_structure_to_string (msg->structure);
+      gst_event_parse_sink_message (event, &msg);
+      sink->last_message =
+          g_strdup_printf ("message ******* M (type: %d, %s) %p",
+          GST_MESSAGE_TYPE (msg), mstr, msg);
+      gst_message_unref (msg);
+      g_free (mstr);
+    } else {
+      sink->last_message =
+          g_strdup_printf ("event   ******* E (type: %d, %s) %p",
+          GST_EVENT_TYPE (event), sstr, event);
+    }
     g_free (sstr);
     GST_OBJECT_UNLOCK (sink);