diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index 7c44d0e11..5a2f1815f 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -586,5 +586,14 @@ _notification_format_message(Popup_Data *popup)
    edje_object_part_text_set(o, "notification.text.title", title);
 
    /* FIXME: Filter to only include allowed markup? */
-   edje_object_part_text_set(o, "notification.textblock.message", b);
+     {
+        /* We need to replace \n with <br>. FIXME: We need to handle all the
+         * newline kinds, and paragraph separator. ATM this will suffice. */
+        Eina_Strbuf *buf = eina_strbuf_new();
+        eina_strbuf_append(buf, b);
+        eina_strbuf_replace_all(buf, "\n", "<br>");
+        edje_object_part_text_set(o, "notification.textblock.message",
+              eina_strbuf_string_get(buf));
+        eina_strbuf_free(buf);
+     }
 }