diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index 1f74b2728..7c44d0e11 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -584,16 +584,7 @@ _notification_format_message(Popup_Data *popup)
    const char *title = e_notification_summary_get(popup->notif);
    const char *b = e_notification_body_get(popup->notif);
    edje_object_part_text_set(o, "notification.text.title", title);
-   /* Hack to allow e to include markup */
-   if (e_notification_replaces_id_get(popup->notif) == -1)
-     {
-        edje_object_part_text_set(o, "notification.textblock.message", b);
-     }
-   else
-     {
-        char *tmp;
-        tmp = evas_textblock_text_utf8_to_markup(NULL, b);
-        edje_object_part_text_set(o, "notification.textblock.message", tmp);
-        if (tmp) free(tmp);
-     }
+
+   /* FIXME: Filter to only include allowed markup? */
+   edje_object_part_text_set(o, "notification.textblock.message", b);
 }