diff --git a/src/mm/chatty-mmsd.c b/src/mm/chatty-mmsd.c
index 1fd072cc0639d7f010ccee48a5287b2531a651f6..fec3c57ae8c2ff273396d7e72bdaef6047ceff13 100644
--- a/src/mm/chatty-mmsd.c
+++ b/src/mm/chatty-mmsd.c
@@ -1014,6 +1014,7 @@ chatty_mmsd_receive_message (ChattyMmsd *self,
     filename = g_strdup (filenode);
     g_strdelimit (filename, "<>", ' ');
     g_strstrip (filename);
+    g_strdelimit (filename, " ", '_');
     filename = g_path_get_basename (filename);
     new = g_file_get_child (savepath, filename);
     out = g_file_create (new, G_FILE_CREATE_PRIVATE, NULL, &error);